diff --git a/poetry.lock b/poetry.lock
index 71e030da0..710ea3526 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -817,13 +817,13 @@ pycodestyle = "*"
 
 [[package]]
 name = "flake8-pytest-style"
-version = "1.7.2"
+version = "2.0.0"
 description = "A flake8 plugin checking common style issues or inconsistencies with pytest-based tests."
 optional = false
-python-versions = ">=3.7.2,<4.0.0"
+python-versions = "<4.0.0,>=3.8.1"
 files = [
-    {file = "flake8_pytest_style-1.7.2-py3-none-any.whl", hash = "sha256:f5d2aa3219163a052dd92226589d45fab8ea027a3269922f0c4029f548ea5cd1"},
-    {file = "flake8_pytest_style-1.7.2.tar.gz", hash = "sha256:b924197c99b951315949920b0e5547f34900b1844348432e67a44ab191582109"},
+    {file = "flake8_pytest_style-2.0.0-py3-none-any.whl", hash = "sha256:abcb9f56f277954014b749e5a0937fae215be01a21852e9d05e7600c3de6aae5"},
+    {file = "flake8_pytest_style-2.0.0.tar.gz", hash = "sha256:919c328cacd4bc4f873ea61ab4db0d8f2c32e0db09a3c73ab46b1de497556464"},
 ]
 
 [package.dependencies]
@@ -3112,4 +3112,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.12.2"
-content-hash = "78cfb6ff10239c4ad8e34c059e01c9ee7603d591c43cb06dd0a1acf8fa51f510"
+content-hash = "df3fd7d58fb974e467ccac5e6504d0085327770f947ea099ba49e1987b01ad89"
diff --git a/pyproject.toml b/pyproject.toml
index 06e8ffe35..26ecf2224 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -80,7 +80,7 @@ freezegun = "^1.5.1"
 flake8 = "^7.1.0"
 flake8-bugbear = "^24.1.17"
 flake8-print = "^5.0.0"
-flake8-pytest-style = "^1.7.2"
+flake8-pytest-style = "^2.0.0"
 isort = "^5.13.2"
 jinja2-cli = {version = "==0.8.2", extras = ["yaml"]}
 moto = "*"
