diff --git a/utils/wscript b/utils/wscript
index 83b897923..2e64ba677 100644
--- a/utils/wscript
+++ b/utils/wscript
@@ -13,8 +13,7 @@ def build(bld):
     env = bld.env_of_name('default')
 
     unit_tests = bld.create_ns3_program('run-tests', ['common'])
-    unit_tests.install_var  = 0 # do not install
-    unit_tests.unit_test    = 1 # runs on 'waf check'
+    unit_tests.inst_var  = 0 # do not install
     unit_tests.source = 'run-tests.cc'
     ## link unit test program with all ns3 modules
     unit_tests.uselib_local = 'ns3'
diff --git a/wscript b/wscript
index d170fcf2b..0d37b9a30 100644
--- a/wscript
+++ b/wscript
@@ -20,6 +20,7 @@ APPNAME = 'ns'
 srcdir = '.'
 blddir = 'build'
 
+
 def dist_hook():
     shutil.rmtree("doc/html", True)
     shutil.rmtree("doc/latex", True)
@@ -272,12 +273,13 @@ def _run_waf_check():
     env = Params.g_build.env_of_name('default')
     proc_env = _get_proc_env()
     try:
-        prog = _find_program('print-introspected-doxygen', env).m_linktask.m_outputs[0].abspath(env)
+        program_obj = _find_program('print-introspected-doxygen', env)
     except ValueError: # could happen if print-introspected-doxygen is
                        # not built because of waf configure
                        # --enable-modules=xxx
         pass
     else:
+        prog = program_obj.path.find_build(program_obj.get_target_name()).abspath(env)
         out = open('doc/introspected-doxygen.h', 'w')
         if subprocess.Popen([prog], stdout=out, env=proc_env).wait():
             raise SystemExit(1)
@@ -356,7 +358,7 @@ def run_program(program_string, command_template=None):
             Params.fatal(str(ex))
 
         try:
-            program_node, = program_obj.m_linktask.m_outputs
+            program_node = program_obj.path.find_build(program_obj.get_target_name())
         except AttributeError:
             Params.fatal("%s does not appear to be a program" % (program_name,))
 
@@ -370,7 +372,7 @@ def run_program(program_string, command_template=None):
         except ValueError, ex:
             Params.fatal(str(ex))
         try:
-            program_node, = program_obj.m_linktask.m_outputs
+            program_node = program_obj.path.find_build(program_obj.get_target_name())
         except AttributeError:
             Params.fatal("%s does not appear to be a program" % (program_name,))