diff --git a/test/main.cpp b/test/main.cpp
new file mode 100644
index 0000000..9aeb059
--- /dev/null
+++ b/test/main.cpp
@@ -0,0 +1,24 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2013-2016, Regents of the University of California.
+ *
+ * This file is part of ChronoShare, a decentralized file sharing application over NDN.
+ *
+ * ChronoShare 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.
+ *
+ * ChronoShare 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 copies of the GNU General Public License along with
+ * ChronoShare, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * See AUTHORS.md for complete list of ChronoShare authors and contributors.
+ */
+
+#define BOOST_TEST_MAIN 1
+#define BOOST_TEST_DYN_LINK 1
+
+#include <boost/test/unit_test.hpp>
diff --git a/test/test-action-log.cc b/test/unit-tests/test-action-log.cc
similarity index 100%
rename from test/test-action-log.cc
rename to test/unit-tests/test-action-log.cc
diff --git a/test/test-dispatcher.cc b/test/unit-tests/test-dispatcher.cc
similarity index 100%
rename from test/test-dispatcher.cc
rename to test/unit-tests/test-dispatcher.cc
diff --git a/test/test-event-scheduler.cc b/test/unit-tests/test-event-scheduler.cc
similarity index 100%
rename from test/test-event-scheduler.cc
rename to test/unit-tests/test-event-scheduler.cc
diff --git a/test/test-executor.cc b/test/unit-tests/test-executor.cc
similarity index 100%
rename from test/test-executor.cc
rename to test/unit-tests/test-executor.cc
diff --git a/test/test-fetch-manager.cc b/test/unit-tests/test-fetch-manager.cc
similarity index 100%
rename from test/test-fetch-manager.cc
rename to test/unit-tests/test-fetch-manager.cc
diff --git a/test/test-fetch-task-db.cc b/test/unit-tests/test-fetch-task-db.cc
similarity index 100%
rename from test/test-fetch-task-db.cc
rename to test/unit-tests/test-fetch-task-db.cc
diff --git a/test/test-fs-watcher-delay.cc b/test/unit-tests/test-fs-watcher-delay.cc
similarity index 98%
rename from test/test-fs-watcher-delay.cc
rename to test/unit-tests/test-fs-watcher-delay.cc
index 162d1d4..a44bde1 100644
--- a/test/test-fs-watcher-delay.cc
+++ b/test/unit-tests/test-fs-watcher-delay.cc
@@ -41,7 +41,7 @@
 void SlowWrite(fs::path & file)
 {
   fs::ofstream off(file, std::ios::out);
-  
+
   for (int i = 0; i < 10; i++){
     off << i  << endl;
     usleep(200000);
@@ -62,12 +62,12 @@
   FsWatcher::LocalFile_Change_Callback fileDelete = boost::bind(onDelete, _1);
 
   fs::path file = dir / "test.text";
-  
+
   thread watcherThread(run, dir, fileChange, fileDelete);
 
   thread writeThread(SlowWrite, file);
-  
-  
+
+
 
   usleep(10000000);
 
diff --git a/test/test-fs-watcher.cc b/test/unit-tests/test-fs-watcher.cc
similarity index 100%
rename from test/test-fs-watcher.cc
rename to test/unit-tests/test-fs-watcher.cc
diff --git a/test/test-ndnx-name.cc b/test/unit-tests/test-ndnx-name.cc
similarity index 90%
rename from test/test-ndnx-name.cc
rename to test/unit-tests/test-ndnx-name.cc
index 6022ec2..a876ba4 100644
--- a/test/test-ndnx-name.cc
+++ b/test/unit-tests/test-ndnx-name.cc
@@ -1,17 +1,17 @@
 
-#include "ndnx-name.h"
+#include "ccnx-name.h"
 
 #define BOOST_TEST_MAIN 1
 
 #include <boost/test/unit_test.hpp>
 
-using namespace Ndnx;
+using namespace Ccnx;
 using namespace std;
 using namespace boost;
 
-BOOST_AUTO_TEST_SUITE(NdnxNameTests)
+BOOST_AUTO_TEST_SUITE(CcnxNameTests)
 
-BOOST_AUTO_TEST_CASE (NdnxNameTest)
+BOOST_AUTO_TEST_CASE (CcnxNameTest)
 {
   Name empty = Name();
   Name root = Name("/");
diff --git a/test/test-ndnx-wrapper.cc b/test/unit-tests/test-ndnx-wrapper.cc
similarity index 91%
rename from test/test-ndnx-wrapper.cc
rename to test/unit-tests/test-ndnx-wrapper.cc
index eaf0ef3..9989cdb 100644
--- a/test/test-ndnx-wrapper.cc
+++ b/test/unit-tests/test-ndnx-wrapper.cc
@@ -19,25 +19,25 @@
  *         Alexander Afanasyev <alexander.afanasyev@ucla.edu>
  */
 
-#include "ndnx-wrapper.h"
-#include "ndnx-closure.h"
-#include "ndnx-name.h"
-#include "ndnx-selectors.h"
-#include "ndnx-pco.h"
+#include "ccnx-wrapper.h"
+#include "ccnx-closure.h"
+#include "ccnx-name.h"
+#include "ccnx-selectors.h"
+#include "ccnx-pco.h"
 #include <unistd.h>
 
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/make_shared.hpp>
 
-using namespace Ndnx;
+using namespace Ccnx;
 using namespace std;
 using namespace boost;
 
-BOOST_AUTO_TEST_SUITE(TestNdnxWrapper)
+BOOST_AUTO_TEST_SUITE(TestCcnxWrapper)
 
-NdnxWrapperPtr c1;
-NdnxWrapperPtr c2;
+CcnxWrapperPtr c1;
+CcnxWrapperPtr c2;
 int g_timeout_counter = 0;
 int g_dataCallback_counter = 0;
 
@@ -53,7 +53,7 @@
   c2->publishData(name, (const unsigned char*)content.c_str(), content.size(), 5);
 }
 
-void dataCallback(const Name &name, Ndnx::PcoPtr pco)
+void dataCallback(const Name &name, Ccnx::PcoPtr pco)
 {
   cout << " in data callback" << endl;
   BytesPtr content = pco->contentPtr ();
@@ -62,7 +62,7 @@
   BOOST_CHECK_EQUAL(name, msg);
 }
 
-void encapCallback(const Name &name, Ndnx::PcoPtr pco)
+void encapCallback(const Name &name, Ccnx::PcoPtr pco)
 {
   cout << " in encap data callback" << endl;
   BOOST_CHECK(!c1->verify(pco));
@@ -84,11 +84,11 @@
 {
   if (!c1)
   {
-    c1 = make_shared<NdnxWrapper> ();
+    c1 = make_shared<CcnxWrapper> ();
   }
   if (!c2)
   {
-    c2 = make_shared<NdnxWrapper> ();
+    c2 = make_shared<CcnxWrapper> ();
   }
 }
 
@@ -106,7 +106,7 @@
 }
 
 
-BOOST_AUTO_TEST_CASE (BlaNdnxWrapperTest)
+BOOST_AUTO_TEST_CASE (BlaCcnxWrapperTest)
 {
   INIT_LOGGERS ();
   
@@ -132,7 +132,7 @@
   teardown();
 }
 
-BOOST_AUTO_TEST_CASE (NdnxWrapperSelector)
+BOOST_AUTO_TEST_CASE (CcnxWrapperSelector)
 {
 
   setup();
@@ -220,7 +220,7 @@
 
 
  /*
- BOOST_AUTO_TEST_CASE (NdnxWrapperUnsigningTest)
+ BOOST_AUTO_TEST_CASE (CcnxWrapperUnsigningTest)
  {
    setup();
    Bytes data;
diff --git a/test/test-object-manager.cc b/test/unit-tests/test-object-manager.cc
similarity index 100%
rename from test/test-object-manager.cc
rename to test/unit-tests/test-object-manager.cc
diff --git a/test/test-protobuf.cc b/test/unit-tests/test-protobuf.cc
similarity index 100%
rename from test/test-protobuf.cc
rename to test/unit-tests/test-protobuf.cc
diff --git a/test/test-serve-and-fetch.cc b/test/unit-tests/test-serve-and-fetch.cc
similarity index 100%
rename from test/test-serve-and-fetch.cc
rename to test/unit-tests/test-serve-and-fetch.cc
diff --git a/test/test-sync-core.cc b/test/unit-tests/test-sync-core.cc
similarity index 100%
rename from test/test-sync-core.cc
rename to test/unit-tests/test-sync-core.cc
diff --git a/test/test-sync-log.cc b/test/unit-tests/test-sync-log.cc
similarity index 100%
rename from test/test-sync-log.cc
rename to test/unit-tests/test-sync-log.cc
diff --git a/test/wscript b/test/wscript
new file mode 100644
index 0000000..4de283c
--- /dev/null
+++ b/test/wscript
@@ -0,0 +1,25 @@
+# -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+top = '..'
+
+from waflib import Logs
+
+def build(bld):
+    Logs.error("Unit tests are temporary disabled")
+    return
+
+    bld(features='cxx',
+        target='unit-tests-main',
+        name='unit-tests-main',
+        source='main.cpp',
+        use='BOOST',
+        defines=['BOOST_TEST_MODULE=CHRONOSHARE Unit Test'])
+
+    unit_tests = bld.program(
+            target='../unit-tests',
+            features='cxx cxxprogram',
+            source=bld.path.ant_glob(['**/*.cpp'], excl=['main.cpp']),
+            use='unit-tests-main',
+            install_path=None,
+            defines='UNIT_TEST_CONFIG_PATH=\"%s/tmp-files/\"' % (bld.bldnode)
+          )