diff --git a/tests/wscript b/tests/wscript
index 26d020b..5bd65f4 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -6,14 +6,14 @@
 
     # Unit tests
     tests = bld.create_ns3_program('ndnSIM-unit-tests', all_modules)
-    tests.source = bld.path.ant_glob(['main.cpp', 'unit-tests/**/*.cpp'])
+    tests.source = bld.path.ant_glob(['main.cpp', 'unit-tests/**/*.cpp'],
+                                     excl=['unit-tests/*/**/*.cpp'])
     tests.includes = ['#', '.', '../NFD/', "../NFD/daemon", "../NFD/core", "../helper", "../model", "../apps", "../utils", "../examples"]
     tests.defines = 'TEST_CONFIG_PATH=\"%s/conf-test\"' %(bld.bldnode)
 
-    # Other tests
-    for i in bld.path.ant_glob(['other/*.cpp']):
-        name = str(i)[:-len(".cpp")]
-        obj = bld.create_ns3_program(name, all_modules)
-        obj.source = [i] + bld.path.ant_glob(['%s/**/*.cpp' % name])
-        obj.install_path = None
-
+    # # Other tests
+    # for i in bld.path.ant_glob(['other/*.cpp']):
+    #     name = str(i)[:-len(".cpp")]
+    #     obj = bld.create_ns3_program(name, all_modules)
+    #     obj.source = [i] + bld.path.ant_glob(['%s/**/*.cpp' % name])
+    #     obj.install_path = None