diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java
index a9e7dd633..8de50d23d 100644
--- a/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java
+++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java
@@ -4,10 +4,8 @@ import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.rest.RestTest;
 import org.alfresco.rest.model.RestActivityModelsCollection;
 import org.alfresco.utility.constants.UserRole;
-import org.alfresco.utility.model.SiteModel;
-import org.alfresco.utility.model.StatusModel;
-import org.alfresco.utility.model.TestGroup;
-import org.alfresco.utility.model.UserModel;
+import org.alfresco.utility.data.DataUser;
+import org.alfresco.utility.model.*;
 import org.alfresco.utility.report.Bug;
 import org.alfresco.utility.testrail.ExecutionType;
 import org.alfresco.utility.testrail.annotation.TestRail;
@@ -26,7 +24,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest
 {
     UserModel userModel;
     SiteModel siteModel;
-    UserModel searchedUser;
+    private DataUser.ListUserWithRoles usersWithRoles;
     private RestActivityModelsCollection restActivityModelsCollection;
 
     @BeforeClass(alwaysRun = true)
@@ -35,6 +33,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest
         userModel = dataUser.createRandomTestUser();
         siteModel = dataSite.usingUser(userModel).createPublicRandomSite();
         dataContent.usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN);
+        usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel, UserRole.SiteManager, UserRole.SiteCollaborator, UserRole.SiteConsumer, UserRole.SiteContributor);
     }
 
     @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.ACTIVITIES }, 
@@ -42,8 +41,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest
               description = "Verify manager user gets its activities with Rest API and response is successful")
     public void managerUserShouldGetPeopleActivitiesList() throws Exception
     {
-        UserModel managerUser = dataUser.usingAdmin().createRandomTestUser();
-        dataUser.usingUser(userModel).addUserToSite(managerUser, siteModel, UserRole.SiteManager);
+        UserModel managerUser = usersWithRoles.getOneUserWithRole(UserRole.SiteManager);
         dataContent.usingUser(managerUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN);
 
         restActivityModelsCollection = restClient.authenticateUser(managerUser).withCoreAPI().usingAuthUser().getPersonActivities();
@@ -57,8 +55,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest
               description = "Verify collaborator user gets its activities with Rest API and response is successful")
     public void collaboratorUserShouldGetPeopleActivitiesList() throws Exception
     {
-        UserModel collaboratorUser = dataUser.usingAdmin().createRandomTestUser();
-        dataUser.usingUser(userModel).addUserToSite(collaboratorUser, siteModel, UserRole.SiteCollaborator);
+        UserModel collaboratorUser = usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator);
         dataContent.usingUser(collaboratorUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN);
 
         restActivityModelsCollection = restClient.authenticateUser(collaboratorUser).withCoreAPI().usingAuthUser().getPersonActivities();
@@ -72,8 +69,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest
               description = "Verify contributor user gets its activities with Rest API and response is successful")
     public void contributorUserShouldGetPeopleActivitiesList() throws Exception
     {
-        UserModel contributorUser = dataUser.usingAdmin().createRandomTestUser();
-        dataUser.usingUser(userModel).addUserToSite(contributorUser, siteModel, UserRole.SiteContributor);
+        UserModel contributorUser = usersWithRoles.getOneUserWithRole(UserRole.SiteContributor);
         dataContent.usingUser(contributorUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN);
 
         restActivityModelsCollection = restClient.authenticateUser(contributorUser).withCoreAPI().usingAuthUser().getPersonActivities();
@@ -87,8 +83,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest
               description = "Verify consumer user gets its activities with Rest API and response is successful")
     public void consumerUserShouldGetPeopleActivitiesList() throws Exception
     {
-        UserModel consumerUser = dataUser.usingAdmin().createRandomTestUser();
-        dataUser.usingUser(userModel).addUserToSite(consumerUser, siteModel, UserRole.SiteConsumer);
+        UserModel consumerUser = usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer);
         
         restActivityModelsCollection = restClient.authenticateUser(consumerUser).withCoreAPI().usingAuthUser().getPersonActivities();
         restClient.assertStatusCodeIs(HttpStatus.OK);
@@ -106,8 +101,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest
         restActivityModelsCollection.assertThat().entriesListIsNotEmpty().and().entriesListContains("siteId", siteModel.getId())
                 	.and().paginationExist();
     }
-    
-    @Bug(id = "MNT-16904")
+
     @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.ACTIVITIES }, 
               executionType = ExecutionType.SANITY, 
               description = "Verify manager user is NOT Authorized to gets another user activities with Rest API")
@@ -118,6 +112,6 @@ public class GetPeopleActivitiesSanityTests extends RestTest
         managerUser.setPassword("newpassword");
 
         restClient.authenticateUser(managerUser).withCoreAPI().usingUser(userModel).getPersonActivities();
-        restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED).assertLastException().hasName(StatusModel.UNAUTHORIZED);
+        restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED).assertLastError().containsSummary(ErrorModel.AUTHENTICATION_FAILED);
     }
 }