diff --git a/e2e-test/src/test/java/org/alfresco/service/search/SearchWithCustomModelTest.java b/e2e-test/src/test/java/org/alfresco/service/search/e2e/searchservices/SearchWithCustomModelTest.java
similarity index 99%
rename from e2e-test/src/test/java/org/alfresco/service/search/SearchWithCustomModelTest.java
rename to e2e-test/src/test/java/org/alfresco/service/search/e2e/searchservices/SearchWithCustomModelTest.java
index 3eb40b303..f5e355e87 100644
--- a/e2e-test/src/test/java/org/alfresco/service/search/SearchWithCustomModelTest.java
+++ b/e2e-test/src/test/java/org/alfresco/service/search/e2e/searchservices/SearchWithCustomModelTest.java
@@ -5,7 +5,7 @@
  * agreement is prohibited.
  */
 
-package org.alfresco.service.search;
+package org.alfresco.service.search.e2e.searchservices;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/e2e-test/src/test/java/org/alfresco/service/search/e2e/searchservices/SearchServiceUpgradeTests.java b/e2e-test/src/test/java/org/alfresco/service/search/upgrade/SearchServiceUpgradeTests.java
similarity index 93%
rename from e2e-test/src/test/java/org/alfresco/service/search/e2e/searchservices/SearchServiceUpgradeTests.java
rename to e2e-test/src/test/java/org/alfresco/service/search/upgrade/SearchServiceUpgradeTests.java
index bc0afd5e5..77c9999c4 100644
--- a/e2e-test/src/test/java/org/alfresco/service/search/e2e/searchservices/SearchServiceUpgradeTests.java
+++ b/e2e-test/src/test/java/org/alfresco/service/search/upgrade/SearchServiceUpgradeTests.java
@@ -1,6 +1,5 @@
-package org.alfresco.service.search.e2e.searchservices;
+package org.alfresco.service.search.upgrade;
 
-import org.alfresco.service.search.e2e.UpgradeTestCase;
 import org.alfresco.utility.LogFactory;
 import org.alfresco.utility.Utility;
 import org.alfresco.utility.data.provider.XMLDataConfig;
diff --git a/e2e-test/src/test/java/org/alfresco/service/search/e2e/UpgradeTestCase.java b/e2e-test/src/test/java/org/alfresco/service/search/upgrade/UpgradeTestCase.java
similarity index 96%
rename from e2e-test/src/test/java/org/alfresco/service/search/e2e/UpgradeTestCase.java
rename to e2e-test/src/test/java/org/alfresco/service/search/upgrade/UpgradeTestCase.java
index cda92302a..f8598ecaa 100644
--- a/e2e-test/src/test/java/org/alfresco/service/search/e2e/UpgradeTestCase.java
+++ b/e2e-test/src/test/java/org/alfresco/service/search/upgrade/UpgradeTestCase.java
@@ -1,4 +1,4 @@
-package org.alfresco.service.search.e2e;
+package org.alfresco.service.search.upgrade;
 
 import org.alfresco.cmis.CmisWrapper;
 import org.alfresco.utility.data.DataContent;