--- a/tests/test-non-interactive-wsgi
+++ b/tests/test-non-interactive-wsgi
@@ -15,7 +15,7 @@ from mercurial.hgweb.request import _wsg
 from mercurial.ui import ui
 from mercurial import hg
 from StringIO import StringIO
-import sys
+import os, sys
 
 class FileLike(object):
     def __init__(self, real):
@@ -58,7 +58,7 @@ env = {
 	'PATH_INFO': '',
 	'QUERY_STRING': '',
 	'SERVER_NAME': '127.0.0.1',
-	'SERVER_PORT': '20059',
+	'SERVER_PORT': os.environ['HGPORT'],
 	'SERVER_PROTOCOL': 'HTTP/1.0'
 }