diff --git a/wscript b/wscript
index 7003118..d57a36d 100644
--- a/wscript
+++ b/wscript
@@ -39,6 +39,8 @@
     nfdopt = opt.add_option_group('NFD Options')
     nfdopt.add_option('--with-tests', action='store_true', default=False,
                       dest='with_tests', help='''Build unit tests''')
+    nfdopt.add_option('--with-other-tests', action='store_true', default=False,
+                      dest='with_other_tests', help='''Build other tests''')
 
 def configure(conf):
     conf.load("compiler_cxx boost gnu_dirs")
@@ -57,6 +59,9 @@
         conf.define('WITH_TESTS', 1);
         boost_libs += ' unit_test_framework'
 
+    if conf.options.with_other_tests:
+        conf.env['WITH_OTHER_TESTS'] = 1
+
     conf.check_boost(lib=boost_libs)
 
     if conf.env.BOOST_VERSION_NUMBER < 104800:
@@ -85,6 +90,7 @@
 def build(bld):
     nfd_objects = bld(
         target='nfd-objects',
+        name='nfd-objects',
         features='cxx',
         source=bld.path.ant_glob(['daemon/**/*.cpp'],
                                  excl=['daemon/face/ethernet-*.cpp',
@@ -135,6 +141,9 @@
         if bld.env['HAVE_UNIX_SOCKETS']:
             unit_tests.source += bld.path.ant_glob('tests/face/unix-*.cpp')
 
+    if bld.env['WITH_OTHER_TESTS']:
+        bld.recurse("tests-other")
+
     bld(features="subst",
         source='nfd.conf.sample.in',
         target='nfd.conf.sample',