diff --git a/pytest.ini b/pytest.ini
--- a/pytest.ini
+++ b/pytest.ini
@@ -2,7 +2,7 @@
 testpaths = rhodecode
 norecursedirs = rhodecode/public rhodecode/templates tests/scripts
 
-pylons_config = rhodecode/tests/rhodecode.ini
+pyramid_config = rhodecode/tests/rhodecode.ini
 vcsserver_protocol = http
 vcsserver_config_http = rhodecode/tests/vcsserver_http.ini
 
diff --git a/rhodecode/tests/other/vcs_operations/conftest.py b/rhodecode/tests/other/vcs_operations/conftest.py
--- a/rhodecode/tests/other/vcs_operations/conftest.py
+++ b/rhodecode/tests/other/vcs_operations/conftest.py
@@ -57,10 +57,10 @@ def assert_no_running_instance(url):
             "Port is not free at %s, cannot start web interface" % url)
 
 
-def get_host_url(pylons_config):
+def get_host_url(pyramid_config):
     """Construct the host url using the port in the test configuration."""
     config = ConfigParser.ConfigParser()
-    config.read(pylons_config)
+    config.read(pyramid_config)
 
     return '127.0.0.1:%s' % config.get('server:main', 'port')
 
@@ -69,14 +69,14 @@ class RcWebServer(object):
     """
     Represents a running RCE web server used as a test fixture.
     """
-    def __init__(self, pylons_config):
-        self.pylons_config = pylons_config
+    def __init__(self, pyramid_config):
+        self.pyramid_config = pyramid_config
 
     def repo_clone_url(self, repo_name, **kwargs):
         params = {
             'user': TEST_USER_ADMIN_LOGIN,
             'passwd': TEST_USER_ADMIN_PASS,
-            'host': get_host_url(self.pylons_config),
+            'host': get_host_url(self.pyramid_config),
             'cloned_repo': repo_name,
         }
         params.update(**kwargs)
@@ -84,7 +84,7 @@ class RcWebServer(object):
         return _url
 
     def host_url(self):
-        return 'http://' + get_host_url(self.pylons_config)
+        return 'http://' + get_host_url(self.pyramid_config)
 
 
 @pytest.fixture(scope="module")
diff --git a/rhodecode/tests/pylons_plugin.py b/rhodecode/tests/pylons_plugin.py
--- a/rhodecode/tests/pylons_plugin.py
+++ b/rhodecode/tests/pylons_plugin.py
@@ -44,18 +44,18 @@ def pytest_addoption(parser):
         help="Set default Logging level for tests, warn (default), info, debug")
     group = parser.getgroup('pylons')
     group.addoption(
-        '--with-pylons', dest='pylons_config',
+        '--with-pylons', dest='pyramid_config',
         help="Set up a Pylons environment with the specified config file.")
     group.addoption(
         '--ini-config-override', action='store', type=_parse_json,
-        default=None, dest='pylons_config_override', help=(
+        default=None, dest='pyramid_config_override', help=(
             "Overrides the .ini file settings. Should be specified in JSON"
             " format, e.g. '{\"section\": {\"parameter\": \"value\", ...}}'"
         )
     )
     parser.addini(
-        'pylons_config',
-        "Set up a Pylons environment with the specified config file.")
+        'pyramid_config',
+        "Set up a Pyramid environment with the specified config file.")
 
     vcsgroup = parser.getgroup('vcs')
     vcsgroup.addoption(
@@ -239,7 +239,7 @@ class HttpVCSServer(VCSServer):
 
 @pytest.fixture(scope='session')
 def ini_config(request, tmpdir_factory, rcserver_port, vcsserver_port):
-    option_name = 'pylons_config'
+    option_name = 'pyramid_config'
     log_level = _use_log_level(request.config)
 
     overrides = [