diff --git a/e2e-test/java/org/alfresco/rest/favorites/AddFavoritesTests.java b/e2e-test/java/org/alfresco/rest/favorites/AddFavoritesTests.java
index e135bfac9..0797eadee 100644
--- a/e2e-test/java/org/alfresco/rest/favorites/AddFavoritesTests.java
+++ b/e2e-test/java/org/alfresco/rest/favorites/AddFavoritesTests.java
@@ -441,6 +441,6 @@ public class AddFavoritesTests extends RestTest
         RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, "", "people/{personId}/favorites", adminUserModel.getUsername());
         restClient.processModel(RestPersonFavoritesModel.class, request);
         restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError()
-                .containsSummary(String.format(RestErrorModel.NO_CONTENT, "No content to map to Object due to end of input"));;
+                .containsSummary(String.format(RestErrorModel.NO_CONTENT, "No content to map due to end-of-input"));
     }
 }
diff --git a/e2e-test/java/org/alfresco/rest/ratings/AddRatingTests.java b/e2e-test/java/org/alfresco/rest/ratings/AddRatingTests.java
index 17a37dbbe..72e3595a4 100644
--- a/e2e-test/java/org/alfresco/rest/ratings/AddRatingTests.java
+++ b/e2e-test/java/org/alfresco/rest/ratings/AddRatingTests.java
@@ -371,7 +371,7 @@ public class AddRatingTests extends RestTest
 
         restClient.authenticateUser(adminUser).withCoreAPI().usingResource(document).addInvalidRating("");
         restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError()
-                .containsSummary(String.format(RestErrorModel.NO_CONTENT, "No content to map to Object due to end of input"));
+                .containsSummary(String.format(RestErrorModel.NO_CONTENT, "No content to map due to end-of-input"));
     }
 
     @TestRail(section = { TestGroup.REST_API, TestGroup.RATINGS },
@@ -384,7 +384,8 @@ public class AddRatingTests extends RestTest
 
         restClient.authenticateUser(adminUser).withCoreAPI().usingResource(document).addInvalidRating("{\"id\":\"\"}");
         restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError()
-                .containsSummary(String.format(RestErrorModel.NO_CONTENT, "N/A (through reference chain: org.alfresco.rest.api.model.NodeRating[\"id\"])"));
+                // The message is shortened for comparison as there is a Java object id in the message (random)
+                .containsSummary(String.format(RestErrorModel.NO_CONTENT, "N/A"));
     }
 
     @TestRail(section = { TestGroup.REST_API, TestGroup.RATINGS },
diff --git a/e2e-test/java/org/alfresco/rest/sites/members/AddSiteMemberTests.java b/e2e-test/java/org/alfresco/rest/sites/members/AddSiteMemberTests.java
index ecfa79db5..51cab086f 100644
--- a/e2e-test/java/org/alfresco/rest/sites/members/AddSiteMemberTests.java
+++ b/e2e-test/java/org/alfresco/rest/sites/members/AddSiteMemberTests.java
@@ -417,8 +417,8 @@ public class AddSiteMemberTests extends RestTest
                 publicSiteModel.getId(), restClient.getParameters());
         restClient.processModel(RestSiteMemberModel.class, request);
         restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError()
-                .containsSummary(String.format(RestErrorModel.NO_CONTENT, "No content to map to Object due to end of input"))
-                .containsErrorKey(String.format(RestErrorModel.NO_CONTENT, "No content to map to Object due to end of input"))
+                .containsSummary(String.format(RestErrorModel.NO_CONTENT, "No content to map due to end-of-input"))
+                .containsErrorKey(String.format(RestErrorModel.NO_CONTENT, "No content to map due to end-of-input"))
                 .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER)
                 .stackTraceIs(RestErrorModel.STACKTRACE);
     }
@@ -463,8 +463,8 @@ public class AddSiteMemberTests extends RestTest
         RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, json, "sites/{siteId}/members?{parameters}", publicSiteModel.getId(), restClient.getParameters());
         restClient.processModel(RestSiteMemberModel.class, request);
         restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError()
