diff --git a/rhodecode/tests/plugin.py b/rhodecode/tests/plugin.py
--- a/rhodecode/tests/plugin.py
+++ b/rhodecode/tests/plugin.py
@@ -36,6 +36,7 @@ import pyramid.testing
 import pytest
 import colander
 import requests
+import pyramid.paster
 
 import rhodecode
 from rhodecode.lib.utils2 import AttributeDict
@@ -218,6 +219,20 @@ def http_environ(http_host_stub):
     }
 
 
+@pytest.fixture(scope='session')
+def baseapp(ini_config, vcsserver, http_environ_session):
+    from rhodecode.lib.pyramid_utils import get_app_config
+    from rhodecode.config.middleware import make_pyramid_app
+
+    print("Using the RhodeCode configuration:{}".format(ini_config))
+    pyramid.paster.setup_logging(ini_config)
+
+    settings = get_app_config(ini_config)
+    app = make_pyramid_app({'__file__': ini_config}, **settings)
+
+    return app
+
+
 @pytest.fixture(scope='function')
 def app(request, config_stub, baseapp, http_environ):
     app = CustomTestApp(
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
@@ -325,20 +325,6 @@ def available_port(available_port_factor
 
 
 @pytest.fixture(scope='session')
-def baseapp(ini_config, vcsserver, http_environ_session):
-    from rhodecode.lib.pyramid_utils import get_app_config
-    from rhodecode.config.middleware import make_pyramid_app
-
-    print("Using the RhodeCode configuration:{}".format(ini_config))
-    pyramid.paster.setup_logging(ini_config)
-
-    settings = get_app_config(ini_config)
-    app = make_pyramid_app({'__file__': ini_config}, **settings)
-
-    return app
-
-
-@pytest.fixture(scope='session')
 def testini_factory(tmpdir_factory, ini_config):
     """
     Factory to create an INI file based on TestINI.