--- a/security/nss/tests/set_environment
+++ b/security/nss/tests/set_environment
@@ -189,29 +189,31 @@ then
     PATH="`dirname $0`;$PATH"
     
     PATH=`perl $QASCRIPT_DIR/path_uniq -d ';' "$PATH"`
     echo $PATH
     os_full=$os_name
     os_name="Windows"
     O_MKS=ON
     O_WIN=ON
-    RSH=c:/winnt/system32/rsh
+    if [ -z $RSH ] ; then 
+        RSH=c:/winnt/system32/rsh
+    fi
     
 else
     EDITOR=vi
     EMACSLOADPATH=/u/svbld/emacs
     PYTHONPATH=.:/tools/ns/lib/python1.4
     PAGER=less
     XMCD_LIBDIR=/usr/local/lib/xmcd
     DISPLAY=:0.0
     PATH=`perl $QASCRIPT_DIR/path_uniq "$PATH"`
     RSH=rsh
 fi
 
 BASEPATH=$PATH    # in  case we we set and reset DIST directories the PATH 
                 # needs to change accordingly
-export PATH EDITOR EMACSLOADPATH PYTHONPATH PAGER XMCD_LIBDIR DISPLAY MANPATH os_full os_name BASEPATH
+export PATH EDITOR EMACSLOADPATH PYTHONPATH PAGER XMCD_LIBDIR DISPLAY MANPATH os_full os_name BASEPATH RSH
 
 umask 022
 
 system=`uname -n`        # name of this system.