diff --git a/test_old/Makefile b/test_old/Makefile
new file mode 100644
index 0000000..c53da6d
--- /dev/null
+++ b/test_old/Makefile
@@ -0,0 +1,23 @@
+include ../Makefile.conf
+
+LDFLAGS=-L../src_old -L$(PREFIX)/lib -L$(PREFIX_GTEST)/lib
+LDLIBS=-lstdc++ -lpEpCxx11 -lpEpEngine -lpEpAdapter
+CXXFLAGS:=-I../src_old $(CXXFLAGS) -I$(PREFIX_GTEST)/include
+
+TEST_SOURCE=$(wildcard *.cc)
+TEST_OBJECTS=$(subst .cc,.o,$(TEST_SOURCE))
+
+.PHONY: all, clean
+
+all: unittests
+
+unittests: $(TEST_OBJECTS) ../src_old/libpEpDatatypes.a
+	$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS) -lgtest -lgtest_main
+
+
+
+
+clean:
+	rm -f unittests
+	rm -Rf *.dSYM
+	rm -f *.o
diff --git a/test/unittest_identity.cc b/test_old/unittest_identity.cc
similarity index 98%
rename from test/unittest_identity.cc
rename to test_old/unittest_identity.cc
index 45b467e..fdf091a 100644
--- a/test/unittest_identity.cc
+++ b/test_old/unittest_identity.cc
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "../src/types.hh"
+#include "../src_old/types.hh"
 
 
 TEST(PepIdentity, Simple)
diff --git a/test/unittest_message.cc b/test_old/unittest_message.cc
similarity index 99%
rename from test/unittest_message.cc
rename to test_old/unittest_message.cc
index 1d135ee..67ffdcd 100644
--- a/test/unittest_message.cc
+++ b/test_old/unittest_message.cc
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "../src/types.hh"
+#include "../src_old/types.hh"
 
 namespace {
     static const char*
diff --git a/test/unittest_nfc.cc b/test_old/unittest_nfc.cc
similarity index 98%
rename from test/unittest_nfc.cc
rename to test_old/unittest_nfc.cc
index 14ff506..96e158d 100644
--- a/test/unittest_nfc.cc
+++ b/test_old/unittest_nfc.cc
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "../src/nfc.hh" // for illegal_utf8 exception
+#include "../src_old/nfc.hh" // for illegal_utf8 exception
 #include <vector>
 
 using namespace pEp;
diff --git a/test/unittest_nfc16.cc b/test_old/unittest_nfc16.cc
similarity index 98%
rename from test/unittest_nfc16.cc
rename to test_old/unittest_nfc16.cc
index ccc8175..296e5df 100644
--- a/test/unittest_nfc16.cc
+++ b/test_old/unittest_nfc16.cc
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "../src/nfc.hh" // for illegal_utf8 exception
+#include "../src_old/nfc.hh" // for illegal_utf8 exception
 #include <vector>
 
 using namespace pEp;
diff --git a/test/unittest_nfcstring.cc b/test_old/unittest_nfcstring.cc
similarity index 96%
rename from test/unittest_nfcstring.cc
rename to test_old/unittest_nfcstring.cc
index 4e79bb0..0435e51 100644
--- a/test/unittest_nfcstring.cc
+++ b/test_old/unittest_nfcstring.cc
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "../src/nfc.hh" // for illegal_utf8 exception
+#include "../src_old/nfc.hh" // for illegal_utf8 exception
 #include <vector>
 
 using namespace pEp;
diff --git a/test/unittest_stringlist.cc b/test_old/unittest_stringlist.cc
similarity index 98%
rename from test/unittest_stringlist.cc
rename to test_old/unittest_stringlist.cc
index 91b6c2a..92f161d 100644
--- a/test/unittest_stringlist.cc
+++ b/test_old/unittest_stringlist.cc
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "../src/types.hh"
+#include "../src_old/types.hh"
 
 
 TEST(StringList, Simple)
diff --git a/test/unittest_stringpair.cc b/test_old/unittest_stringpair.cc
similarity index 98%
rename from test/unittest_stringpair.cc
rename to test_old/unittest_stringpair.cc
index a62a312..412d5ef 100644
--- a/test/unittest_stringpair.cc
+++ b/test_old/unittest_stringpair.cc
@@ -1,6 +1,6 @@
 #include <gtest/gtest.h>
 
-#include "../src/types.hh"
+#include "../src_old/types.hh"
 
 typedef pEp::StringPair SP;