diff --git a/tests/app/conftest.py b/tests/app/conftest.py
index 38b483f0e..e77deb4a1 100644
--- a/tests/app/conftest.py
+++ b/tests/app/conftest.py
@@ -76,14 +76,13 @@ def service_factory(notify_db, notify_db_session):
                 user = create_user()
             if not email_from:
                 email_from = service_name
-            service = Service.query.filter_by(name=service_name).first()
-            if not service:
-                service = create_service(
-                    email_from=email_from,
-                    service_name=service_name,
-                    service_permissions=None,
-                    user=user,
-                )
+
+            service = create_service(
+                email_from=email_from,
+                service_name=service_name,
+                service_permissions=None,
+                user=user,
+            )
             if template_type == 'email':
                 create_template(
                     service,
diff --git a/tests/app/db.py b/tests/app/db.py
index 02a2df85c..3783026e6 100644
--- a/tests/app/db.py
+++ b/tests/app/db.py
@@ -83,21 +83,23 @@ def create_service(
         organisation_type='central',
         postage='second'
 ):
-    service = Service(
-        name=service_name,
-        message_limit=message_limit,
-        restricted=restricted,
-        email_from=email_from if email_from else service_name.lower().replace(' ', '.'),
-        created_by=user or create_user(email='{}@digital.cabinet-office.gov.uk'.format(uuid.uuid4())),
-        prefix_sms=prefix_sms,
-        organisation_type=organisation_type,
-        postage=postage
-    )
+    service = Service.query.filter_by(name=service_name).first()
+    if not service:
+        service = Service(
+            name=service_name,
+            message_limit=message_limit,
+            restricted=restricted,
+            email_from=email_from if email_from else service_name.lower().replace(' ', '.'),
+            created_by=user or create_user(email='{}@digital.cabinet-office.gov.uk'.format(uuid.uuid4())),
+            prefix_sms=prefix_sms,
+            organisation_type=organisation_type,
+            postage=postage
+        )
 
-    dao_create_service(service, service.created_by, service_id, service_permissions=service_permissions)
+        dao_create_service(service, service.created_by, service_id, service_permissions=service_permissions)
 
-    service.active = active
-    service.research_mode = research_mode
+        service.active = active
+        service.research_mode = research_mode
 
     return service