1 files changed, 8 insertions, 8 deletions
diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat
index 854355cbf5..039c81054a 100644
--- a/PCbuild/rt.bat
+++ b/PCbuild/rt.bat
@@ -9,7 +9,8 @@ rem      -q runs the tests just once, and without deleting .py[co] files.
 rem -x64 Run the 64-bit build of python (or python_d if -d was specified)
 rem      from the 'amd64' dir instead of the 32-bit build in this dir.
 rem All leading instances of these switches are shifted off, and
-rem whatever remains is passed to regrtest.py.  For example,
+rem whatever remains (up to 9 arguments) is passed to regrtest.py.
+rem For example,
 rem     rt -O -d -x test_thread
 rem runs
 rem     python_d -O ../lib/test/regrtest.py -x test_thread
@@ -26,25 +27,24 @@ rem     rt -u "network,largefile"
 
 setlocal
 
-set prefix=.\
+set pcbuild=%~dp0
+set prefix=%pcbuild%win32\
 set suffix=
 set qmode=
 set dashO=
-set tcltk=tcltk
 
 :CheckOpts
 if "%1"=="-O" (set dashO=-O)     & shift & goto CheckOpts
 if "%1"=="-q" (set qmode=yes)    & shift & goto CheckOpts
 if "%1"=="-d" (set suffix=_d)    & shift & goto CheckOpts
-if "%1"=="-x64" (set prefix=amd64) & (set tcltk=tcltk64) & shift & goto CheckOpts
+if "%1"=="-x64" (set prefix=%pcbuild%amd64\) & shift & goto CheckOpts
 
-PATH %PATH%;%~dp0..\externals\%tcltk%\bin
-set exe=%prefix%\python%suffix%
-set cmd=%exe% %dashO% -Wd -E -bb ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9
+set exe=%prefix%python%suffix%.exe
+set cmd="%exe%" %dashO% -Wd -E -bb "%pcbuild%..\lib\test\regrtest.py" %1 %2 %3 %4 %5 %6 %7 %8 %9
 if defined qmode goto Qmode
 
 echo Deleting .pyc/.pyo files ...
-%exe% rmpyc.py
+"%exe%" "%pcbuild%rmpyc.py"
 
 echo on
 %cmd%