diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh
index 97cca72678..f291115d94 100755
--- a/scripts/run_tests.sh
+++ b/scripts/run_tests.sh
@@ -41,5 +41,5 @@ npm test
 display_result $? 1 "npm test"
 
 ## Code coverage
-py.test -n4 --maxfail=1 tests/ --strict -p no:warnings
+py.test -n auto --maxfail=1 tests/ --strict -p no:warnings
 display_result $? 1 "Code coverage"
diff --git a/tests/conftest.py b/tests/conftest.py
index d2016b8207..87dec38713 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -67,7 +67,7 @@ def a11y_test(slug: str, html):
     return True
 
 
-@pytest.fixture
+@pytest.fixture(scope="session")
 def app_():
     app = Flask("app")
     create_app(app)
@@ -78,8 +78,6 @@ def app_():
     app.test_client_class = TestClient
     yield app
 
-    ctx.pop()
-
 
 @pytest.fixture(scope="function")
 def service_one(api_user_active):