diff --git a/src/applications/wscript b/src/applications/wscript
index e6f9582bd..85fa0513b 100644
--- a/src/applications/wscript
+++ b/src/applications/wscript
@@ -1,6 +1,10 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 
+def configure(conf):
+    conf.env.append_value('NS3_MODULES', 'ns3-applications')
+
+
 def build(bld):
     obj = bld.create_obj('cpp', 'shlib')
     obj.name = 'ns3-applications'
diff --git a/src/common/wscript b/src/common/wscript
index b62e204b2..65753d930 100644
--- a/src/common/wscript
+++ b/src/common/wscript
@@ -1,5 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
+def configure(conf):
+    conf.env.append_value('NS3_MODULES', 'ns3-common')
 
 def build(bld):
     common = bld.create_obj('cpp', 'shlib')
diff --git a/src/core/wscript b/src/core/wscript
index 222539171..ce9795c8e 100644
--- a/src/core/wscript
+++ b/src/core/wscript
@@ -3,6 +3,8 @@ import sys
 
 
 def configure(conf):
+    conf.env.append_value('NS3_MODULES', 'ns3-core')
+
     e = conf.create_header_configurator()
     e.mandatory = False
     e.name = 'stdlib.h'
diff --git a/src/devices/p2p/wscript b/src/devices/p2p/wscript
index 73b27d061..c4c0f7952 100644
--- a/src/devices/p2p/wscript
+++ b/src/devices/p2p/wscript
@@ -1,6 +1,10 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 
+def configure(conf):
+    conf.env.append_value('NS3_MODULES', 'ns3-p2p')
+
+
 def build(bld):
     p2p = bld.create_obj('cpp', 'shlib')
     p2p.name = 'ns3-p2p'
diff --git a/src/internet-node/wscript b/src/internet-node/wscript
index bf3236159..806861fd3 100644
--- a/src/internet-node/wscript
+++ b/src/internet-node/wscript
@@ -1,6 +1,10 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 
+def configure(conf):
+    conf.env.append_value('NS3_MODULES', 'ns3-internet-node')
+
+
 def build(bld):
     obj = bld.create_obj('cpp', 'shlib')
     obj.name = 'ns3-internet-node'
diff --git a/src/node/wscript b/src/node/wscript
index b39d6fa1e..c608945c7 100644
--- a/src/node/wscript
+++ b/src/node/wscript
@@ -1,5 +1,8 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
+def configure(conf):
+    conf.env.append_value('NS3_MODULES', 'ns3-node')
+
 
 def build(bld):
     node = bld.create_obj('cpp', 'shlib')
diff --git a/src/simulator/wscript b/src/simulator/wscript
index b18ec3802..3f038d813 100644
--- a/src/simulator/wscript
+++ b/src/simulator/wscript
@@ -13,6 +13,8 @@ def set_options(opt):
 
 
 def configure(conf):
+    conf.env.append_value('NS3_MODULES', 'ns3-simulator')
+
     if Params.g_options.high_precision_as_double:
         conf.add_define('USE_HIGH_PRECISION_DOUBLE', 1)
         conf.env['USE_HIGH_PRECISION_DOUBLE'] = 1
diff --git a/src/wscript b/src/wscript
index ae5647577..2e2349f10 100644
--- a/src/wscript
+++ b/src/wscript
@@ -29,6 +29,7 @@ def configure(conf):
 
     blddir = os.path.abspath(os.path.join(conf.m_blddir, conf.env.variant()))
     for module in all_modules:
+        conf.sub_config(module)
         conf.env.append_value('NS3_MODULE_PATH', os.path.join(blddir, 'src', module))
 
 
diff --git a/utils/wscript b/utils/wscript
index cc0755526..fb9857559 100644
--- a/utils/wscript
+++ b/utils/wscript
@@ -1,23 +1,24 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
-import sys
-import Params
 
 
 def build(bld):
+    env = bld.env_of_name('default')
 
     def create_ns_prog(name, source):
         obj = bld.create_obj('cpp', 'program')
         obj.target = name
-        obj.uselib_local = "ns3-core ns3-common ns3-simulator"
         obj.source = source
         return obj
 
     unit_tests = create_ns_prog('run-tests', 'run-tests.cc')
     unit_tests.install_var  = 0 # do not install
     unit_tests.unit_test    = 1 # runs on 'waf check'
+    ## link unit test program with all ns3 modules
+    unit_tests.uselib_local = env['NS3_MODULES']
+    print env['NS3_MODULES']
     
-    #if sys.platform != 'win32':
     obj = create_ns_prog('bench-simulator', 'bench-simulator.cc')
+    obj.uselib_local = "ns3-core ns3-common ns3-simulator"
+
     obj = create_ns_prog('replay-simulation', 'replay-simulation.cc')
-    ## bench-packets requires missing header files
-    #obj = create_ns_prog('bench-packets', 'bench-packets.cc')
+    obj.uselib_local = "ns3-core ns3-common ns3-simulator"