diff --git a/rhodecode/tests/vcsserver.ini b/rhodecode/tests/vcsserver.ini
deleted file mode 100644
--- a/rhodecode/tests/vcsserver.ini
+++ /dev/null
@@ -1,93 +0,0 @@
-################################################################################
-# RhodeCode VCSServer - configuration                                          #
-#                                                                              #
-################################################################################
-
-[DEFAULT]
-host = 127.0.0.1
-port = 9901
-locale = en_US.UTF-8
-# number of worker threads, this should be set based on a formula threadpool=N*6
-# where N is number of RhodeCode Enterprise workers, eg. running 2 instances
-# 8 gunicorn workers each would be 2 * 8 * 6 = 96, threadpool_size = 96
-threadpool_size = 96
-timeout = 0
-
-# cache regions, please don't change
-beaker.cache.regions = repo_object
-beaker.cache.repo_object.type = memorylru
-beaker.cache.repo_object.max_items = 100
-# cache auto-expires after N seconds
-beaker.cache.repo_object.expire = 300
-beaker.cache.repo_object.enabled = true
-
-
-################################
-### LOGGING CONFIGURATION   ####
-################################
-[loggers]
-keys = root, vcsserver, pyro4, beaker
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-#############
-## LOGGERS ##
-#############
-[logger_root]
-level = NOTSET
-handlers = console
-
-[logger_vcsserver]
-level = DEBUG
-handlers =
-qualname = vcsserver
-propagate = 1
-
-[logger_beaker]
-level = DEBUG
-handlers =
-qualname = beaker
-propagate = 1
-
-[logger_pyro4]
-level = DEBUG
-handlers =
-qualname = Pyro4
-propagate = 1
-
-
-##############
-## HANDLERS ##
-##############
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = INFO
-formatter = generic
-
-[handler_file]
-class = FileHandler
-args = ('vcsserver.log', 'a',)
-level = DEBUG
-formatter = generic
-
-[handler_file_rotating]
-class = logging.handlers.TimedRotatingFileHandler
-# 'D', 5 - rotate every 5days
-# you can set 'h', 'midnight'
-args = ('vcsserver.log', 'D', 5, 10,)
-level = DEBUG
-formatter = generic
-
-################
-## FORMATTERS ##
-################
-
-[formatter_generic]
-format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %Y-%m-%d %H:%M:%S
diff --git a/rhodecode/tests/vcsserver_http.ini b/rhodecode/tests/vcsserver_http.ini
new file mode 100644
--- /dev/null
+++ b/rhodecode/tests/vcsserver_http.ini
@@ -0,0 +1,83 @@
+################################################################################
+# RhodeCode VCSServer with HTTP Backend - configuration                        #
+#                                                                              #
+################################################################################
+
+[app:main]
+use = egg:rhodecode-vcsserver
+
+pyramid.default_locale_name = en
+pyramid.includes =
+pyramid.reload_templates = true
+
+# default locale used by VCS systems
+locale = en_US.UTF-8
+
+# cache regions, please don't change
+beaker.cache.regions = repo_object
+beaker.cache.repo_object.type = memorylru
+beaker.cache.repo_object.max_items = 100
+# cache auto-expires after N seconds
+beaker.cache.repo_object.expire = 300
+beaker.cache.repo_object.enabled = true
+
+[server:main]
+use = egg:waitress#main
+host = 127.0.0.1
+port = %(http_port)s
+
+################################
+### LOGGING CONFIGURATION   ####
+################################
+[loggers]
+keys = root, vcsserver, pyro4, beaker
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+#############
+## LOGGERS ##
+#############
+[logger_root]
+level = NOTSET
+handlers = console
+
+[logger_vcsserver]
+level = DEBUG
+handlers =
+qualname = vcsserver
+propagate = 1
+
+[logger_beaker]
+level = DEBUG
+handlers =
+qualname = beaker
+propagate = 1
+
+[logger_pyro4]
+level = DEBUG
+handlers =
+qualname = Pyro4
+propagate = 1
+
+
+##############
+## HANDLERS ##
+##############
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = INFO
+formatter = generic
+
+################
+## FORMATTERS ##
+################
+
+[formatter_generic]
+format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %Y-%m-%d %H:%M:%S
diff --git a/rhodecode/tests/vcsserver_pyramid.ini b/rhodecode/tests/vcsserver_pyramid.ini
deleted file mode 100644
--- a/rhodecode/tests/vcsserver_pyramid.ini
+++ /dev/null
@@ -1,70 +0,0 @@
-[app:main]
-use = egg:rhodecode-vcsserver
-pyramid.reload_templates = true
-pyramid.default_locale_name = en
-pyramid.includes =
-# cache regions, please don't change
-beaker.cache.regions = repo_object
-beaker.cache.repo_object.type = memorylru
-beaker.cache.repo_object.max_items = 100
-# cache auto-expires after N seconds
-beaker.cache.repo_object.expire = 300
-beaker.cache.repo_object.enabled = true
-locale = en_US.UTF-8
-
-
-[server:main]
-use = egg:waitress#main
-host = 0.0.0.0
-port = %(http_port)s
-
-
-################################
-### LOGGING CONFIGURATION   ####
-################################
-[loggers]
-keys = root, vcsserver, beaker
-
-[handlers]
-keys = console
-
-[formatters]
-keys = generic
-
-#############
-## LOGGERS ##
-#############
-[logger_root]
-level = NOTSET
-handlers = console
-
-[logger_vcsserver]
-level = DEBUG
-handlers =
-qualname = vcsserver
-propagate = 1
-
-[logger_beaker]
-level = DEBUG
-handlers =
-qualname = beaker
-propagate = 1
-
-
-##############
-## HANDLERS ##
-##############
-
-[handler_console]
-class = StreamHandler
-args = (sys.stderr,)
-level = DEBUG
-formatter = generic
-
-################
-## FORMATTERS ##
-################
-
-[formatter_generic]
-format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
-datefmt = %Y-%m-%d %H:%M:%S
diff --git a/rhodecode/tests/vcsserver_pyro4.ini b/rhodecode/tests/vcsserver_pyro4.ini
new file mode 100644
--- /dev/null
+++ b/rhodecode/tests/vcsserver_pyro4.ini
@@ -0,0 +1,79 @@
+################################################################################
+# RhodeCode VCSServer - configuration                                          #
+#                                                                              #
+################################################################################
+
+[DEFAULT]
+host = 127.0.0.1
+port = 9900
+locale = en_US.UTF-8
+# number of worker threads, this should be set based on a formula threadpool=N*6
+# where N is number of RhodeCode Enterprise workers, eg. running 2 instances
+# 8 gunicorn workers each would be 2 * 8 * 6 = 96, threadpool_size = 96
+threadpool_size = 96
+timeout = 0
+
+# cache regions, please don't change
+beaker.cache.regions = repo_object
+beaker.cache.repo_object.type = memorylru
+beaker.cache.repo_object.max_items = 100
+# cache auto-expires after N seconds
+beaker.cache.repo_object.expire = 300
+beaker.cache.repo_object.enabled = true
+
+
+################################
+### LOGGING CONFIGURATION   ####
+################################
+[loggers]
+keys = root, vcsserver, pyro4, beaker
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+#############
+## LOGGERS ##
+#############
+[logger_root]
+level = NOTSET
+handlers = console
+
+[logger_vcsserver]
+level = DEBUG
+handlers =
+qualname = vcsserver
+propagate = 1
+
+[logger_beaker]
+level = DEBUG
+handlers =
+qualname = beaker
+propagate = 1
+
+[logger_pyro4]
+level = DEBUG
+handlers =
+qualname = Pyro4
+propagate = 1
+
+
+##############
+## HANDLERS ##
+##############
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = INFO
+formatter = generic
+
+################
+## FORMATTERS ##
+################
+
+[formatter_generic]
+format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %Y-%m-%d %H:%M:%S