diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py
index 6a0e4408d..4a0f1e8dc 100644
--- a/tests/helpers/fixtures.py
+++ b/tests/helpers/fixtures.py
@@ -200,10 +200,16 @@ def cmdline_test(request):
     return request.param
 
 
+@pytest.fixture(scope='session')
+def configdata_init():
+    """Initialize configdata if needed."""
+    if configdata.DATA is None:
+        configdata.init()
+
+
 @pytest.fixture
-def config_stub(stubs, monkeypatch):
+def config_stub(stubs, monkeypatch, configdata_init):
     """Fixture which provides a fake config object."""
-    configdata.init()
     yaml_config = stubs.FakeYamlConfig()
 
     conf = config.Config(yaml_config=yaml_config)
diff --git a/tests/unit/config/test_configdata.py b/tests/unit/config/test_configdata.py
index 2f3b46e57..fa7d60fc0 100644
--- a/tests/unit/config/test_configdata.py
+++ b/tests/unit/config/test_configdata.py
@@ -31,8 +31,8 @@ from qutebrowser.utils import usertypes
 
 def test_init(config_stub):
     """Test reading the default yaml file and validating the values."""
+    # configdata.init() is called by config_stub
     config_stub.val.aliases = {}
-    configdata.init()
     assert isinstance(configdata.DATA, dict)
     assert 'ignore_case' in configdata.DATA
     for option in configdata.DATA.values():