diff --git a/test/boostTest.cpp b/test/boostTest.cpp
new file mode 100644
index 000000000..7d89f853c
--- /dev/null
+++ b/test/boostTest.cpp
@@ -0,0 +1,24 @@
+/*
+	This file is part of cpp-ethereum.
+
+	cpp-ethereum is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	cpp-ethereum is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/** @file boostTest.cpp
+ * @author Marko Simovic <markobarko@gmail.com>
+ * @date 2014
+ * Stub for generating main boost.test module.
+ */
+
+#define BOOST_TEST_MODULE EthereumTests
+#include <boost/test/included/unit_test.hpp>
diff --git a/test/main.cpp b/test/main.cpp
index c5d750204..4cfb71ced 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -20,6 +20,8 @@
  * Main test functions.
  */
 
+#include <boost/test/unit_test.hpp>
+
 // TODO: utilise the shared testdata.
 
 int trieTest();
@@ -34,7 +36,7 @@ int peerTest(int argc, char** argv);
 #include <BlockInfo.h>
 using namespace eth;
 
-int main(int, char**)
+BOOST_AUTO_TEST_CASE(basic_tests)
 {
 /*	RLPStream s;
 	BlockInfo::genesis().fillStream(s, false);
@@ -51,7 +53,6 @@ int main(int, char**)
 //	r += daggerTest();
 //	r += stateTest();
 //	r += peerTest(argc, argv);
-	assert(!r);
-	return 0;
+	BOOST_REQUIRE(!r);
 }