diff --git a/v1/allyourbase.jam b/v1/allyourbase.jam
index f5480b1d7..87e5cb2ba 100644
--- a/v1/allyourbase.jam
+++ b/v1/allyourbase.jam
@@ -523,7 +523,7 @@ set-as-singleton
 # dwa 6/17/01 - added test
 DEPENDS all : shell files lib dll exe obj ;
 DEPENDS all shell files lib dll exe obj test : first ;
-NOTFILE all first shell files lib dll exe obj dirs clean uninstall test ;
+NOTFILE all first shell files lib dll exe obj dirs clean uninstall test nothing ;
 ALWAYS clean uninstall ;
 
 #
diff --git a/v1/testing.jam b/v1/testing.jam
index b52b3ec84..809e1abaa 100755
--- a/v1/testing.jam
+++ b/v1/testing.jam
@@ -70,7 +70,7 @@ rule boost-test ( sources + : target-type : requirements * : test-name ? : defau
                 .all-boost-tests += $(result) ;
             }
             
-            if --dump-tests in $(ARGV)
+            if --dump-tests in $(ARGV) && $(result)
             {
                 dump-test $(library) : $(result) : $(requirements) ;
             }
@@ -153,6 +153,13 @@ local rule dump-test ( library ? : targets + : requirements * )
         ":" \"$(source-files)\"
           ;
     
+    if --dump-test-targets in $(ARGV)
+    {
+        ECHO boost-test(TARGET)
+            \"$(test-id)\" [$(dump-test-info)] ":"
+            \"$(targets)\"
+            ;
+    }
 }