diff --git a/src/backend/core/tests/documents/test_api_document_accesses.py b/src/backend/core/tests/documents/test_api_document_accesses.py
index 206b735b..bb57f8cc 100644
--- a/src/backend/core/tests/documents/test_api_document_accesses.py
+++ b/src/backend/core/tests/documents/test_api_document_accesses.py
@@ -173,7 +173,9 @@ def test_api_document_accesses_retrieve_authenticated_unrelated():
         )
 
         assert response.status_code == 404
-        assert response.json() == {"detail": "Not found."}
+        assert response.json() == {
+            "detail": "No DocumentAccess matches the given query."
+        }
 
 
 @pytest.mark.parametrize("via", VIA)
diff --git a/src/backend/core/tests/documents/test_api_document_versions.py b/src/backend/core/tests/documents/test_api_document_versions.py
index d442ce46..e9805081 100644
--- a/src/backend/core/tests/documents/test_api_document_versions.py
+++ b/src/backend/core/tests/documents/test_api_document_versions.py
@@ -38,7 +38,7 @@ def test_api_document_versions_list_anonymous_private():
     response = APIClient().get(f"/api/v1.0/documents/{document.id!s}/versions/")
 
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Document matches the given query."}
 
 
 def test_api_document_versions_list_authenticated_unrelated_public():
@@ -86,7 +86,7 @@ def test_api_document_versions_list_authenticated_unrelated_private():
         f"/api/v1.0/documents/{document.id!s}/versions/",
     )
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Document matches the given query."}
 
 
 @pytest.mark.parametrize("via", VIA)
@@ -169,7 +169,7 @@ def test_api_document_versions_retrieve_anonymous_private():
     response = APIClient().get(url)
 
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Document matches the given query."}
 
 
 def test_api_document_versions_retrieve_authenticated_unrelated_public():
@@ -211,7 +211,7 @@ def test_api_document_versions_retrieve_authenticated_unrelated_private():
         f"/api/v1.0/documents/{document.id!s}/versions/{version_id:s}/",
     )
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Document matches the given query."}
 
 
 @pytest.mark.parametrize("via", VIA)
@@ -434,7 +434,7 @@ def test_api_document_versions_delete_authenticated_private():
     )
 
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Document matches the given query."}
 
 
 @pytest.mark.parametrize("role", ["reader", "editor"])
diff --git a/src/backend/core/tests/documents/test_api_documents_retrieve.py b/src/backend/core/tests/documents/test_api_documents_retrieve.py
index 95dcd1bf..b34119c3 100644
--- a/src/backend/core/tests/documents/test_api_documents_retrieve.py
+++ b/src/backend/core/tests/documents/test_api_documents_retrieve.py
@@ -45,7 +45,7 @@ def test_api_documents_retrieve_anonymous_not_public():
     response = APIClient().get(f"/api/v1.0/documents/{document.id!s}/")
 
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Document matches the given query."}
 
 
 def test_api_documents_retrieve_authenticated_unrelated_public():
@@ -101,7 +101,7 @@ def test_api_documents_retrieve_authenticated_unrelated_not_public():
         f"/api/v1.0/documents/{document.id!s}/",
     )
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Document matches the given query."}
 
 
 def test_api_documents_retrieve_authenticated_related_direct():
@@ -184,7 +184,7 @@ def test_api_documents_retrieve_authenticated_related_team_none(mock_user_get_te
 
     response = client.get(f"/api/v1.0/documents/{document.id!s}/")
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Document matches the given query."}
 
 
 @pytest.mark.parametrize(
diff --git a/src/backend/core/tests/documents/test_api_documents_update.py b/src/backend/core/tests/documents/test_api_documents_update.py
index da9b5f0e..866a8ba9 100644
--- a/src/backend/core/tests/documents/test_api_documents_update.py
+++ b/src/backend/core/tests/documents/test_api_documents_update.py
@@ -58,7 +58,7 @@ def test_api_documents_update_authenticated_unrelated():
     )
 
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Document matches the given query."}
 
     document.refresh_from_db()
     document_values = serializers.DocumentSerializer(instance=document).data
diff --git a/src/backend/core/tests/templates/test_api_templates_generate_document.py b/src/backend/core/tests/templates/test_api_templates_generate_document.py
index 8f745ace..1edfddb1 100644
--- a/src/backend/core/tests/templates/test_api_templates_generate_document.py
+++ b/src/backend/core/tests/templates/test_api_templates_generate_document.py
@@ -44,7 +44,7 @@ def test_api_templates_generate_document_anonymous_not_public():
     )
 
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Template matches the given query."}
 
 
 def test_api_templates_generate_document_authenticated_public():
@@ -87,7 +87,7 @@ def test_api_templates_generate_document_authenticated_not_public():
     )
 
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Template matches the given query."}
 
 
 @pytest.mark.parametrize("via", VIA)
diff --git a/src/backend/core/tests/templates/test_api_templates_retrieve.py b/src/backend/core/tests/templates/test_api_templates_retrieve.py
index 06ca5f84..1027ebcc 100644
--- a/src/backend/core/tests/templates/test_api_templates_retrieve.py
+++ b/src/backend/core/tests/templates/test_api_templates_retrieve.py
@@ -41,7 +41,7 @@ def test_api_templates_retrieve_anonymous_not_public():
     response = APIClient().get(f"/api/v1.0/templates/{template.id!s}/")
 
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Template matches the given query."}
 
 
 def test_api_templates_retrieve_authenticated_unrelated_public():
@@ -94,7 +94,7 @@ def test_api_templates_retrieve_authenticated_unrelated_not_public():
         f"/api/v1.0/templates/{template.id!s}/",
     )
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Template matches the given query."}
 
 
 def test_api_templates_retrieve_authenticated_related_direct():
@@ -174,7 +174,7 @@ def test_api_templates_retrieve_authenticated_related_team_none(mock_user_get_te
 
     response = client.get(f"/api/v1.0/templates/{template.id!s}/")
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Template matches the given query."}
 
 
 @pytest.mark.parametrize(
diff --git a/src/backend/core/tests/templates/test_api_templates_update.py b/src/backend/core/tests/templates/test_api_templates_update.py
index 89a82299..0735cba1 100644
--- a/src/backend/core/tests/templates/test_api_templates_update.py
+++ b/src/backend/core/tests/templates/test_api_templates_update.py
@@ -58,7 +58,7 @@ def test_api_templates_update_authenticated_unrelated():
     )
 
     assert response.status_code == 404
-    assert response.json() == {"detail": "Not found."}
+    assert response.json() == {"detail": "No Template matches the given query."}
 
     template.refresh_from_db()
     template_values = serializers.TemplateSerializer(instance=template).data
diff --git a/src/backend/core/tests/test_api_template_accesses.py b/src/backend/core/tests/test_api_template_accesses.py
index dddd96cf..a27ff7cd 100644
--- a/src/backend/core/tests/test_api_template_accesses.py
+++ b/src/backend/core/tests/test_api_template_accesses.py
@@ -170,7 +170,9 @@ def test_api_template_accesses_retrieve_authenticated_unrelated():
         )
 
         assert response.status_code == 404
-        assert response.json() == {"detail": "Not found."}
+        assert response.json() == {
+            "detail": "No TemplateAccess matches the given query."
+        }
 
 
 @pytest.mark.parametrize("via", VIA)