diff --git a/v2/tools/testing.jam b/v2/tools/testing.jam
index 58a2569c9..a765894a1 100644
--- a/v2/tools/testing.jam
+++ b/v2/tools/testing.jam
@@ -278,17 +278,9 @@ rule run-path-setup ( target : source : properties * )
     {    
         dll-paths = [ sequence.transform path.native : $(dll-paths) ] ;
         
-        local var-name = LD_LIBRARY_PATH ;
-        # Even on cygwin, the LD_LIBRARY_PATH has no effect, need to
-        # use PATH. 
-        if [ os.on-windows ]
-        {
-            var-name = PATH ;
-        }
-        
         PATH_SETUP on $(target) = 
-          [ common.path-variable-setting-command $(var-name) 
-            : $(dll-paths) $$(var-name) : exported ] ;
+          [ common.prepend-path-variable-command
+              [ os.shared-library-path-variable ] : $(dll-paths) ] ;
     }            
 }