diff --git a/novacoin-qt.pro b/novacoin-qt.pro
index 663f808256..569ac1c1e8 100644
--- a/novacoin-qt.pro
+++ b/novacoin-qt.pro
@@ -177,6 +177,7 @@ HEADERS += src/qt/bitcoingui.h \
     src/zerocoin/Params.h \
     src/zerocoin/SerialNumberSignatureOfKnowledge.h \
     src/zerocoin/SpendMetaData.h \
+    src/zerocoin/ZeroTest.h \
     src/zerocoin/Zerocoin.h \
     src/serialize.h \
     src/strlcpy.h \
@@ -306,7 +307,8 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/zerocoin/ParamGeneration.cpp \
     src/zerocoin/Params.cpp \
     src/zerocoin/SerialNumberSignatureOfKnowledge.cpp \
-    src/zerocoin/SpendMetaData.cpp
+    src/zerocoin/SpendMetaData.cpp \
+    src/zerocoin/ZeroTest.cpp
 
 RESOURCES += \
     src/qt/bitcoin.qrc
diff --git a/src/init.cpp b/src/init.cpp
index 9dfdc6324c..0f18b57dc1 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -10,6 +10,7 @@
 #include "util.h"
 #include "ui_interface.h"
 #include "checkpoints.h"
+#include "zerocoin/ZeroTest.h"
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem/convenience.hpp>
@@ -21,6 +22,7 @@
 #include <signal.h>
 #endif
 
+
 using namespace std;
 using namespace boost;
 
@@ -359,6 +361,11 @@ bool AppInit2()
     nNodeLifespan = GetArg("-addrlifespan", 7);
     fStakeUsePooledKeys = GetBoolArg("-stakepooledkeys", false);
 
+    if (GetBoolArg("-zerotest", false))
+    {
+        Test_RunAllTests();
+    }
+
     CheckpointsMode = Checkpoints::STRICT;
     std::string strCpMode = GetArg("-cppolicy", "strict");
 
diff --git a/src/makefile.bsd b/src/makefile.bsd
index 8ab520e0e5..c0039995b1 100644
--- a/src/makefile.bsd
+++ b/src/makefile.bsd
@@ -144,7 +144,8 @@ OBJS= \
     obj/zerocoin/ParamGeneration.o \
     obj/zerocoin/Params.o \
     obj/zerocoin/SerialNumberSignatureOfKnowledge.o \
-    obj/zerocoin/SpendMetaData.o
+    obj/zerocoin/SpendMetaData.o \
+    obj/zerocoin/ZeroTest.o
 
 
 all: novacoind
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index 6ff42d6923..5e9f9d0c47 100644
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -105,7 +105,8 @@ OBJS= \
     obj/zerocoin/ParamGeneration.o \
     obj/zerocoin/Params.o \
     obj/zerocoin/SerialNumberSignatureOfKnowledge.o \
-    obj/zerocoin/SpendMetaData.o
+    obj/zerocoin/SpendMetaData.o \
+    obj/zerocoin/ZeroTest.o
 
 all: novacoind.exe
 
diff --git a/src/makefile.mingw b/src/makefile.mingw
index 80a6801c9a..a9b83a72ef 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -94,7 +94,8 @@ OBJS= \
     obj/zerocoin/ParamGeneration.o \
     obj/zerocoin/Params.o \
     obj/zerocoin/SerialNumberSignatureOfKnowledge.o \
-    obj/zerocoin/SpendMetaData.o
+    obj/zerocoin/SpendMetaData.o \
+    obj/zerocoin/ZeroTest.o
 
 all: novacoind.exe
 
diff --git a/src/makefile.osx b/src/makefile.osx
index a5fb4ac496..c3a40b924d 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -112,7 +112,8 @@ OBJS= \
     obj/zerocoin/ParamGeneration.o \
     obj/zerocoin/Params.o \
     obj/zerocoin/SerialNumberSignatureOfKnowledge.o \
-    obj/zerocoin/SpendMetaData.o
+    obj/zerocoin/SpendMetaData.o \
+    obj/zerocoin/ZeroTest.o
 
 ifndef USE_UPNP
 	override USE_UPNP = -
diff --git a/src/makefile.unix b/src/makefile.unix
index 8aca367c97..8f5e786d04 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -143,7 +143,8 @@ OBJS= \
     obj/zerocoin/ParamGeneration.o \
     obj/zerocoin/Params.o \
     obj/zerocoin/SerialNumberSignatureOfKnowledge.o \
-    obj/zerocoin/SpendMetaData.o
+    obj/zerocoin/SpendMetaData.o \
+    obj/zerocoin/ZeroTest.o
 
 all: novacoind