diff --git a/tests/main.cc b/tests/boost-test.hpp
similarity index 76%
copy from tests/main.cc
copy to tests/boost-test.hpp
index 1af6df7..7756923 100644
--- a/tests/main.cc
+++ b/tests/boost-test.hpp
@@ -17,7 +17,15 @@
  * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
+#ifndef CHRONOSYNC_TESTS_BOOST_TEST_HPP
+#define CHRONOSYNC_TESTS_BOOST_TEST_HPP
+
+// suppress warnings from Boost.Test
+#pragma GCC system_header
+#pragma clang system_header
 
 #include <boost/test/unit_test.hpp>
+#include <boost/concept_check.hpp>
+#include <boost/test/output_test_stream.hpp>
+
+#endif // CHRONOSYNC_TESTS_BOOST_TEST_HPP
diff --git a/tests/main.cc b/tests/main.cpp
similarity index 95%
rename from tests/main.cc
rename to tests/main.cpp
index 1af6df7..6185729 100644
--- a/tests/main.cc
+++ b/tests/main.cpp
@@ -20,4 +20,4 @@
 #define BOOST_TEST_MAIN 1
 #define BOOST_TEST_DYN_LINK 1
 
-#include <boost/test/unit_test.hpp>
+#include "boost-test.hpp"
diff --git a/tests/test-leaf.cc b/tests/test-leaf.cpp.outdated
similarity index 100%
rename from tests/test-leaf.cc
rename to tests/test-leaf.cpp.outdated
diff --git a/tests/test-data-fetch-and-publish.cc b/tests/unit-tests/test-data-fetch-and-publish.cpp.outdated
similarity index 100%
rename from tests/test-data-fetch-and-publish.cc
rename to tests/unit-tests/test-data-fetch-and-publish.cpp.outdated
diff --git a/tests/test-digest.cc b/tests/unit-tests/test-digest.cpp.outdated
similarity index 100%
rename from tests/test-digest.cc
rename to tests/unit-tests/test-digest.cpp.outdated
diff --git a/tests/main.cc b/tests/unit-tests/test-empty.cpp
similarity index 90%
copy from tests/main.cc
copy to tests/unit-tests/test-empty.cpp
index 1af6df7..e4abe0c 100644
--- a/tests/main.cc
+++ b/tests/unit-tests/test-empty.cpp
@@ -17,7 +17,9 @@
  * ChronoSync, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define BOOST_TEST_MAIN 1
-#define BOOST_TEST_DYN_LINK 1
+#include "boost-test.hpp"
 
-#include <boost/test/unit_test.hpp>
+BOOST_AUTO_TEST_CASE(EmptyTest)
+{
+
+}
diff --git a/tests/test-interest-table.cc b/tests/unit-tests/test-interest-table.cpp.outdated
similarity index 95%
rename from tests/test-interest-table.cc
rename to tests/unit-tests/test-interest-table.cpp.outdated
index b5085c7..2db3eed 100644
--- a/tests/test-interest-table.cc
+++ b/tests/unit-tests/test-interest-table.cpp.outdated
@@ -33,7 +33,7 @@
 BOOST_AUTO_TEST_CASE (InterestTableTest)
 {
   // Alex: test is broken due to changes in SyncInterestTable
-  cerr << "InterestTableTest is broken" << endl;
+  // cerr << "InterestTableTest is broken" << endl;
 
   // SyncInterestTable *table = 0;
   // BOOST_CHECK_NO_THROW (table = new SyncInterestTable ());
diff --git a/tests/test-pit.cc b/tests/unit-tests/test-pit.cpp.outdated
similarity index 100%
rename from tests/test-pit.cc
rename to tests/unit-tests/test-pit.cpp.outdated
diff --git a/tests/test-scheduler.cc.tmp b/tests/unit-tests/test-scheduler.cc.tmp
similarity index 100%
rename from tests/test-scheduler.cc.tmp
rename to tests/unit-tests/test-scheduler.cc.tmp
diff --git a/tests/test-socket.cc b/tests/unit-tests/test-socket.cpp.outdated
similarity index 100%
rename from tests/test-socket.cc
rename to tests/unit-tests/test-socket.cpp.outdated
diff --git a/tests/test-state.cc.outdated b/tests/unit-tests/test-state.cc.outdated
similarity index 100%
rename from tests/test-state.cc.outdated
rename to tests/unit-tests/test-state.cc.outdated
diff --git a/tests/test-sync-logic.cc b/tests/unit-tests/test-sync-logic.cpp.outdated
similarity index 100%
rename from tests/test-sync-logic.cc
rename to tests/unit-tests/test-sync-logic.cpp.outdated
diff --git a/tests/test-sync-validator.cc b/tests/unit-tests/test-sync-validator.cpp.outdated
similarity index 100%
rename from tests/test-sync-validator.cc
rename to tests/unit-tests/test-sync-validator.cpp.outdated
diff --git a/tests/wscript b/tests/wscript
new file mode 100644
index 0000000..bc847a9
--- /dev/null
+++ b/tests/wscript
@@ -0,0 +1,22 @@
+# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+from waflib import Utils
+
+top = '..'
+
+def build(bld):
+    unit_test_main = bld(
+        target='unit-tests-main',
+        name='unit-tests-main',
+        features='cxx',
+        source=bld.path.ant_glob(['*.cpp']),
+        use='ChronoSync',
+        )
+
+    unit_test = bld.program(
+        target="../unit-tests",
+        source=bld.path.ant_glob(['unit-tests/**/*.cpp']),
+        features=['cxx', 'cxxprogram'],
+        use='ChronoSync, unit-tests-main',
+        includes=['.'],
+        install_path=None,
+        )