--- a/tests/run-tests.py	Sun Jun 02 15:33:41 2013 -0500
+++ b/tests/run-tests.py	Sun Jun 02 16:22:34 2013 -0500
@@ -932,6 +932,9 @@
     env = os.environ.copy()
     env['TESTTMP'] = testtmp
     env['HOME'] = testtmp
+    env["HGPORT"] = str(options.port)
+    env["HGPORT1"] = str(options.port + 1)
+    env["HGPORT2"] = str(options.port + 2)
 
     if options.time:
         starttime = time.time()
@@ -1305,9 +1308,6 @@
     os.environ["HGUSER"]   = "test"
     os.environ["HGENCODING"] = "ascii"
     os.environ["HGENCODINGMODE"] = "strict"
-    os.environ["HGPORT"] = str(options.port)
-    os.environ["HGPORT1"] = str(options.port + 1)
-    os.environ["HGPORT2"] = str(options.port + 2)
 
     if options.with_hg:
         INST = None