diff --git a/src/aodv/wscript b/src/aodv/wscript
index 103ffd8be..284ab178b 100644
--- a/src/aodv/wscript
+++ b/src/aodv/wscript
@@ -12,6 +12,10 @@ def build(bld):
         'model/aodv-neighbor.cc',
         'model/aodv-routing-protocol.cc',
 	'helper/aodv-helper.cc',
+        ]
+
+    aodv_test = bld.create_ns3_module_test_library('aodv')
+    aodv_test.source = [
         'test/aodv-test-suite.cc',
         'test/aodv-regression.cc',
         'test/bug-772.cc',
diff --git a/src/applications/wscript b/src/applications/wscript
index 18dc43d1b..695abf946 100644
--- a/src/applications/wscript
+++ b/src/applications/wscript
@@ -25,8 +25,13 @@ def build(bld):
         'helper/udp-client-server-helper.cc',
         'helper/udp-echo-helper.cc',
         'helper/v4ping-helper.cc',
+        ]
+
+    applications_test = bld.create_ns3_module_test_library('applications')
+    applications_test.source = [
         'test/udp-client-server-test.cc',
         ]
+
     headers = bld.new_task_gen('ns3header')
     headers.module = 'applications'
     headers.source = [
diff --git a/src/click/wscript b/src/click/wscript
index 47530c316..141be0186 100644
--- a/src/click/wscript
+++ b/src/click/wscript
@@ -74,12 +74,17 @@ def build(bld):
     module.source = [
         'model/ipv4-click-routing.cc',
         'model/ipv4-l3-click-protocol.cc',
-        'test/ipv4-click-routing-test.cc',
         'helper/click-internet-stack-helper.cc',
         ]
 
+    module_test = bld.create_ns3_module_test_library('click')
+    module_test.source = [
+        'test/ipv4-click-routing-test.cc',
+        ]
+
     if bld.env['NSCLICK'] and bld.env['DL']:
-        module.uselib = 'NSCLICK DL'
+        module.uselib      = 'NSCLICK DL'
+        module_test.uselib = 'NSCLICK DL'
 
     headers = bld.new_task_gen('ns3header')
     headers.module = 'click'
diff --git a/src/dsdv/wscript b/src/dsdv/wscript
index d73819ab8..36fc14574 100644
--- a/src/dsdv/wscript
+++ b/src/dsdv/wscript
@@ -9,6 +9,10 @@ def build(bld):
         'model/dsdv-packet.cc',
         'model/dsdv-routing-protocol.cc',
         'helper/dsdv-helper.cc',
+        ]
+
+    module_test = bld.create_ns3_module_test_library('dsdv')
+    module_test.source = [
         'test/dsdv-testcase.cc',
         ]
 
diff --git a/src/internet/wscript b/src/internet/wscript
index f794d7b81..91e979688 100644
--- a/src/internet/wscript
+++ b/src/internet/wscript
@@ -94,10 +94,6 @@ def build(bld):
     # bridge and mpi dependencies are due to global routing
     obj = bld.create_ns3_module('internet', ['bridge', 'mpi', 'network', 'core'])
     obj.source = [
-        'test/tcp-test.cc',
-        'test/udp-test.cc',
-        'test/ipv4-test.cc',
-        'test/ipv4-raw-test.cc',
         'model/ipv4-l4-protocol.cc',
         'model/udp-header.cc',
         'model/tcp-header.cc',
@@ -137,8 +133,6 @@ def build(bld):
         'model/ipv6-option-header.cc',
         'model/ipv6-option-demux.cc',
         'model/icmpv6-l4-protocol.cc',
-        'test/ipv6-test.cc',
-        'test/ipv6-extension-header-test-suite.cc',
         'model/tcp-socket-base.cc',
         'model/tcp-rfc793.cc',
         'model/tcp-tahoe.cc',
@@ -191,6 +185,16 @@ def build(bld):
         'helper/ipv6-routing-helper.cc',
         ]
 
+    internet_test = bld.create_ns3_module_test_library('internet')
+    internet_test.source = [
+        'test/ipv4-raw-test.cc',
+        'test/ipv4-test.cc',
+        'test/ipv6-extension-header-test-suite.cc',
+        'test/ipv6-test.cc',
+        'test/tcp-test.cc',
+        'test/udp-test.cc',
+        ]
+
     headers = bld.new_task_gen('ns3header')
     headers.module = 'internet'
     headers.source = [
@@ -267,7 +271,8 @@ def build(bld):
         obj.source.append ('model/nsc-tcp-socket-factory-impl.cc')
         obj.source.append ('model/nsc-sysctl.cc')
         headers.source.append('model/nsc-tcp-l4-protocol.h')
-        obj.uselib = 'DL'
+        obj.uselib           = 'DL'
+        internet_test.uselib = 'DL'
 
     bld.ns3_python_bindings()
 
diff --git a/src/network/wscript b/src/network/wscript
index f27be58f1..689e05962 100644
--- a/src/network/wscript
+++ b/src/network/wscript
@@ -1,8 +1,8 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    node = bld.create_ns3_module('network', ['core'])
-    node.source = [
+    network = bld.create_ns3_module('network', ['core'])
+    network.source = [
         'model/address.cc',
         'model/application.cc',
         'model/buffer.cc',