diff --git a/e2e-test/java/org/alfresco/rest/search/FingerPrintTest.java b/e2e-test/java/org/alfresco/rest/search/FingerPrintTest.java
index 4569ad349..8396f8cc0 100644
--- a/e2e-test/java/org/alfresco/rest/search/FingerPrintTest.java
+++ b/e2e-test/java/org/alfresco/rest/search/FingerPrintTest.java
@@ -18,9 +18,7 @@
  */
 package org.alfresco.rest.search;
 
-import org.alfresco.utility.model.TestGroup;
 import org.testng.Assert;
-import org.testng.annotations.Test;
 
 /**
  * Search end point Public API test with finger print.
diff --git a/e2e-test/java/org/alfresco/rest/search/SearchTest.java b/e2e-test/java/org/alfresco/rest/search/SearchTest.java
index 72e72801a..5b989e6c6 100644
--- a/e2e-test/java/org/alfresco/rest/search/SearchTest.java
+++ b/e2e-test/java/org/alfresco/rest/search/SearchTest.java
@@ -20,7 +20,6 @@ package org.alfresco.rest.search;
 
 import org.alfresco.utility.model.TestGroup;
 import org.springframework.http.HttpStatus;
-import org.testng.Assert;
 import org.testng.annotations.Test;
 
 /**
diff --git a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageFullTests.java b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageFullTests.java
index 8f1f352fc..a43f77700 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageFullTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageFullTests.java
@@ -57,6 +57,6 @@ public class GetProcessDefinitionImageFullTests extends RestTest
         restClient.authenticateUser(adminTenantUser2).withWorkflowAPI()
                 .usingProcessDefinitions(randomProcessDefinition).getProcessDefinitionImage();
         restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND)
-                .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, randomProcessDefinition.onModel().getId()));
+                .assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, randomProcessDefinition.getId()));
     }
 }
diff --git a/e2e-test/java/org/alfresco/rest/workflow/tasks/items/GetTaskItemsSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/tasks/items/GetTaskItemsSanityTests.java
index 88fd21c02..04b9e05ee 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/tasks/items/GetTaskItemsSanityTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/tasks/items/GetTaskItemsSanityTests.java
@@ -22,7 +22,7 @@ import org.testng.annotations.Test;
 
 public class GetTaskItemsSanityTests extends RestTest
 {
-    private UserModel userModel, userWhoStartsTask, assignee, adminTenantUser, tenantUser, tenantUserAssignee;
+    private UserModel userModel, userWhoStartsTask, assignee;
     private SiteModel siteModel;
     private FileModel fileModel, document1;
     private TaskModel taskModel;
diff --git a/e2e-test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableSanityTests.java b/e2e-test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableSanityTests.java
index 51246cde3..f98157164 100644
--- a/e2e-test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableSanityTests.java
+++ b/e2e-test/java/org/alfresco/rest/workflow/tasks/variables/UpdateTaskVariableSanityTests.java
@@ -27,9 +27,7 @@ public class UpdateTaskVariableSanityTests extends RestTest
     private SiteModel siteModel;
     private FileModel fileModel;
     private UserModel assigneeUser;
-    private TaskModel taskModel, tenantTask;
-
-    private UserModel adminTenantUser, tenantUser, tenantUserAssignee;
+    private TaskModel taskModel;
 
     private RestVariableModel taskVariable;
     private RestVariableModel variableModel;