diff --git a/src/energy/wscript b/src/energy/wscript
index 2d37a34c5..6892a3183 100644
--- a/src/energy/wscript
+++ b/src/energy/wscript
@@ -16,10 +16,15 @@ def build(bld):
         'helper/basic-energy-source-helper.cc',
         'helper/wifi-radio-energy-model-helper.cc',
         'helper/rv-battery-model-helper.cc',
+        ]
+
+    obj_test = bld.create_ns3_module_test_library('energy')
+    obj_test.source = [
         'test/basic-energy-model-test.cc',
         'test/rv-battery-model-test.cc',
         'test/li-ion-energy-source-test.cc',
         ]
+
     headers = bld.new_task_gen('ns3header')
     headers.module = 'energy'
     headers.source = [
diff --git a/src/lte/wscript b/src/lte/wscript
index b05f91454..b1e8aba31 100644
--- a/src/lte/wscript
+++ b/src/lte/wscript
@@ -36,11 +36,15 @@ def build(bld):
         'model/packet-scheduler.cc',
         'model/simple-packet-scheduler.cc',
         'model/ideal-control-messages.cc',
+        'helper/lte-helper.cc',
+        ]
+
+    module_test = bld.create_ns3_module_test_library('lte')
+    module_test.source = [
         'test/lte-phy-test.cc',
         'test/lte-device-test.cc',
         'test/lte-bearer-test.cc',
         'test/lte-propagation-loss-model-test.cc',
-        'helper/lte-helper.cc',
         ]
     
     headers = bld.new_task_gen('ns3header')
diff --git a/src/mobility/wscript b/src/mobility/wscript
index e429de685..ad76150b7 100644
--- a/src/mobility/wscript
+++ b/src/mobility/wscript
@@ -21,6 +21,10 @@ def build(bld):
         'model/waypoint-mobility-model.cc',
         'helper/mobility-helper.cc',
         'helper/ns2-mobility-helper.cc',
+        ]
+
+    mobility_test = bld.create_ns3_module_test_library('mobility')
+    mobility_test.source = [
         'test/steady-state-random-waypoint-mobility-model-test.cc',
         'test/waypoint-mobility-model-test.cc',
         ]
diff --git a/src/olsr/wscript b/src/olsr/wscript
index f51fc891a..0fb51a142 100644
--- a/src/olsr/wscript
+++ b/src/olsr/wscript
@@ -8,6 +8,10 @@ def build(bld):
         'model/olsr-state.cc',
         'model/olsr-routing-protocol.cc',
         'helper/olsr-helper.cc',
+        ]
+
+    module_test = bld.create_ns3_module_test_library('olsr')
+    module_test.source = [
         'test/regression-test-suite.cc',
         'test/hello-regression-test.cc',
         'test/tc-regression-test.cc',
diff --git a/src/openflow/wscript b/src/openflow/wscript
index 55bacfa1a..9f13604f2 100644
--- a/src/openflow/wscript
+++ b/src/openflow/wscript
@@ -110,8 +110,13 @@ def build(bld):
     obj.source = [
         ]
 
+    obj_test = bld.create_ns3_module_test_library('openflow')
+    obj_test.source = [
+        ]
+
     if bld.env['OPENFLOW'] and bld.env['DL'] and bld.env['XML2']:
-	obj.uselib = 'OPENFLOW DL XML2' 
+	obj.uselib      = 'OPENFLOW DL XML2' 
+	obj_test.uselib = 'OPENFLOW DL XML2' 
 
     headers = bld.new_task_gen('ns3header')
     headers.module = 'openflow'
@@ -122,7 +127,7 @@ def build(bld):
 	obj.source.append('model/openflow-interface.cc')
         obj.source.append('model/openflow-switch-net-device.cc')
 	obj.source.append('helper/openflow-switch-helper.cc')
-	obj.source.append('test/openflow-switch-test-suite.cc')
+	obj_test.source.append('test/openflow-switch-test-suite.cc')
 	headers.source.append('model/openflow-interface.h')
         headers.source.append('model/openflow-switch-net-device.h')
 	headers.source.append('helper/openflow-switch-helper.h')
diff --git a/src/propagation/wscript b/src/propagation/wscript
index a0bed29a5..d3d4918b9 100644
--- a/src/propagation/wscript
+++ b/src/propagation/wscript
@@ -8,6 +8,10 @@ def build(bld):
         'model/propagation-loss-model.cc',
         'model/jakes-propagation-loss-model.cc',
         'model/cost231-propagation-loss-model.cc',
+        ]
+
+    module_test = bld.create_ns3_module_test_library('propagation')
+    module_test.source = [
         'test/propagation-loss-model-test-suite.cc',
         ]
 
diff --git a/src/spectrum/wscript b/src/spectrum/wscript
index 88383c9f2..20f2ce60a 100644
--- a/src/spectrum/wscript
+++ b/src/spectrum/wscript
@@ -30,6 +30,10 @@ def build(bld):
         'helper/adhoc-aloha-noack-ideal-phy-helper.cc',
         'helper/waveform-generator-helper.cc',
         'helper/spectrum-analyzer-helper.cc',
+        ]
+
+    module_test = bld.create_ns3_module_test_library('spectrum')
+    module_test.source = [
         'test/spectrum-interference-test.cc',
         'test/spectrum-value-test.cc',
         ]