diff --git a/rhodecode/tests/rhodecode.ini b/rhodecode/tests/rhodecode.ini
--- a/rhodecode/tests/rhodecode.ini
+++ b/rhodecode/tests/rhodecode.ini
@@ -592,7 +592,7 @@ vcs.hooks.protocol = http
 
 vcs.server.log_level = debug
 ## Start VCSServer with this instance as a subprocess, usefull for development
-vcs.start_server = true
+vcs.start_server = false
 
 ## List of enabled VCS backends, available options are:
 ## `hg`  - mercurial
diff --git a/rhodecode/tests/vcsserver_http.ini b/rhodecode/tests/vcsserver_http.ini
--- a/rhodecode/tests/vcsserver_http.ini
+++ b/rhodecode/tests/vcsserver_http.ini
@@ -24,7 +24,7 @@ beaker.cache.repo_object.enabled = true
 [server:main]
 use = egg:waitress#main
 host = 127.0.0.1
-port = %(http_port)s
+port = 9900
 
 ################################
 ### LOGGING CONFIGURATION   ####