diff --git a/e2e-test/java/org/alfresco/rest/v1/RestTest.java b/e2e-test/java/org/alfresco/rest/v1/RestTest.java
index ea7c37bf9..8b39a4b5a 100644
--- a/e2e-test/java/org/alfresco/rest/v1/RestTest.java
+++ b/e2e-test/java/org/alfresco/rest/v1/RestTest.java
@@ -2,8 +2,8 @@ package org.alfresco.rest.v1;
 
 import org.alfresco.rest.core.RestProperties;
 import org.alfresco.rest.core.RestWrapper;
-import org.alfresco.tester.ServerHealth;
-import org.alfresco.tester.TasProperties;
+import org.alfresco.utility.ServerHealth;
+import org.alfresco.utility.TasProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
diff --git a/e2e-test/java/org/alfresco/rest/v1/SampleATest.java b/e2e-test/java/org/alfresco/rest/v1/SampleATest.java
index 37e5ef766..674851468 100644
--- a/e2e-test/java/org/alfresco/rest/v1/SampleATest.java
+++ b/e2e-test/java/org/alfresco/rest/v1/SampleATest.java
@@ -1,8 +1,8 @@
 package org.alfresco.rest.v1;
 
+import org.alfresco.rest.RestSitesApi;
 import org.alfresco.rest.exception.JsonToModelConversionException;
-import org.alfresco.rest.v1.RestSitesApi;
-import org.alfresco.tester.model.UserModel;
+import org.alfresco.utility.model.UserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.testng.Assert;
diff --git a/e2e-test/java/org/alfresco/rest/v1/SampleBTest.java b/e2e-test/java/org/alfresco/rest/v1/SampleBTest.java
index 7629d9f6c..c1919baf9 100644
--- a/e2e-test/java/org/alfresco/rest/v1/SampleBTest.java
+++ b/e2e-test/java/org/alfresco/rest/v1/SampleBTest.java
@@ -1,8 +1,8 @@
 package org.alfresco.rest.v1;
 
+import org.alfresco.rest.RestSitesApi;
 import org.alfresco.rest.exception.JsonToModelConversionException;
-import org.alfresco.rest.v1.RestSitesApi;
-import org.alfresco.tester.model.UserModel;
+import org.alfresco.utility.model.UserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.testng.Assert;
diff --git a/e2e-test/java/org/alfresco/rest/v1/SampleCommentsTest.java b/e2e-test/java/org/alfresco/rest/v1/SampleCommentsTest.java
index 3689221c5..38a3d468e 100644
--- a/e2e-test/java/org/alfresco/rest/v1/SampleCommentsTest.java
+++ b/e2e-test/java/org/alfresco/rest/v1/SampleCommentsTest.java
@@ -4,13 +4,13 @@ import java.io.File;
 
 import org.alfresco.dataprep.CMISUtil.DocumentType;
 import org.alfresco.dataprep.ContentService;
+import org.alfresco.rest.RestCommentsApi;
 import org.alfresco.rest.exception.JsonToModelConversionException;
 import org.alfresco.rest.model.Content;
 import org.alfresco.rest.model.RestCommentModel;
-import org.alfresco.rest.model.RestCommentsModel;
-import org.alfresco.tester.data.DataUser;
-import org.alfresco.tester.exception.DataPreparationException;
-import org.alfresco.tester.model.UserModel;
+import org.alfresco.utility.data.DataUser;
+import org.alfresco.utility.exception.DataPreparationException;
+import org.alfresco.utility.model.UserModel;
 import org.apache.chemistry.opencmis.client.api.Document;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
diff --git a/e2e-test/java/org/alfresco/rest/v1/SamplePeopleTest.java b/e2e-test/java/org/alfresco/rest/v1/SamplePeopleTest.java
index 6b47a16a7..75a7bbcd9 100644
--- a/e2e-test/java/org/alfresco/rest/v1/SamplePeopleTest.java
+++ b/e2e-test/java/org/alfresco/rest/v1/SamplePeopleTest.java
@@ -1,10 +1,10 @@
 package org.alfresco.rest.v1;
 
+import org.alfresco.rest.RestPeopleApi;
 import org.alfresco.rest.exception.JsonToModelConversionException;
-import org.alfresco.rest.v1.RestPeopleApi;
-import org.alfresco.tester.data.DataUser;
-import org.alfresco.tester.exception.DataPreparationException;
-import org.alfresco.tester.model.UserModel;
+import org.alfresco.utility.data.DataUser;
+import org.alfresco.utility.exception.DataPreparationException;
+import org.alfresco.utility.model.UserModel;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
diff --git a/e2e-test/java/org/alfresco/rest/v1/SampleSitesTest.java b/e2e-test/java/org/alfresco/rest/v1/SampleSitesTest.java
index ff96650cf..44580745f 100644
--- a/e2e-test/java/org/alfresco/rest/v1/SampleSitesTest.java
+++ b/e2e-test/java/org/alfresco/rest/v1/SampleSitesTest.java
@@ -1,13 +1,14 @@
 package org.alfresco.rest.v1;
 
 import org.alfresco.dataprep.ContentService;
+import org.alfresco.rest.RestSitesApi;
 import org.alfresco.rest.exception.JsonToModelConversionException;
 import org.alfresco.rest.model.SiteMember;
-import org.alfresco.tester.data.DataSite;
-import org.alfresco.tester.data.DataUser;
-import org.alfresco.tester.exception.DataPreparationException;
-import org.alfresco.tester.model.SiteModel;
-import org.alfresco.tester.model.UserModel;
+import org.alfresco.utility.data.DataSite;
+import org.alfresco.utility.data.DataUser;
+import org.alfresco.utility.exception.DataPreparationException;
+import org.alfresco.utility.model.SiteModel;
+import org.alfresco.utility.model.UserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.social.alfresco.api.entities.Role;