diff --git a/main.cpp b/main.cpp
deleted file mode 100755
index 836632fca8b4946e414363e73635c375e36c33bd..0000000000000000000000000000000000000000
--- a/main.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <iostream>
-
-#include "config.h"
-#define BOOST_TEST_MODULE "C++ test module for OpenFPM_data project"
-#include <boost/test/included/unit_test.hpp>
-
-#include "memory/HeapMemory_unit_tests.hpp"
-
diff --git a/src/main.cpp b/src/main.cpp
index 02c7bda13574769499bf481ce5b15e98934e32ee..f234a328fb008273c8471aa4322d3dc253a0eba7 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,19 @@
 #include <iostream>
-#define BOOST_TEST_MODULE "C++ test module for OpenFPM_data project"
-#include <boost/test/included/unit_test.hpp>
+
+#define BOOST_TEST_DYN_LINK
+#include <boost/test/unit_test.hpp>
+
+// initialization function:
+bool init_unit_test()
+{
+  return true;
+}
+
+// entry point:
+int main(int argc, char* argv[])
+{
+  return boost::unit_test::unit_test_main( &init_unit_test, argc, argv );
+}
 
 #include "config.h"
 #include "memory/Memory_unit_tests.hpp"