diff --git a/tests/app/dao/test_invited_user_dao.py b/tests/app/dao/test_invited_user_dao.py
index 1711f4595..a2b0d3b28 100644
--- a/tests/app/dao/test_invited_user_dao.py
+++ b/tests/app/dao/test_invited_user_dao.py
@@ -79,7 +79,7 @@ def test_get_unknown_invited_user_returns_none(notify_db, notify_db_session, sam
 
     with pytest.raises(NoResultFound) as e:
         get_invited_user_by_service_and_id(sample_service.id, unknown_id)
-    assert 'No row was found for one()' in str(e.value)
+    assert 'No row was found when one was required' in str(e.value)
 
 
 def test_get_invited_users_for_service(notify_db, notify_db_session, sample_service):
diff --git a/tests/app/dao/test_services_dao.py b/tests/app/dao/test_services_dao.py
index 3522fc0f0..9671e7896 100644
--- a/tests/app/dao/test_services_dao.py
+++ b/tests/app/dao/test_services_dao.py
@@ -509,7 +509,7 @@ def test_dao_fetch_live_services_data(sample_user):
 def test_get_service_by_id_returns_none_if_no_service(notify_db):
     with pytest.raises(NoResultFound) as e:
         dao_fetch_service_by_id(str(uuid.uuid4()))
-    assert 'No row was found for one()' in str(e.value)
+    assert 'No row was found when one was required' in str(e.value)
 
 
 def test_get_service_by_id_returns_service(notify_db_session):
diff --git a/tests/app/dao/test_templates_dao.py b/tests/app/dao/test_templates_dao.py
index 3c7dae016..f903bb602 100644
--- a/tests/app/dao/test_templates_dao.py
+++ b/tests/app/dao/test_templates_dao.py
@@ -372,7 +372,7 @@ def test_get_template_version_returns_none_for_hidden_templates(sample_service):
 def test_get_template_by_id_and_service_returns_none_if_no_template(sample_service, fake_uuid):
     with pytest.raises(NoResultFound) as e:
         dao_get_template_by_id_and_service_id(template_id=fake_uuid, service_id=sample_service.id)
-    assert 'No row was found for one' in str(e.value)
+    assert 'No row was found when one was required' in str(e.value)
 
 
 def test_create_template_creates_a_history_record_with_current_data(sample_service, sample_user):