diff --git a/tests/app/main/views/accounts/test_choose_accounts.py b/tests/app/main/views/accounts/test_choose_accounts.py
index 1ead9dd0d..77e06d6ca 100644
--- a/tests/app/main/views/accounts/test_choose_accounts.py
+++ b/tests/app/main/views/accounts/test_choose_accounts.py
@@ -67,7 +67,7 @@ SAMPLE_DATA = {
 }
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_orgs_and_services(mocker):
     return mocker.patch(
         "app.user_api_client.get_organizations_and_services_for_user",
diff --git a/tests/app/main/views/service_settings/test_service_setting_permissions.py b/tests/app/main/views/service_settings/test_service_setting_permissions.py
index 16240d716..b7c945902 100644
--- a/tests/app/main/views/service_settings/test_service_setting_permissions.py
+++ b/tests/app/main/views/service_settings/test_service_setting_permissions.py
@@ -7,7 +7,7 @@ from app.main.views.service_settings import PLATFORM_ADMIN_SERVICE_PERMISSIONS
 from tests.conftest import normalize_spaces
 
 
-@pytest.fixture()
+@pytest.fixture
 def get_service_settings_page(
     client_request,
     platform_admin_user,
diff --git a/tests/app/main/views/service_settings/test_service_settings.py b/tests/app/main/views/service_settings/test_service_settings.py
index 599491e08..a9895ef99 100644
--- a/tests/app/main/views/service_settings/test_service_settings.py
+++ b/tests/app/main/views/service_settings/test_service_settings.py
@@ -33,7 +33,7 @@ from tests.conftest import (
 FAKE_TEMPLATE_ID = uuid4()
 
 
-@pytest.fixture()
+@pytest.fixture
 def _mock_get_service_settings_page_common(
     mock_get_inbound_number_for_service,
     mock_get_free_sms_fragment_limit,
diff --git a/tests/app/main/views/test_accept_invite.py b/tests/app/main/views/test_accept_invite.py
index 1fc355abb..01dab9876 100644
--- a/tests/app/main/views/test_accept_invite.py
+++ b/tests/app/main/views/test_accept_invite.py
@@ -100,19 +100,19 @@ MOCK_JOBS = {
 }
 
 
-@pytest.fixture()
+@pytest.fixture
 def _mock_no_users_for_service(mocker):
     mocker.patch("app.models.user.Users.client_method", return_value=[])
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_existing_user_by_email(mocker, api_user_active):
     return mocker.patch(
         "app.user_api_client.get_user_by_email", return_value=api_user_active
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_check_invite_token(mocker, sample_invite):
     return mocker.patch("app.invite_api_client.check_token", return_value=sample_invite)
 
diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index 475d7514e..d2e543f6a 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -1882,7 +1882,7 @@ def test_service_dashboard_shows_batched_jobs(
     assert len(rows) == 1
 
 
-@pytest.fixture()
+@pytest.fixture
 def app_with_socketio():
     app = Flask("app")
     create_app(app)
diff --git a/tests/app/main/views/test_two_factor.py b/tests/app/main/views/test_two_factor.py
index d1f38d1ab..27e1ce33f 100644
--- a/tests/app/main/views/test_two_factor.py
+++ b/tests/app/main/views/test_two_factor.py
@@ -9,7 +9,7 @@ from tests.conftest import (
 )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_email_validated_recently(mocker):
     return mocker.patch(
         "app.main.views.two_factor.email_needs_revalidating", return_value=False
diff --git a/tests/app/models/test_template_list.py b/tests/app/models/test_template_list.py
index 1a620809d..874d4fc9b 100644
--- a/tests/app/models/test_template_list.py
+++ b/tests/app/models/test_template_list.py
@@ -12,7 +12,7 @@ VIS_PARENT_FOLDER_ID = "bbbb222b-2b22-2b22-222b-b222b22b2222"
 INV_CHILD_2_FOLDER_ID = "fafe723f-1d39-4a10-865f-e551e03d8886"
 
 
-@pytest.fixture()
+@pytest.fixture
 def _mock_get_hierarchy_of_folders(
     mock_get_template_folders, active_user_with_permissions
 ):
diff --git a/tests/app/s3_client/test_s3_logo_client.py b/tests/app/s3_client/test_s3_logo_client.py
index 92ce34c37..dc6e419e2 100644
--- a/tests/app/s3_client/test_s3_logo_client.py
+++ b/tests/app/s3_client/test_s3_logo_client.py
@@ -19,14 +19,14 @@ svg_filename = "test.svg"
 upload_id = "test_uuid"
 
 
-@pytest.fixture()
+@pytest.fixture
 def upload_filename(fake_uuid):
     return EMAIL_LOGO_LOCATION_STRUCTURE.format(
         temp=TEMP_TAG.format(user_id=fake_uuid), unique_id=upload_id, filename=filename
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def bucket_credentials(notify_admin):
     return notify_admin.config["LOGO_UPLOAD_BUCKET"]
 
diff --git a/tests/app/test_cloudfoundry_config.py b/tests/app/test_cloudfoundry_config.py
index 6eea0dd95..433f2c73e 100644
--- a/tests/app/test_cloudfoundry_config.py
+++ b/tests/app/test_cloudfoundry_config.py
@@ -13,7 +13,7 @@ bucket_credentials = {
 }
 
 
-@pytest.fixture()
+@pytest.fixture
 def vcap_services():
     return {
         "aws-elasticache-redis": [{"credentials": {"uri": "redis://xxx:6379"}}],
diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py
index a7e77055b..d603fcd0e 100644
--- a/tests/app/utils/test_csv.py
+++ b/tests/app/utils/test_csv.py
@@ -71,7 +71,7 @@ def _get_notifications_csv(
     return _get
 
 
-@pytest.fixture()
+@pytest.fixture
 def get_notifications_csv_mock(
     mocker,
     api_user_active,
diff --git a/tests/conftest.py b/tests/conftest.py
index 592ec9403..de1ff28a3 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -53,17 +53,17 @@ def notify_admin():
     return app
 
 
-@pytest.fixture()
+@pytest.fixture
 def service_one(api_user_active):
     return service_json(SERVICE_ONE_ID, "service one", [api_user_active["id"]])
 
 
-@pytest.fixture()
+@pytest.fixture
 def service_two(api_user_active):
     return service_json(SERVICE_TWO_ID, "service two", [api_user_active["id"]])
 
 
-@pytest.fixture()
+@pytest.fixture
 def multiple_reply_to_email_addresses(mocker):
     def _get(service_id):
         return [
@@ -99,7 +99,7 @@ def multiple_reply_to_email_addresses(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def no_reply_to_email_addresses(mocker):
     def _get(service_id):
         return []
@@ -109,7 +109,7 @@ def no_reply_to_email_addresses(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def single_reply_to_email_address(mocker):
     def _get(service_id):
         return [
@@ -128,7 +128,7 @@ def single_reply_to_email_address(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def get_default_reply_to_email_address(mocker):
     def _get(service_id, reply_to_email_id):
         return {
@@ -145,7 +145,7 @@ def get_default_reply_to_email_address(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def get_non_default_reply_to_email_address(mocker):
     def _get(service_id, reply_to_email_id):
         return {
@@ -162,7 +162,7 @@ def get_non_default_reply_to_email_address(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_add_reply_to_email_address(mocker):
     def _add_reply_to(service_id, email_address, is_default=False):
         return
@@ -172,7 +172,7 @@ def mock_add_reply_to_email_address(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_reply_to_email_address(mocker):
     def _update_reply_to(
         service_id, reply_to_email_id, email_address=None, active=None, is_default=False
@@ -185,7 +185,7 @@ def mock_update_reply_to_email_address(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def multiple_sms_senders(mocker):
     def _get(service_id):
         return [
@@ -221,7 +221,7 @@ def multiple_sms_senders(mocker):
     return mocker.patch("app.service_api_client.get_sms_senders", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def multiple_sms_senders_with_diff_default(mocker):
     def _get(service_id):
         return [
@@ -257,7 +257,7 @@ def multiple_sms_senders_with_diff_default(mocker):
     return mocker.patch("app.service_api_client.get_sms_senders", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def multiple_sms_senders_no_inbound(mocker):
     def _get(service_id):
         return [
@@ -284,7 +284,7 @@ def multiple_sms_senders_no_inbound(mocker):
     return mocker.patch("app.service_api_client.get_sms_senders", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def no_sms_senders(mocker):
     def _get(service_id):
         return []
@@ -292,7 +292,7 @@ def no_sms_senders(mocker):
     return mocker.patch("app.service_api_client.get_sms_senders", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def single_sms_sender(mocker):
     def _get(service_id):
         return [
@@ -310,7 +310,7 @@ def single_sms_sender(mocker):
     return mocker.patch("app.service_api_client.get_sms_senders", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def get_default_sms_sender(mocker):
     def _get(service_id, sms_sender_id):
         return {
@@ -326,7 +326,7 @@ def get_default_sms_sender(mocker):
     return mocker.patch("app.service_api_client.get_sms_sender", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def get_non_default_sms_sender(mocker):
     def _get(service_id, sms_sender_id):
         return {
@@ -342,7 +342,7 @@ def get_non_default_sms_sender(mocker):
     return mocker.patch("app.service_api_client.get_sms_sender", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_add_sms_sender(mocker):
     def _add_sms_sender(
         service_id, sms_sender, is_default=False, inbound_number_id=None
@@ -354,7 +354,7 @@ def mock_add_sms_sender(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_sms_sender(mocker):
     def _update_sms_sender(
         service_id, sms_sender_id, sms_sender=None, active=None, is_default=False
@@ -366,7 +366,7 @@ def mock_update_sms_sender(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def multiple_available_inbound_numbers(mocker):
     def _get():
         return {
@@ -406,7 +406,7 @@ def multiple_available_inbound_numbers(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def no_available_inbound_numbers(mocker):
     def _get():
         return {"data": []}
@@ -416,12 +416,12 @@ def no_available_inbound_numbers(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def fake_uuid():
     return sample_uuid()
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service(mocker, api_user_active):
     def _get(service_id):
         service = service_json(
@@ -432,7 +432,7 @@ def mock_get_service(mocker, api_user_active):
     return mocker.patch("app.service_api_client.get_service", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_statistics(mocker, api_user_active):
     def _get(service_id, limit_days=None):
         return {
@@ -445,7 +445,7 @@ def mock_get_service_statistics(mocker, api_user_active):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_detailed_services(mocker, fake_uuid):
     service_one = service_json(
         id_=SERVICE_ONE_ID,
@@ -476,7 +476,7 @@ def mock_get_detailed_services(mocker, fake_uuid):
     return mocker.patch("app.service_api_client.get_services", return_value=services)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_live_service(mocker, api_user_active):
     def _get(service_id):
         service = service_json(
@@ -487,7 +487,7 @@ def mock_get_live_service(mocker, api_user_active):
     return mocker.patch("app.service_api_client.get_service", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_create_service(mocker):
     def _create(
         service_name,
@@ -510,7 +510,7 @@ def mock_create_service(mocker):
     return mocker.patch("app.service_api_client.create_service", side_effect=_create)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_service(mocker):
     def _update(service_id, **kwargs):
         service = service_json(
@@ -538,7 +538,7 @@ def mock_update_service(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_service_raise_httperror_duplicate_name(mocker):
     def _update(service_id, **kwargs):
         json_mock = Mock(
@@ -563,7 +563,7 @@ TEMPLATE_ONE_ID = "b22d7d94-2197-4a7d-a8e7-fd5f9770bf48"
 USER_ONE_ID = "7b395b52-c6c1-469c-9d61-54166461c1ab"
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_services(mocker, active_user_with_permissions):
     def _get_services(params_dict=None):
         service_one = service_json(
@@ -589,7 +589,7 @@ def mock_get_services(mocker, active_user_with_permissions):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_services_with_no_services(mocker):
     def _get_services(params_dict=None):
         return {"data": []}
@@ -599,7 +599,7 @@ def mock_get_services_with_no_services(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_services_with_one_service(mocker, api_user_active):
     def _get_services(params_dict=None):
         return {
@@ -620,7 +620,7 @@ def mock_get_services_with_one_service(mocker, api_user_active):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_template(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -637,7 +637,7 @@ def mock_get_service_template(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_template_with_priority(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -655,7 +655,7 @@ def mock_get_service_template_with_priority(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_deleted_template(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -673,7 +673,7 @@ def mock_get_deleted_template(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_template_version(mocker, api_user_active):
     def _get(service_id, template_id, version):
         template_version = template_version_json(
@@ -684,7 +684,7 @@ def mock_get_template_version(mocker, api_user_active):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_template_versions(mocker, api_user_active):
     def _get(service_id, template_id):
         template_version = template_version_json(
@@ -697,7 +697,7 @@ def mock_get_template_versions(mocker, api_user_active):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_template_with_placeholders(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -712,7 +712,7 @@ def mock_get_service_template_with_placeholders(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_empty_service_template_with_optional_placeholder(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -726,7 +726,7 @@ def mock_get_empty_service_template_with_optional_placeholder(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_template_with_multiple_placeholders(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -741,7 +741,7 @@ def mock_get_service_template_with_multiple_placeholders(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_template_with_placeholders_same_as_recipient(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -756,7 +756,7 @@ def mock_get_service_template_with_placeholders_same_as_recipient(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_email_template(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -773,7 +773,7 @@ def mock_get_service_email_template(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_email_template_without_placeholders(mocker):
     def _get(service_id, template_id, version=None):
         template = template_json(
@@ -790,7 +790,7 @@ def mock_get_service_email_template_without_placeholders(mocker):
     return mocker.patch("app.service_api_client.get_service_template", side_effect=_get)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_create_service_template(mocker, fake_uuid):
     def _create(
         name,
@@ -811,7 +811,7 @@ def mock_create_service_template(mocker, fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_service_template(mocker):
     def _update(id_, name, type_, content, service, subject=None, process_type=None):
         template = template_json(
@@ -824,7 +824,7 @@ def mock_update_service_template(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_create_service_template_content_too_big(mocker):
     def _create(
         name,
@@ -861,7 +861,7 @@ def mock_create_service_template_content_too_big(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_service_template_400_content_too_big(mocker):
     def _update(id_, name, type_, content, service, subject=None, process_type=None):
         json_mock = Mock(
@@ -925,7 +925,7 @@ def _template(template_type, name, parent=None, template_id=None):
     }
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_templates(mocker):
     def _create(service_id):
         return create_service_templates(service_id)
@@ -935,7 +935,7 @@ def mock_get_service_templates(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_more_service_templates_than_can_fit_onscreen(mocker):
     def _create(service_id):
         return create_service_templates(service_id, number_of_templates=20)
@@ -945,7 +945,7 @@ def mock_get_more_service_templates_than_can_fit_onscreen(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_templates_when_no_templates_exist(mocker):
     def _create(service_id):
         return {"data": []}
@@ -955,7 +955,7 @@ def mock_get_service_templates_when_no_templates_exist(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_templates_with_only_one_template(mocker):
     def _get(service_id):
         return {
@@ -975,7 +975,7 @@ def mock_get_service_templates_with_only_one_template(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_delete_service_template(mocker):
     def _delete(service_id, template_id):
         template = template_json(
@@ -992,12 +992,12 @@ def mock_delete_service_template(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_redact_template(mocker):
     return mocker.patch("app.service_api_client.redact_service_template")
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_service_template_sender(mocker):
     def _update(service_id, template_id, reply_to):
         return
@@ -1007,12 +1007,12 @@ def mock_update_service_template_sender(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def api_user_pending(fake_uuid):
     return create_user(id=fake_uuid, state="pending")
 
 
-@pytest.fixture()
+@pytest.fixture
 def platform_admin_user(fake_uuid):
     return create_platform_admin_user(
         permissions={
@@ -1029,7 +1029,7 @@ def platform_admin_user(fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def platform_admin_user_no_service_permissions():
     """
     this fixture is for situations where we want to test that platform admin can access
@@ -1038,17 +1038,17 @@ def platform_admin_user_no_service_permissions():
     return create_platform_admin_user()
 
 
-@pytest.fixture()
+@pytest.fixture
 def api_user_active():
     return create_api_user_active()
 
 
-@pytest.fixture()
+@pytest.fixture
 def api_user_active_email_auth(fake_uuid):
     return create_user(id=fake_uuid, auth_type="email_auth")
 
 
-@pytest.fixture()
+@pytest.fixture
 def active_user_with_permissions_no_mobile(fake_uuid):
     return create_service_one_admin(
         id=fake_uuid,
@@ -1056,7 +1056,7 @@ def active_user_with_permissions_no_mobile(fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def api_nongov_user_active(fake_uuid):
     return create_service_one_admin(
         id=fake_uuid,
@@ -1064,17 +1064,17 @@ def api_nongov_user_active(fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def active_user_with_permissions(fake_uuid):
     return create_active_user_with_permissions()
 
 
-@pytest.fixture()
+@pytest.fixture
 def active_user_empty_permissions(fake_uuid):
     return create_active_user_empty_permissions()
 
 
-@pytest.fixture()
+@pytest.fixture
 def active_user_with_permission_to_two_services(fake_uuid):
     permissions = [
         "send_texts",
@@ -1097,7 +1097,7 @@ def active_user_with_permission_to_two_services(fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def active_user_with_permission_to_other_service(
     active_user_with_permission_to_two_services,
 ):
@@ -1110,22 +1110,22 @@ def active_user_with_permission_to_other_service(
     return active_user_with_permission_to_two_services
 
 
-@pytest.fixture()
+@pytest.fixture
 def active_caseworking_user():
     return create_active_caseworking_user()
 
 
-@pytest.fixture()
+@pytest.fixture
 def active_user_view_permissions():
     return create_active_user_view_permissions()
 
 
-@pytest.fixture()
+@pytest.fixture
 def active_user_no_settings_permission():
     return create_active_user_no_settings_permission()
 
 
-@pytest.fixture()
+@pytest.fixture
 def api_user_locked(fake_uuid):
     return create_user(
         id=fake_uuid,
@@ -1134,7 +1134,7 @@ def api_user_locked(fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def api_user_request_password_reset(fake_uuid):
     return create_user(
         id=fake_uuid,
@@ -1142,7 +1142,7 @@ def api_user_request_password_reset(fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def api_user_changed_password(fake_uuid):
     return create_user(
         id=fake_uuid,
@@ -1151,12 +1151,12 @@ def api_user_changed_password(fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_send_change_email_verification(mocker):
     return mocker.patch("app.user_api_client.send_change_email_verification")
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_register_user(mocker, api_user_pending):
     def _register(name, email_address, mobile_number, password, auth_type):
         api_user_pending["name"] = name
@@ -1169,7 +1169,7 @@ def mock_register_user(mocker, api_user_pending):
     return mocker.patch("app.user_api_client.register_user", side_effect=_register)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_non_govuser(mocker, api_user_active):
     api_user_active["email_address"] = "someuser@example.com"
 
@@ -1180,7 +1180,7 @@ def mock_get_non_govuser(mocker, api_user_active):
     return mocker.patch("app.user_api_client.get_user", side_effect=_get_user)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_user(mocker, api_user_active):
     def _get_user(id_):
         api_user_active["id"] = id_
@@ -1189,7 +1189,7 @@ def mock_get_user(mocker, api_user_active):
     return mocker.patch("app.user_api_client.get_user", side_effect=_get_user)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_locked_user(mocker, api_user_locked):
     def _get_user(id_):
         api_user_locked["id"] = id_
@@ -1198,12 +1198,12 @@ def mock_get_locked_user(mocker, api_user_locked):
     return mocker.patch("app.user_api_client.get_user", side_effect=_get_user)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_user_pending(mocker, api_user_pending):
     return mocker.patch("app.user_api_client.get_user", return_value=api_user_pending)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_user_by_email(mocker, api_user_active):
     def _get_user(email_address):
         api_user_active["email_address"] = email_address
@@ -1212,7 +1212,7 @@ def mock_get_user_by_email(mocker, api_user_active):
     return mocker.patch("app.user_api_client.get_user_by_email", side_effect=_get_user)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_dont_get_user_by_email(mocker):
     def _get_user(email_address):
         return None
@@ -1222,7 +1222,7 @@ def mock_dont_get_user_by_email(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_user_by_email_request_password_reset(
     mocker, api_user_request_password_reset
 ):
@@ -1232,28 +1232,28 @@ def mock_get_user_by_email_request_password_reset(
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_user_by_email_user_changed_password(mocker, api_user_changed_password):
     return mocker.patch(
         "app.user_api_client.get_user_by_email", return_value=api_user_changed_password
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_user_by_email_locked(mocker, api_user_locked):
     return mocker.patch(
         "app.user_api_client.get_user_by_email", return_value=api_user_locked
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_user_by_email_pending(mocker, api_user_pending):
     return mocker.patch(
         "app.user_api_client.get_user_by_email", return_value=api_user_pending
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_user_by_email_not_found(mocker, api_user_active):
     def _get_user(email):
         json_mock = Mock(return_value={"message": "Not found", "result": "error"})
@@ -1264,7 +1264,7 @@ def mock_get_user_by_email_not_found(mocker, api_user_active):
     return mocker.patch("app.user_api_client.get_user_by_email", side_effect=_get_user)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_verify_password(mocker):
     def _verify_password(user, password):
         return True
@@ -1274,7 +1274,7 @@ def mock_verify_password(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_user_password(mocker, api_user_active):
     def _update(user_id, password):
         api_user_active["id"] = user_id
@@ -1283,7 +1283,7 @@ def mock_update_user_password(mocker, api_user_active):
     return mocker.patch("app.user_api_client.update_password", side_effect=_update)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_user_attribute(mocker, api_user_active):
     def _update(user_id, **kwargs):
         api_user_active["id"] = user_id
@@ -1294,7 +1294,7 @@ def mock_update_user_attribute(mocker, api_user_active):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_activate_user(mocker, api_user_active):
     def _activate(user_id):
         api_user_active["id"] = user_id
@@ -1303,14 +1303,14 @@ def mock_activate_user(mocker, api_user_active):
     return mocker.patch("app.user_api_client.activate_user", side_effect=_activate)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_email_is_not_already_in_use(mocker):
     return mocker.patch(
         "app.user_api_client.get_user_by_email_or_none", return_value=None
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_revoke_api_key(mocker):
     def _revoke(service_id, key_id):
         return {}
@@ -1318,7 +1318,7 @@ def mock_revoke_api_key(mocker):
     return mocker.patch("app.api_key_api_client.revoke_api_key", side_effect=_revoke)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_api_keys(mocker, fake_uuid):
     def _get_keys(service_id, key_id=None):
         keys = {
@@ -1339,7 +1339,7 @@ def mock_get_api_keys(mocker, fake_uuid):
     return mocker.patch("app.api_key_api_client.get_api_keys", side_effect=_get_keys)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_no_api_keys(mocker):
     def _get_keys(service_id):
         keys = {"apiKeys": []}
@@ -1348,7 +1348,7 @@ def mock_get_no_api_keys(mocker):
     return mocker.patch("app.api_key_api_client.get_api_keys", side_effect=_get_keys)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_login(mocker, mock_get_user, mock_update_user_attribute, mock_events):
     def _verify_code(user_id, code, code_type):
         return True, ""
@@ -1362,17 +1362,17 @@ def mock_login(mocker, mock_get_user, mock_update_user_attribute, mock_events):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_send_verify_code(mocker):
     return mocker.patch("app.user_api_client.send_verify_code")
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_send_verify_email(mocker):
     return mocker.patch("app.user_api_client.send_verify_email")
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_check_verify_code(mocker):
     def _verify(user_id, code, code_type):
         return True, ""
@@ -1380,7 +1380,7 @@ def mock_check_verify_code(mocker):
     return mocker.patch("app.user_api_client.check_verify_code", side_effect=_verify)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_check_verify_code_code_not_found(mocker):
     def _verify(user_id, code, code_type):
         return False, "Code not found"
@@ -1388,7 +1388,7 @@ def mock_check_verify_code_code_not_found(mocker):
     return mocker.patch("app.user_api_client.check_verify_code", side_effect=_verify)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_check_verify_code_code_expired(mocker):
     def _verify(user_id, code, code_type):
         return False, "Code has expired"
@@ -1396,7 +1396,7 @@ def mock_check_verify_code_code_expired(mocker):
     return mocker.patch("app.user_api_client.check_verify_code", side_effect=_verify)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_create_job(mocker, api_user_active):
     def _create(
         job_id,
@@ -1416,7 +1416,7 @@ def mock_create_job(mocker, api_user_active):
     return mocker.patch("app.job_api_client.create_job", side_effect=_create)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_job(mocker, api_user_active):
     def _get_job(service_id, job_id):
         return {"data": job_json(service_id, api_user_active, job_id=job_id)}
@@ -1424,7 +1424,7 @@ def mock_get_job(mocker, api_user_active):
     return mocker.patch("app.job_api_client.get_job", side_effect=_get_job)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_job_doesnt_exist(mocker):
     def _get_job(service_id, job_id):
         raise HTTPError(response=Mock(status_code=404, json={}), message={})
@@ -1432,7 +1432,7 @@ def mock_get_job_doesnt_exist(mocker):
     return mocker.patch("app.job_api_client.get_job", side_effect=_get_job)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_scheduled_job(mocker, api_user_active):
     def _get_job(service_id, job_id):
         return {
@@ -1448,7 +1448,7 @@ def mock_get_scheduled_job(mocker, api_user_active):
     return mocker.patch("app.job_api_client.get_job", side_effect=_get_job)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_cancelled_job(mocker, api_user_active):
     def _get_job(service_id, job_id):
         return {
@@ -1464,7 +1464,7 @@ def mock_get_cancelled_job(mocker, api_user_active):
     return mocker.patch("app.job_api_client.get_job", side_effect=_get_job)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_job_in_progress(mocker, api_user_active):
     def _get_job(service_id, job_id):
         return {
@@ -1481,7 +1481,7 @@ def mock_get_job_in_progress(mocker, api_user_active):
     return mocker.patch("app.job_api_client.get_job", side_effect=_get_job)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_job_with_sending_limits_exceeded(mocker, api_user_active):
     def _get_job(service_id, job_id):
         return {
@@ -1498,17 +1498,17 @@ def mock_get_job_with_sending_limits_exceeded(mocker, api_user_active):
     return mocker.patch("app.job_api_client.get_job", side_effect=_get_job)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_has_jobs(mocker):
     return mocker.patch("app.job_api_client.has_jobs", return_value=True)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_has_no_jobs(mocker):
     return mocker.patch("app.job_api_client.has_jobs", return_value=False)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_jobs(mocker, api_user_active, fake_uuid):
     def _get_jobs(service_id, limit_days=None, statuses=None, page=1):
         if statuses is None:
@@ -1564,7 +1564,7 @@ def mock_get_jobs(mocker, api_user_active, fake_uuid):
     return mocker.patch("app.job_api_client.get_jobs", side_effect=_get_jobs)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_scheduled_job_stats(mocker, api_user_active):
     return mocker.patch(
         "app.job_api_client.get_scheduled_job_stats",
@@ -1576,7 +1576,7 @@ def mock_get_scheduled_job_stats(mocker, api_user_active):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_uploads(mocker, api_user_active):
     def _get_uploads(service_id, limit_days=None, statuses=None, page=1):
         uploads = [
@@ -1608,7 +1608,7 @@ def mock_get_uploads(mocker, api_user_active):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def _mock_get_no_uploads(mocker, api_user_active):
     mocker.patch(
         "app.models.job.PaginatedUploads.client_method",
@@ -1618,7 +1618,7 @@ def _mock_get_no_uploads(mocker, api_user_active):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_no_jobs(mocker, api_user_active):
     return mocker.patch(
         "app.models.job.PaginatedJobs.client_method",
@@ -1629,7 +1629,7 @@ def mock_get_no_jobs(mocker, api_user_active):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_notifications(
     mocker,
     api_user_active,
@@ -1680,7 +1680,7 @@ def mock_get_notifications(
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_notifications_with_previous_next(mocker):
     def _get_notifications(
         service_id,
@@ -1705,7 +1705,7 @@ def mock_get_notifications_with_previous_next(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_notifications_with_no_notifications(mocker):
     def _get_notifications(
         service_id,
@@ -1728,7 +1728,7 @@ def mock_get_notifications_with_no_notifications(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_inbound_sms(mocker):
     def _get_inbound_sms(service_id, user_number=None, page=1):
         return inbound_sms_json()
@@ -1739,7 +1739,7 @@ def mock_get_inbound_sms(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_inbound_sms_by_id_with_no_messages(mocker):
     def _get_inbound_sms_by_id(service_id, notification_id):
         raise HTTPError(response=Mock(status_code=404))
@@ -1750,7 +1750,7 @@ def mock_get_inbound_sms_by_id_with_no_messages(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_most_recent_inbound_sms(mocker):
     def _get_most_recent_inbound_sms(service_id, user_number=None, page=1):
         return inbound_sms_json()
@@ -1761,7 +1761,7 @@ def mock_get_most_recent_inbound_sms(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_most_recent_inbound_sms_with_no_messages(mocker):
     def _get_most_recent_inbound_sms(service_id, user_number=None, page=1):
         return {"has_next": False, "data": []}
@@ -1772,7 +1772,7 @@ def mock_get_most_recent_inbound_sms_with_no_messages(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_inbound_sms_summary(mocker):
     def _get_inbound_sms_summary(
         service_id,
@@ -1785,7 +1785,7 @@ def mock_get_inbound_sms_summary(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_inbound_sms_summary_with_no_messages(mocker):
     def _get_inbound_sms_summary(
         service_id,
@@ -1798,7 +1798,7 @@ def mock_get_inbound_sms_summary_with_no_messages(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_inbound_number_for_service(mocker):
     return mocker.patch(
         "app.inbound_number_client.get_inbound_sms_number_for_service",
@@ -1806,7 +1806,7 @@ def mock_get_inbound_number_for_service(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_no_inbound_number_for_service(mocker):
     return mocker.patch(
         "app.inbound_number_client.get_inbound_sms_number_for_service",
@@ -1814,7 +1814,7 @@ def mock_no_inbound_number_for_service(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_has_permissions(mocker):
     def _has_permission(*permissions, restrict_admin_usage=False, allow_org_user=False):
         return True
@@ -1824,7 +1824,7 @@ def mock_has_permissions(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_users_by_service(mocker):
     def _get_users_for_service(service_id):
         return [
@@ -1843,7 +1843,7 @@ def mock_get_users_by_service(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_s3_download(mocker):
     def _download(service_id, upload_id):
         return """
@@ -1855,7 +1855,7 @@ def mock_s3_download(mocker):
     return mocker.patch("app.main.views.send.s3download", side_effect=_download)
 
 
-@pytest.fixture()
+@pytest.fixture
 def sample_invite(mocker, service_one):
     id_ = USER_ONE_ID
     from_user = service_one["users"][0]
@@ -1879,7 +1879,7 @@ def sample_invite(mocker, service_one):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def encoded_invite_data():
     """
     This mimics what API does when it encodes invite data in
@@ -1898,7 +1898,7 @@ def encoded_invite_data():
     return invite_data.decode("utf8")
 
 
-@pytest.fixture()
+@pytest.fixture
 def expired_invite(service_one):
     id_ = USER_ONE_ID
     from_user = service_one["users"][0]
@@ -1922,7 +1922,7 @@ def expired_invite(service_one):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_create_invite(mocker, sample_invite):
     def _create_invite(
         from_user, service_id, email_address, permissions, folder_permissions
@@ -1940,7 +1940,7 @@ def mock_create_invite(mocker, sample_invite):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_invites_for_service(mocker, service_one, sample_invite):
     def _get_invites(service_id):
         data = []
@@ -1955,7 +1955,7 @@ def mock_get_invites_for_service(mocker, service_one, sample_invite):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_invites_without_manage_permission(mocker, service_one, sample_invite):
     def _get_invites(service_id):
         return [
@@ -1977,7 +1977,7 @@ def mock_get_invites_without_manage_permission(mocker, service_one, sample_invit
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_accept_invite(mocker, sample_invite):
     def _accept(service_id, invite_id):
         return sample_invite
@@ -1985,7 +1985,7 @@ def mock_accept_invite(mocker, sample_invite):
     return mocker.patch("app.invite_api_client.accept_invite", side_effect=_accept)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_add_user_to_service(mocker, service_one, api_user_active):
     def _add_user(service_id, user_id, permissions, folder_permissions):
         return
@@ -1995,19 +1995,19 @@ def mock_add_user_to_service(mocker, service_one, api_user_active):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_set_user_permissions(mocker):
     return mocker.patch("app.user_api_client.set_user_permissions", return_value=None)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_remove_user_from_service(mocker):
     return mocker.patch(
         "app.service_api_client.remove_user_from_service", return_value=None
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_template_statistics(mocker, service_one, fake_uuid):
     template = template_json(
         service_one["id"],
@@ -2033,7 +2033,7 @@ def mock_get_template_statistics(mocker, service_one, fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_monthly_template_usage(mocker, service_one, fake_uuid):
     def _stats(service_id, year):
         return [
@@ -2053,7 +2053,7 @@ def mock_get_monthly_template_usage(mocker, service_one, fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_monthly_notification_stats(mocker, service_one, fake_uuid):
     def _stats(service_id, year):
         return {
@@ -2076,7 +2076,7 @@ def mock_get_monthly_notification_stats(mocker, service_one, fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_annual_usage_for_service(mocker, service_one, fake_uuid):
     def _get_usage(service_id, year=None):
         return [
@@ -2111,7 +2111,7 @@ def mock_get_annual_usage_for_service(mocker, service_one, fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_monthly_usage_for_service(mocker):
     def _get_usage(service_id, year):
         return [
@@ -2162,7 +2162,7 @@ def mock_get_monthly_usage_for_service(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_annual_usage_for_service_in_future(mocker, service_one, fake_uuid):
     def _get_usage(service_id, year=None):
         return [
@@ -2189,7 +2189,7 @@ def mock_get_annual_usage_for_service_in_future(mocker, service_one, fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_monthly_usage_for_service_in_future(mocker):
     def _get_usage(service_id, year):
         return []
@@ -2199,7 +2199,7 @@ def mock_get_monthly_usage_for_service_in_future(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_events(mocker):
     def _create_event(event_type, event_data):
         return {"some": "data"}
@@ -2207,12 +2207,12 @@ def mock_events(mocker):
     return mocker.patch("app.events_api_client.create_event", side_effect=_create_event)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_send_already_registered_email(mocker):
     return mocker.patch("app.user_api_client.send_already_registered_email")
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_guest_list(mocker):
     def _get_guest_list(service_id):
         return {
@@ -2225,17 +2225,17 @@ def mock_get_guest_list(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_guest_list(mocker):
     return mocker.patch("app.service_api_client.update_guest_list")
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_reset_failed_login_count(mocker):
     return mocker.patch("app.user_api_client.reset_failed_login_count")
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_notification(mocker):
     def _get_notification(
         service_id,
@@ -2266,7 +2266,7 @@ def mock_get_notification(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_send_notification(mocker, fake_uuid):
     def _send_notification(
         service_id, *, template_id, recipient, personalisation, sender_id
@@ -2278,7 +2278,7 @@ def mock_send_notification(mocker, fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def client(notify_admin):
     """
     Do not use this fixture directly – use `client_request` instead
@@ -2288,7 +2288,7 @@ def client(notify_admin):
         yield client
 
 
-@pytest.fixture()
+@pytest.fixture
 def logged_in_client(
     client, active_user_with_permissions, mocker, service_one, mock_login
 ):
@@ -2299,7 +2299,7 @@ def logged_in_client(
     return client
 
 
-@pytest.fixture()
+@pytest.fixture
 def _os_environ():
     """
     clear os.environ, and restore it after the test runs
@@ -2312,7 +2312,7 @@ def _os_environ():
         os.environ[k] = v
 
 
-@pytest.fixture()  # noqa (C901 too complex)
+@pytest.fixture  # noqa (C901 too complex)
 def client_request(logged_in_client, mocker, service_one):  # noqa (C901 too complex)
     def _get(mocker):
         return {"count": 0}
@@ -2505,7 +2505,7 @@ def normalize_spaces(input):
     return normalize_spaces(" ".join(item.text for item in input))
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_data_retention(mocker):
     data = {
         "id": str(sample_uuid()),
@@ -2521,17 +2521,17 @@ def mock_get_service_data_retention(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_create_service_data_retention(mocker):
     return mocker.patch("app.service_api_client.create_service_data_retention")
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_service_data_retention(mocker):
     return mocker.patch("app.service_api_client.update_service_data_retention")
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_free_sms_fragment_limit(mocker):
     sample_limit = 250000
     return mocker.patch(
@@ -2540,7 +2540,7 @@ def mock_get_free_sms_fragment_limit(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_create_or_update_free_sms_fragment_limit(mocker):
     sample_limit = 250000
     return mocker.patch(
@@ -2571,7 +2571,7 @@ def set_config_values(app, dict):
         app.config[key] = old_values[key]
 
 
-@pytest.fixture()
+@pytest.fixture
 def valid_token(notify_admin, fake_uuid):
     return generate_token(
         json.dumps({"user_id": fake_uuid, "secret_code": "my secret"}),
@@ -2580,7 +2580,7 @@ def valid_token(notify_admin, fake_uuid):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_valid_service_inbound_api(mocker):
     def _get(service_id, inbound_api_id):
         return {
@@ -2597,7 +2597,7 @@ def mock_get_valid_service_inbound_api(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_valid_service_callback_api(mocker):
     def _get(service_id, callback_api_id):
         return {
@@ -2614,7 +2614,7 @@ def mock_get_valid_service_callback_api(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_empty_service_inbound_api(mocker):
     return mocker.patch(
         "app.service_api_client.get_service_inbound_api",
@@ -2622,7 +2622,7 @@ def mock_get_empty_service_inbound_api(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_empty_service_callback_api(mocker):
     return mocker.patch(
         "app.service_api_client.get_service_callback_api",
@@ -2630,7 +2630,7 @@ def mock_get_empty_service_callback_api(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_create_service_inbound_api(mocker):
     def _create_service_inbound_api(service_id, url, bearer_token, user_id):
         return
@@ -2641,7 +2641,7 @@ def mock_create_service_inbound_api(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_service_inbound_api(mocker):
     def _update_service_inbound_api(
         service_id, url, bearer_token, user_id, inbound_api_id
@@ -2654,7 +2654,7 @@ def mock_update_service_inbound_api(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_create_service_callback_api(mocker):
     def _create_service_callback_api(service_id, url, bearer_token, user_id):
         return
@@ -2665,7 +2665,7 @@ def mock_create_service_callback_api(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_service_callback_api(mocker):
     def _update_service_callback_api(
         service_id, url, bearer_token, user_id, callback_api_id
@@ -2678,14 +2678,14 @@ def mock_update_service_callback_api(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def organization_one(api_user_active):
     return organization_json(
         ORGANISATION_ID, "organization one", [api_user_active["id"]]
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_organizations(mocker):
     def _get_organizations():
         return [
@@ -2705,7 +2705,7 @@ def mock_get_organizations(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_organizations_with_unusual_domains(mocker):
     def _get_organizations():
         return [
@@ -2726,7 +2726,7 @@ def mock_get_organizations_with_unusual_domains(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_organization(mocker):
     def _get_organization(org_id):
         return organization_json(
@@ -2743,7 +2743,7 @@ def mock_get_organization(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_organization_by_domain(mocker):
     def _get_organization_by_domain(domain):
         return organization_json(ORGANISATION_ID)
@@ -2754,7 +2754,7 @@ def mock_get_organization_by_domain(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_no_organization_by_domain(mocker):
     return mocker.patch(
         "app.organizations_client.get_organization_by_domain",
@@ -2762,7 +2762,7 @@ def mock_get_no_organization_by_domain(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_organization(
     mocker,
     mock_get_organization,
@@ -2774,7 +2774,7 @@ def mock_get_service_organization(
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_service_organization(mocker):
     def _update_service_organization(service_id, org_id):
         return
@@ -2805,7 +2805,7 @@ def _get_organization_services(organization_id):
     ]
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_organization_services(mocker, api_user_active):
     return mocker.patch(
         "app.organizations_client.get_organization_services",
@@ -2813,7 +2813,7 @@ def mock_get_organization_services(mocker, api_user_active):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_users_for_organization(mocker):
     def _get_users_for_organization(org_id):
         return [
@@ -2827,7 +2827,7 @@ def mock_get_users_for_organization(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_invited_users_for_organization(mocker, sample_org_invite):
     def _get_invited_invited_users_for_organization(org_id):
         return [sample_org_invite]
@@ -2838,7 +2838,7 @@ def mock_get_invited_users_for_organization(mocker, sample_org_invite):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def sample_org_invite(mocker, organization_one):
     id_ = str(UUID(bytes=b"sample_org_invit", version=4))
     invited_by = organization_one["users"][0]
@@ -2852,7 +2852,7 @@ def sample_org_invite(mocker, organization_one):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_invites_for_organization(mocker, sample_org_invite):
     def _get_org_invites(org_id):
         data = []
@@ -2868,7 +2868,7 @@ def mock_get_invites_for_organization(mocker, sample_org_invite):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_check_org_invite_token(mocker, sample_org_invite):
     def _check_org_token(token):
         return sample_org_invite
@@ -2878,7 +2878,7 @@ def mock_check_org_invite_token(mocker, sample_org_invite):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_check_org_cancelled_invite_token(mocker, sample_org_invite):
     def _check_org_token(token):
         sample_org_invite["status"] = "cancelled"
@@ -2889,7 +2889,7 @@ def mock_check_org_cancelled_invite_token(mocker, sample_org_invite):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_check_org_accepted_invite_token(mocker, sample_org_invite):
     sample_org_invite["status"] = "accepted"
 
@@ -2901,7 +2901,7 @@ def mock_check_org_accepted_invite_token(mocker, sample_org_invite):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_accept_org_invite(mocker, sample_org_invite):
     def _accept(organization_id, invite_id):
         return sample_org_invite
@@ -2909,7 +2909,7 @@ def mock_accept_org_invite(mocker, sample_org_invite):
     return mocker.patch("app.org_invite_api_client.accept_invite", side_effect=_accept)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_add_user_to_organization(mocker, organization_one, api_user_active):
     def _add_user(organization_id, user_id):
         return api_user_active
@@ -2919,7 +2919,7 @@ def mock_add_user_to_organization(mocker, organization_one, api_user_active):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_update_organization(mocker):
     def _update_org(org, **kwargs):
         return
@@ -2929,7 +2929,7 @@ def mock_update_organization(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_organizations_and_services_for_user(
     mocker, organization_one, api_user_active
 ):
@@ -2942,7 +2942,7 @@ def mock_get_organizations_and_services_for_user(
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_non_empty_organizations_and_services_for_user(
     mocker, organization_one, api_user_active
 ):
@@ -2989,7 +2989,7 @@ def mock_get_non_empty_organizations_and_services_for_user(
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_just_services_for_user(mocker, organization_one, api_user_active):
     def _make_services(name, trial_mode=False):
         return [
@@ -3014,7 +3014,7 @@ def mock_get_just_services_for_user(mocker, organization_one, api_user_active):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_empty_organizations_and_one_service_for_user(
     mocker, organization_one, api_user_active
 ):
@@ -3036,7 +3036,7 @@ def mock_get_empty_organizations_and_one_service_for_user(
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_create_event(mocker):
     """
     This should be used whenever your code is calling `flask_login.login_user`
@@ -3053,19 +3053,19 @@ def url_for_endpoint_with_token(endpoint, token, next=None):
     return url_for(endpoint, token=token, next=next)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_template_folders(mocker):
     return mocker.patch(
         "app.template_folder_api_client.get_template_folders", return_value=[]
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_move_to_template_folder(mocker):
     return mocker.patch("app.template_folder_api_client.move_to_folder")
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_create_template_folder(mocker):
     return mocker.patch(
         "app.template_folder_api_client.create_template_folder",
@@ -3073,7 +3073,7 @@ def mock_create_template_folder(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_and_organization_counts(mocker):
     return mocker.patch(
         "app.status_api_client.get_count_of_live_services_and_organizations",
@@ -3084,7 +3084,7 @@ def mock_get_service_and_organization_counts(mocker):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_service_history(mocker):
     return mocker.patch(
         "app.service_api_client.get_service_history",
@@ -3497,7 +3497,7 @@ def create_template(
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_invited_user_by_id(mocker, sample_invite):
     def _get(invited_user_id):
         return sample_invite
@@ -3508,7 +3508,7 @@ def mock_get_invited_user_by_id(mocker, sample_invite):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def mock_get_invited_org_user_by_id(mocker, sample_org_invite):
     def _get(invited_org_user_id):
         return sample_org_invite
@@ -3519,19 +3519,19 @@ def mock_get_invited_org_user_by_id(mocker, sample_org_invite):
     )
 
 
-@pytest.fixture()
+@pytest.fixture
 def fake_markdown_file():
     input = "#Test"
     return input
 
 
-@pytest.fixture()
+@pytest.fixture
 def fake_jinja_template():
     input = "{% if True %}True{% endif %}"
     return input
 
 
-@pytest.fixture()
+@pytest.fixture
 def fake_soup_template():
     input = "<h1>Test</h1>"
     return input
diff --git a/tests/end_to_end/conftest.py b/tests/end_to_end/conftest.py
index 30ca363f5..64e48a8fd 100644
--- a/tests/end_to_end/conftest.py
+++ b/tests/end_to_end/conftest.py
@@ -68,7 +68,7 @@ def login_for_end_to_end_testing(browser):
     context.storage_state(path=auth_state_path)
 
 
-@pytest.fixture()
+@pytest.fixture
 def end_to_end_authenticated_context(browser):
     # Create and load a previously authenticated context for Playwright E2E
     # tests.
@@ -82,13 +82,13 @@ def end_to_end_authenticated_context(browser):
     return context
 
 
-@pytest.fixture()
+@pytest.fixture
 def end_to_end_context(browser):
     context = browser.new_context()
     return context
 
 
-@pytest.fixture()
+@pytest.fixture
 def authenticated_page(end_to_end_context):
     # Open a new page and go to the site.
     page = end_to_end_context.new_page()
diff --git a/tests/notifications_utils/clients/redis/test_redis_client.py b/tests/notifications_utils/clients/redis/test_redis_client.py
index ac228849d..909f7685f 100644
--- a/tests/notifications_utils/clients/redis/test_redis_client.py
+++ b/tests/notifications_utils/clients/redis/test_redis_client.py
@@ -8,17 +8,17 @@ from freezegun import freeze_time
 from notifications_utils.clients.redis.redis_client import RedisClient, prepare_value
 
 
-@pytest.fixture()
+@pytest.fixture
 def mocked_redis_pipeline():
     return Mock()
 
 
-@pytest.fixture()
+@pytest.fixture
 def delete_mock():
     return Mock(return_value=4)
 
 
-@pytest.fixture()
+@pytest.fixture
 def mocked_redis_client(app, mocked_redis_pipeline, delete_mock, mocker):
     app.config["REDIS_ENABLED"] = True
 
@@ -46,7 +46,7 @@ def mocked_redis_client(app, mocked_redis_pipeline, delete_mock, mocker):
     return redis_client
 
 
-@pytest.fixture()
+@pytest.fixture
 def failing_redis_client(mocked_redis_client, delete_mock):
     # nota bene: using KeyError because flake8 thinks Exception
     # and BaseException are too broad
diff --git a/tests/notifications_utils/clients/redis/test_request_cache.py b/tests/notifications_utils/clients/redis/test_request_cache.py
index 472d9398b..cab88a827 100644
--- a/tests/notifications_utils/clients/redis/test_request_cache.py
+++ b/tests/notifications_utils/clients/redis/test_request_cache.py
@@ -4,7 +4,7 @@ from notifications_utils.clients.redis import RequestCache
 from notifications_utils.clients.redis.redis_client import RedisClient
 
 
-@pytest.fixture()
+@pytest.fixture
 def mocked_redis_client(app):
     app.config["REDIS_ENABLED"] = True
     redis_client = RedisClient()
@@ -12,7 +12,7 @@ def mocked_redis_client(app):
     return redis_client
 
 
-@pytest.fixture()
+@pytest.fixture
 def cache(mocked_redis_client):
     return RequestCache(mocked_redis_client)
 
diff --git a/tests/notifications_utils/conftest.py b/tests/notifications_utils/conftest.py
index 0b8f3bce8..7150b1486 100644
--- a/tests/notifications_utils/conftest.py
+++ b/tests/notifications_utils/conftest.py
@@ -9,7 +9,7 @@ class FakeService:
     id = "1234"
 
 
-@pytest.fixture()
+@pytest.fixture
 def app():
     flask_app = Flask(__name__)
     ctx = flask_app.app_context()
@@ -20,7 +20,7 @@ def app():
     ctx.pop()
 
 
-@pytest.fixture()
+@pytest.fixture
 def celery_app(mocker):
     app = Flask(__name__)
     app.config["CELERY"] = {"broker_url": "foo"}
@@ -39,7 +39,7 @@ def sample_service():
     return FakeService()
 
 
-@pytest.fixture()
+@pytest.fixture
 def rmock():
     with requests_mock.mock() as rmock:
         yield rmock