diff --git a/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java b/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java
index 91f59b4ef..a248b6cb2 100644
--- a/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java
+++ b/e2e-test/java/org/alfresco/rest/people/AddSiteMembershipRequestSanityTests.java
@@ -6,7 +6,6 @@ import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.rest.model.RestSiteMembershipRequestModel;
 import org.alfresco.utility.constants.UserRole;
 import org.alfresco.utility.data.DataUser;
-import org.alfresco.utility.data.DataUser.ListUserWithRoles;
 import org.alfresco.utility.exception.DataPreparationException;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.TestGroup;
diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesCoreTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesCoreTests.java
index fbb7265da..cd86f55be 100644
--- a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesCoreTests.java
+++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesCoreTests.java
@@ -45,7 +45,7 @@ public class GetPeopleActivitiesCoreTests extends RestTest
         dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel2, UserRole.SiteManager);
         
         // only once the activity list is checked with retry in order not to wait the entire list in each test
-        restActivityModelsCollection = restClient.authenticateUser(userModel).withCoreAPI().usingMe().getPersonActivitiesWithRetry();
+        restActivityModelsCollection = restClient.authenticateUser(userModel).withCoreAPI().usingMe().getPersonActivitiesUntilEntriesCountIs(4);
         restClient.assertStatusCodeIs(HttpStatus.OK);
         restActivityModelsCollection.assertThat().paginationField("count").is("4");
     }
diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesFullTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesFullTests.java
index f6536c095..ffe5b50d9 100644
--- a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesFullTests.java
+++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesFullTests.java
@@ -53,7 +53,7 @@ public class GetPeopleActivitiesFullTests extends RestTest
         dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel2, UserRole.SiteManager);
         
         // only once the activity list is checked with retry in order not to wait the entire list in each test
-        restActivityModelsCollection = restClient.authenticateUser(userModel).withCoreAPI().usingMe().getPersonActivitiesWithRetry();
+        restActivityModelsCollection = restClient.authenticateUser(userModel).withCoreAPI().usingMe().getPersonActivitiesUntilEntriesCountIs(4);
         restClient.assertStatusCodeIs(HttpStatus.OK);
         restActivityModelsCollection.assertThat().paginationField("count").is("4");
     }
diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java
index 96fb63082..f0b91dce5 100644
--- a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java
+++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java
@@ -39,9 +39,8 @@ public class GetPeopleActivitiesSanityTests extends RestTest
         unauthenticatedUser.setPassword("newpassword");
         
         // only once the activity list is checked with retry in order not to wait the entire list in each test
-        restActivityModelsCollection = restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser().getPersonActivitiesWithRetry();
+        restActivityModelsCollection = restClient.authenticateUser(userModel).withCoreAPI().usingAuthUser().getPersonActivitiesUntilEntriesCountIs(5);
         restClient.assertStatusCodeIs(HttpStatus.OK);
-        restActivityModelsCollection.assertThat().entriesListIsNotEmpty();
     }
 
     @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.ACTIVITIES, TestGroup.SANITY })
diff --git a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsSanityTests.java
index 78a08b88e..1551fa7c3 100644
--- a/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsSanityTests.java
+++ b/e2e-test/java/org/alfresco/rest/people/GetSiteMembershipRequestsSanityTests.java
@@ -5,7 +5,6 @@ import org.alfresco.rest.model.RestErrorModel;
 import org.alfresco.rest.model.RestSiteMembershipRequestModelsCollection;
 import org.alfresco.utility.constants.UserRole;
 import org.alfresco.utility.data.DataUser;
-import org.alfresco.utility.data.RandomData;
 import org.alfresco.utility.model.SiteModel;
 import org.alfresco.utility.model.TestGroup;
 import org.alfresco.utility.model.UserModel;
@@ -13,7 +12,6 @@ import org.alfresco.utility.report.Bug;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
 import org.springframework.http.HttpStatus;
-import org.springframework.social.alfresco.api.entities.Site.Visibility;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;