-                .containsErrorKey(String.format(RestErrorModel.NO_CONTENT, "N/A (through reference chain: org.alfresco.rest.api.model.SiteMember[\"role\"])"))
-                .containsSummary(String.format(RestErrorModel.NO_CONTENT, "N/A (through reference chain: org.alfresco.rest.api.model.SiteMember[\"role\"])"))
+                .containsErrorKey(String.format(RestErrorModel.NO_CONTENT, "N/A"))
+                .containsSummary(String.format(RestErrorModel.NO_CONTENT, "N/A"))
                 .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER)
                 .stackTraceIs(RestErrorModel.STACKTRACE);
     }
diff --git a/e2e-test/java/org/alfresco/rest/sites/members/UpdateSiteMemberTests.java b/e2e-test/java/org/alfresco/rest/sites/members/UpdateSiteMemberTests.java
index 4afb9dde2..3b98afebb 100644
--- a/e2e-test/java/org/alfresco/rest/sites/members/UpdateSiteMemberTests.java
+++ b/e2e-test/java/org/alfresco/rest/sites/members/UpdateSiteMemberTests.java
@@ -523,8 +523,8 @@ public class UpdateSiteMemberTests extends RestTest
         RestRequest request = RestRequest.requestWithBody(HttpMethod.PUT, "", "sites/{siteId}/members/{personId}", publicSite.getId(), siteCollaborator.getUsername());
         restClient.processModel(RestSiteMemberModel.class, request);
         restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST).assertLastError()
-                .containsSummary(String.format(RestErrorModel.NO_CONTENT, "No content to map to Object due to end of input"))
-                .containsErrorKey(String.format(RestErrorModel.NO_CONTENT, "No content to map to Object due to end of input"))
+                .containsSummary(String.format(RestErrorModel.NO_CONTENT, "No content to map due to end-of-input"))
+                .containsErrorKey(String.format(RestErrorModel.NO_CONTENT, "No content to map due to end-of-input"))
                 .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER)
                 .stackTraceIs(RestErrorModel.STACKTRACE);
     }
diff --git a/e2e-test/java/org/alfresco/rest/sites/membershipRequests/AddSiteMembershipRequestTests.java b/e2e-test/java/org/alfresco/rest/sites/membershipRequests/AddSiteMembershipRequestTests.java
index 296d3ee51..a6f155cf6 100644
--- a/e2e-test/java/org/alfresco/rest/sites/membershipRequests/AddSiteMembershipRequestTests.java
+++ b/e2e-test/java/org/alfresco/rest/sites/membershipRequests/AddSiteMembershipRequestTests.java
@@ -146,7 +146,7 @@ public class AddSiteMembershipRequestTests extends RestTest
         UserModel newMember = dataUser.createRandomTestUser();
         restClient.authenticateUser(newMember).withCoreAPI().usingMe().addSiteMembershipRequest("");
         restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST)
-                .assertLastError().containsSummary(String.format(RestErrorModel.NO_CONTENT, "No content to map to Object due to end of input"));
+                .assertLastError().containsSummary(String.format(RestErrorModel.NO_CONTENT, "No content to map due to end-of-input"));
     }
 
     @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION })
diff --git a/e2e-test/java/org/alfresco/rest/sites/membershipRequests/UpdateSiteMembershipRequestTests.java b/e2e-test/java/org/alfresco/rest/sites/membershipRequests/UpdateSiteMembershipRequestTests.java
index 9bff0d17b..c40d3a2b5 100644
--- a/e2e-test/java/org/alfresco/rest/sites/membershipRequests/UpdateSiteMembershipRequestTests.java
+++ b/e2e-test/java/org/alfresco/rest/sites/membershipRequests/UpdateSiteMembershipRequestTests.java
@@ -439,8 +439,8 @@ public class UpdateSiteMembershipRequestTests extends RestTest
 
         restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST)
                 .assertLastError()
-                .containsSummary(String.format(RestErrorModel.NO_CONTENT, "No content to map to Object due to end of input"))
-                .containsErrorKey(String.format(RestErrorModel.NO_CONTENT, "No content to map to Object due to end of input"))
+                .containsSummary(String.format(RestErrorModel.NO_CONTENT, "No content to map due to end-of-input"))
+                .containsErrorKey(String.format(RestErrorModel.NO_CONTENT, "No content to map due to end-of-input"))
                 .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER)
                 .stackTraceIs(RestErrorModel.STACKTRACE);
     }