--- a/src/test/wscript	Wed Apr 06 15:32:12 2011 -0700
+++ b/src/test/wscript	Wed Apr 06 16:10:47 2011 -0700
@@ -5,7 +5,11 @@
 
 def build(bld):
     test = bld.create_ns3_module('test', ['internet', 'mobility', 'applications', 'csma', 'bridge', 'config-store', 'tools', 'point-to-point'])
-    test.source = [
+    headers = bld.new_task_gen('ns3header')
+    headers.module = 'test'
+
+    test_test = bld.create_ns3_module_test_library('test')
+    test_test.source = [
         'csma-system-test-suite.cc',
         'global-routing-test-suite.cc',
         'sample-test-suite.cc',
@@ -14,7 +18,3 @@
         'mobility-test-suite.cc',
         ]
 
-    headers = bld.new_task_gen('ns3header')
-    headers.module = 'test'
-    headers.source = [
-        ]