diff --git a/src/tools/python.jam b/src/tools/python.jam
index 7791e71fb..66c05bb2b 100644
--- a/src/tools/python.jam
+++ b/src/tools/python.jam
@@ -526,6 +526,7 @@ class python-test-generator : generator
     rule run ( project name ? : property-set : sources * : multiple ? )
     {       
         local python ;
+        local other-pythons ;
         for local s in $(sources)
         {
             if [ $(s).type ] = PY
@@ -538,7 +539,7 @@ class python-test-generator : generator
                 else
                 {
                     # Other Python sources become dependencies.
-                    property-set = [ $(property-set).add-raw <dependency>$(s) ] ;
+                    other-pythons += $(s) ;
                 }                
             }
         }
@@ -585,7 +586,8 @@ class python-test-generator : generator
             }
         }
 
-            
+        property-set = [ $(property-set).add-raw <dependency>$(other-pythons) ] ;
+        
         result = [ construct-result $(python) $(extensions) $(new-sources) 
           : $(project) $(name) : $(property-set) ] ;        
     }    
@@ -598,6 +600,10 @@ generators.register-standard testing.expect-success
   : RUN_PYD_OUTPUT : RUN_PYD ;
 
 
+# The flag settings on testing.capture-output do not
+# apply to python.capture output at the moment.
+# Redo this explicitly.
+toolset.flags python.capture-output ARGS <testing.arg> ;
 rule capture-output ( target : sources * : properties * )
 {
     # Setup up proper DLL search path.