diff --git a/tests/wscript b/tests/wscript
index bafda9c..73f722a 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -3,10 +3,10 @@
 top = '..'
 
 def build(bld):
-    for app in bld.path.ant_glob('*.cpp'):
-        bld(features=['cxx', 'cxxprogram'],
-            target = '%s' % (str(app.change_ext('','.cpp'))),
-            source = app,
-            use = 'ndn-cpp-dev',
-            includes = "../include",
-            )        
+    unittests = bld.program (
+        target="unit-tests",
+        features = "cxx cxxprogram",
+        source = bld.path.ant_glob(['**/*.cpp']),
+        use = 'lib-objects',
+        install_prefix = None,
+        )