diff --git a/tests/__init__.py b/tests/__init__.py
index b93a487f4..816c1e702 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -18,7 +18,8 @@ class TestClient(FlaskClient):
             mocker.patch('app.user_api_client.get_user', return_value=user)
             mocker.patch('app.events_api_client.create_event')
         if mocker and service:
-            session['service_id'] = service['id']
+            with self.session_transaction() as session:
+                session['service_id'] = service['id']
             mocker.patch('app.service_api_client.get_service', return_value={'data': service})
         login_user(user, remember=True)
 
diff --git a/tests/conftest.py b/tests/conftest.py
index 3cceeff9f..fe8a987e2 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1354,12 +1354,12 @@ def client(app_):
 def logged_in_client(
     client,
     active_user_with_permissions,
+    mocker,
+    service_one,
     mock_login,
-    mock_get_user,
-    mock_get_service,
     mock_has_permissions
 ):
-    client.login(active_user_with_permissions)
+    client.login(active_user_with_permissions, mocker, service_one)
     yield client