diff --git a/e2e-test/src/main/resources/shared-resources/testdata/search-by-aspect.xml b/e2e-test/src/main/resources/shared-resources/testdata/search-by-aspect.xml
new file mode 100644
index 000000000..42ae72af7
--- /dev/null
+++ b/e2e-test/src/main/resources/shared-resources/testdata/search-by-aspect.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="https://gitlab.alfresco.com/tas/tas-namespaces/raw/master/input-test-data.xsd">
+	<users>
+		<user id="u1" name="userSearchAspect" password="password" />
+	</users>
+
+	<sites>
+		<site id="s1" name="siteSearchByAspect" createdBy="userSearchAspect" visibility="PUBLIC">
+			<folders>
+				<folder id="f1" name="tas-folder1" createdBy="userSearchAspect">
+					<custom-model name="F:tas:folder" />
+					<aspects>
+						<aspect name="P:tas:tasFolderAspect" />
+					</aspects>
+						<files>
+							<file id="d1" name="tas-sub-file1.txt" createdBy="userSearchAspect">
+								<content>content sub-file 1</content>
+								<custom-model name="D:tas:document">
+									<properties>
+										<property name="tas:TextPropertyC" value="text sub-file-1" />
+										<property name="tas:IntPropertyC" value="11" />
+									</properties> 
+								</custom-model>
+								<aspects>
+									<aspect name = "P:tas:tasContentAspect" />
+								</aspects>
+							</file> 
+							<file id="d2" name="tas-sub-file2.txt" createdBy="userSearchAspect">
+								<content>content sub-file 2</content>
+								<custom-model name="D:tas:document">
+									<properties>
+										<property name="tas:TextPropertyC" value="text sub-file-2" />
+										<property name="tas:IntPropertyC" value="12" />
+									</properties>
+								</custom-model>
+								<aspects>
+									<aspect name = "P:tas:tasContentAspect" />
+								</aspects>
+							</file>
+							<file id="d3" name="tas-sub-file3.txt" createdBy="userSearchAspect">
+								<content>content sub-file 3</content>
+								<custom-model name="D:tas:document"></custom-model>
+								<aspects>
+									<aspect name = "P:tas:tasContentAspect" />
+								</aspects>
+							</file>
+							<file id="d4" name="standard-sub-file4.txt" createdBy="userSearchAspect">
+								<content>content sub-file 4</content>
+							</file>
+						</files>
+					<folders>
+						<folder id="f1-1" name="tas-sub-folder1" createdBy="userSearchAspect">
+							<custom-model name="F:tas:folder">
+								<properties>
+									<property name="tas:TextPropertyF" value="text sub-folder-1" />
+								</properties>
+							</custom-model>
+							<aspects>
+								<aspect name="P:tas:tasFolderAspect" />
+							</aspects>
+						</folder>
+						<folder name="standard-sub-folder2" createdBy="userSearchAspect">
+							<aspects>
+								<aspect name="P:tas:tasFolderAspect" />
+							</aspects>
+						</folder>
+					</folders>
+				</folder>
+				<folder name="tas-folder2" createdBy="userSearchAspect">
+					<custom-model name="F:tas:folder">
+						<properties>
+							<property name="tas:TextPropertyF" value="text folder-2" />
+						</properties>
+					</custom-model>
+				</folder>
+				<folder name="standard-folder3" createdBy="userSearchAspect">
+					<aspects>
+						<aspect name="P:tas:tasFolderAspect" />
+					</aspects>
+				</folder>
+			</folders>
+			<files>
+				<file id="d5" name="tas-file1.txt" createdBy="userSearchAspect">
+					<custom-model name="D:tas:document">
+						<properties>
+							<property name="tas:TextPropertyC" value="text file-1" />
+						</properties>
+					</custom-model>
+					<aspects>
+						<aspect name = "P:tas:tasContentAspect" />
+					</aspects>
+					<content>file 1 content</content>
+				</file>
+				<file id="d6" name="standard-file2.txt" createdBy="userSearchAspect">
+					<content>file 2 content</content>
+				</file>
+			</files>
+		</site>
+	</sites>
+	
+	<queries>
+		<query value="SELECT * FROM tas:tasContentAspect" expectedResults="4" />
+		<query value="SELECT * FROM tas:tasFolderAspect" expectedResults="4" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_FOLDER('NODE_REF[f1]')" expectedResults="3" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:name ASC" expectedResults="3" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:name DESC" expectedResults="3" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:lastModificationDate ASC" expectedResults="3" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:lastModificationDate DESC" expectedResults="3" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:createdBy DESC" expectedResults="3" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:createdBy ASC" expectedResults="3" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:name ASC, cmis:lastModifiedBy DESC" expectedResults="3" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:name DESC, cmis:lastModifiedBy DESC" expectedResults="3" />
+		<query value="SELECT * FROM cm:dublincore where IN_FOLDER('NODE_REF[f1]')" expectedResults="0" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_FOLDER('NODE_REF[s1]')" expectedResults="1" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_FOLDER('NODE_REF[f1]')" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:name ASC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:name DESC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:lastModificationDate ASC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:lastModificationDate DESC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:createdBy DESC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:createdBy ASC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:name ASC, cmis:lastModifiedBy DESC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_FOLDER('NODE_REF[f1]') ORDER BY cmis:name DESC, cmis:lastModifiedBy DESC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_FOLDER('NODE_REF[s1]')" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_TREE('NODE_REF[f1]')" expectedResults="3" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_TREE('NODE_REF[s1]')" expectedResults="4" />
+		<query value="SELECT * FROM cm:dublincore where IN_TREE('NODE_REF[f1]')" expectedResults="0" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_TREE('NODE_REF[f1]')" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_TREE('NODE_REF[s1]')" expectedResults="4" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_TREE('NODE_REF[f1]') ORDER BY cmis:name ASC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_TREE('NODE_REF[f1]') ORDER BY cmis:name DESC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_TREE('NODE_REF[f1]') ORDER BY cmis:lastModificationDate ASC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_TREE('NODE_REF[f1]') ORDER BY cmis:lastModificationDate DESC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_TREE('NODE_REF[f1]') ORDER BY cmis:createdBy DESC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_TREE('NODE_REF[f1]') ORDER BY cmis:createdBy ASC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_TREE('NODE_REF[f1]') ORDER BY cmis:name ASC, cmis:lastModifiedBy DESC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_TREE('NODE_REF[f1]') ORDER BY cmis:name DESC, cmis:lastModifiedBy DESC" expectedResults="2" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_TREE('NODE_REF[s1]') ORDER BY cmis:name ASC" expectedResults="4" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_TREE('NODE_REF[s1]') ORDER BY cmis:lastModificationDate ASC" expectedResults="4" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_TREE('NODE_REF[s1]') ORDER BY cmis:createdBy ASC" expectedResults="4" />
+		<query value="SELECT * FROM tas:tasFolderAspect where IN_TREE('NODE_REF[s1]') ORDER BY cmis:name ASC, cmis:lastModifiedBy DESC" expectedResults="4" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_TREE('NODE_REF[s1]') ORDER BY cmis:name ASC" expectedResults="4" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_TREE('NODE_REF[s1]') ORDER BY cmis:lastModificationDate DESC" expectedResults="4" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_TREE('NODE_REF[s1]') ORDER BY cmis:createdBy DESC" expectedResults="4" />
+		<query value="SELECT * FROM tas:tasContentAspect where IN_TREE('NODE_REF[s1]') ORDER BY cmis:name ASC, cmis:lastModifiedBy DESC" expectedResults="4" />
+	</queries>
+</testData> 
\ No newline at end of file
diff --git a/e2e-test/src/main/resources/shared-resources/testdata/search-by-property.xml b/e2e-test/src/main/resources/shared-resources/testdata/search-by-property.xml
index 4cb1d3c17..8da855292 100644
--- a/e2e-test/src/main/resources/shared-resources/testdata/search-by-property.xml
+++ b/e2e-test/src/main/resources/shared-resources/testdata/search-by-property.xml
@@ -14,15 +14,66 @@
 							<property name="tas:IntPropertyF" value="222" />
 						</properties>
 					</custom-model>
-				</folder>
-				<folder name="restf" createdBy="userSearchProperties">
-					<custom-model name="F:tas:folder">
-						<properties>
-							<property name="tas:TextPropertyF" value="restf text" />
-							<property name="tas:IntPropertyF" value="223" />
-						</properties>
-					</custom-model>
-				</folder>
+					<folders>
+						<folder name="restf" createdBy="userSearchProperties">
+							<custom-model name="F:tas:folder">
+							<properties>
+								<property name="tas:TextPropertyF" value="restf text" />
+								<property name="tas:IntPropertyF" value="223" />
+							</properties>
+							</custom-model>
+						</folder>
+						<folder name="testtttf" createdBy="userSearchProperties">
+							<custom-model name="F:tas:folder">
+							<properties>
+								<property name="tas:TextPropertyF" value="testtttf text" />
+								<property name="tas:IntPropertyF" value="225" />
+							</properties>
+							</custom-model>
+						</folder>
+						<folder name="testf" createdBy="userSearchProperties">
+							<custom-model name="F:tas:folder">
+								<properties>
+									<property name="tas:TextPropertyF" value="testf text" />
+									<property name="tas:IntPropertyF" value="226" />
+								</properties>
+							</custom-model>
+						</folder>
+						<folder name="testf1" createdBy="userSearchProperties">
+							<custom-model name="F:tas:folder">
+								<properties>
+									<property name="tas:TextPropertyF" value="testf1 text" />
+									<property name="tas:IntPropertyF" value="2221" />
+								</properties>
+							</custom-model>
+						</folder>
+						<folder name="testf2" createdBy="userSearchProperties">
+							<custom-model name="F:tas:folder">
+								<properties>
+									<property name="tas:TextPropertyF" value="testf2 text" />
+									<property name="tas:IntPropertyF" value="2222" />
+								</properties>
+							</custom-model>
+						</folder>
+						<folder name="testf3" createdBy="userSearchProperties">
+							<custom-model name="F:tas:folder">
+								<properties>
+									<property name="tas:TextPropertyF" value="testf3 text" />
+									<property name="tas:IntPropertyF" value="2223" />
+								</properties>
+							</custom-model>
+						</folder>
+						<folder name="testf4" createdBy="userSearchProperties">
+							<custom-model name="F:tas:folder">
+								<properties>
+									<property name="tas:TextPropertyF" value="testf4 text" />
+									<property name="tas:IntPropertyF" value="2224" />
+								</properties>
+							</custom-model>
+						</folder>
+							</folders>
+						</folder>
+				
 				<folder name="tesf" createdBy="userSearchProperties">
 					<custom-model name="F:tas:folder">
 						<properties>
@@ -31,7 +82,7 @@
 						</properties>
 					</custom-model>
 					<files>
-						<file name="guestc" createdBy="userSearchProperties">
+						<file name="guestc.txt" createdBy="userSearchProperties">
 							<content>content guestc</content>
 							<custom-model name="D:tas:document">
 								<properties>
@@ -40,7 +91,7 @@
 								</properties> 
 							</custom-model>
 						</file>
-						<file name="restc" createdBy="userSearchProperties">
+						<file name="restc.txt" createdBy="userSearchProperties">
 							<content>content restc</content>
 							<custom-model name="D:tas:document">
 								<properties>
@@ -49,7 +100,7 @@
 								</properties> 
 							</custom-model>
 						</file>
-						<file name="tesc" createdBy="userSearchProperties">
+						<file name="tesc.txt" createdBy="userSearchProperties">
 							<content>content tesc</content>
 							<custom-model name="D:tas:document">
 								<properties>
@@ -58,7 +109,7 @@
 								</properties> 
 							</custom-model>
 						</file>
-						<file name="testtttc" createdBy="userSearchProperties">
+						<file name="testtttc.txt" createdBy="userSearchProperties">
 							<content>content testtttc</content>
 							<custom-model name="D:tas:document">
 								<properties>
@@ -67,7 +118,7 @@
 								</properties> 
 							</custom-model>
 						</file>
-						<file name="testc" createdBy="userSearchProperties">
+						<file name="testc.txt" createdBy="userSearchProperties">
 							<content>content testc</content>
 							<custom-model name="D:tas:document">
 								<properties>
@@ -76,7 +127,7 @@
 								</properties> 
 							</custom-model>
 						</file>
-						<file name="testc1" createdBy="userSearchProperties">
+						<file name="testc1.txt" createdBy="userSearchProperties">
 							<content>content testc1</content>
 							<custom-model name="D:tas:document">
 								<properties>
@@ -85,7 +136,7 @@
 								</properties> 
 							</custom-model>
 						</file>
-						<file name="testc2" createdBy="userSearchProperties">
+						<file name="testc2.txt" createdBy="userSearchProperties">
 							<content>content testc2</content>
 							<custom-model name="D:tas:document">
 								<properties>
@@ -94,7 +145,7 @@
 								</properties> 
 							</custom-model>
 						</file>
-						<file name="testc3" createdBy="userSearchProperties">
+						<file name="testc3.txt" createdBy="userSearchProperties">
 							<content>content testc3</content>
 							<custom-model name="D:tas:document">
 								<properties>
@@ -105,72 +156,23 @@
 						</file>
 					</files>
 				</folder>
-				<folder name="testtttf" createdBy="userSearchProperties">
-					<custom-model name="F:tas:folder">
-						<properties>
-							<property name="tas:TextPropertyF" value="testtttf text" />
-							<property name="tas:IntPropertyF" value="225" />
-						</properties>
-					</custom-model>
-				</folder>
-				<folder name="testf" createdBy="userSearchProperties">
-					<custom-model name="F:tas:folder">
-						<properties>
-							<property name="tas:TextPropertyF" value="testf text" />
-							<property name="tas:IntPropertyF" value="226" />
-						</properties>
-					</custom-model>
-				</folder>
-				<folder name="testf1" createdBy="userSearchProperties">
-					<custom-model name="F:tas:folder">
-						<properties>
-							<property name="tas:TextPropertyF" value="testf1 text" />
-							<property name="tas:IntPropertyF" value="2221" />
-						</properties>
-					</custom-model>
-				</folder>
-				<folder name="testf2" createdBy="userSearchProperties">
-					<custom-model name="F:tas:folder">
-						<properties>
-							<property name="tas:TextPropertyF" value="testf2 text" />
-							<property name="tas:IntPropertyF" value="2222" />
-						</properties>
-					</custom-model>
-				</folder>
-				<folder name="testf3" createdBy="userSearchProperties">
-					<custom-model name="F:tas:folder">
-						<properties>
-							<property name="tas:TextPropertyF" value="testf3 text" />
-							<property name="tas:IntPropertyF" value="2223" />
-						</properties>
-					</custom-model>
-				</folder>
-				<folder name="testf4" createdBy="userSearchProperties">
-					<custom-model name="F:tas:folder">
-						<properties>
-							<property name="tas:TextPropertyF" value="testf4 text" />
-							<property name="tas:IntPropertyF" value="2224" />
-						</properties>
-					</custom-model>
-				</folder>
 			</folders>
-			
 		</site>
 	</sites>
 	
 	<queries>
-		<query value="SELECT * FROM tas:document where cmis:name = 'testc'" expectedResults="1" />
-		<query value="SELECT * FROM tas:document where cmis:name &lt;&gt; 'testc'" expectedResults="7" />
-		<query value="SELECT * FROM tas:document where cmis:name &lt; 'testc'" expectedResults="3" />
-		<query value="SELECT * FROM tas:document where cmis:name &lt;= 'testc'" expectedResults="4" />
-		<query value="SELECT * FROM tas:document where cmis:name &gt; 'testc'" expectedResults="4" />
-		<query value="SELECT * FROM tas:document where cmis:name &gt;= 'testc'" expectedResults="5" />
-		<query value="SELECT * FROM tas:document where cmis:name IN('testc', 'guestc', 'restc')" expectedResults="3" />
-		<query value="SELECT * FROM tas:document where cmis:name NOT IN('testc', 'gustc', 'restc')" expectedResults="6" />
+		<query value="SELECT * FROM tas:document where cmis:name = 'testc.txt'" expectedResults="1" />
+		<query value="SELECT * FROM tas:document where cmis:name &lt;&gt; 'testc.txt'" expectedResults="7" />
+		<query value="SELECT * FROM tas:document where cmis:name &lt; 'testc.txt'" expectedResults="3" />
+		<query value="SELECT * FROM tas:document where cmis:name &lt;= 'testc.txt'" expectedResults="4" />
+		<query value="SELECT * FROM tas:document where cmis:name &gt; 'testc.txt'" expectedResults="4" />
+		<query value="SELECT * FROM tas:document where cmis:name &gt;= 'testc.txt'" expectedResults="5" />
+		<query value="SELECT * FROM tas:document where cmis:name IN('testc.txt', 'guestc.txt', 'restc.txt')" expectedResults="3" />
+		<query value="SELECT * FROM tas:document where cmis:name NOT IN('testc.txt', 'gustc.txt', 'restc.txt')" expectedResults="6" />
 		<query value="SELECT * FROM tas:document where cmis:name LIKE '%testc%'" expectedResults="4" />
-		<query value="SELECT * FROM tas:document where cmis:name LIKE 'testc'" expectedResults="1" />
-		<query value="SELECT * FROM tas:document where cmis:name LIKE 't%tc'" expectedResults="2" />
-		<query value="SELECT * FROM tas:document where cmis:name LIKE 't__tc'" expectedResults="1" />
+		<query value="SELECT * FROM tas:document where cmis:name LIKE 'testc.txt'" expectedResults="1" />
+		<query value="SELECT * FROM tas:document where cmis:name LIKE 't%tc.txt'" expectedResults="2" />
+		<query value="SELECT * FROM tas:document where cmis:name LIKE 't__tc.txt'" expectedResults="1" />
 		<query value="SELECT * FROM tas:folder where cmis:name = 'testf'" expectedResults="1" />
 		<query value="SELECT * FROM tas:folder where cmis:name &lt;&gt; 'testf'" expectedResults="8" />
 		<query value="SELECT * FROM tas:folder where cmis:name &lt; 'testf'" expectedResults="3" />
diff --git a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByAspectTests.java b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByAspectTests.java
new file mode 100644
index 000000000..5ac89752e
--- /dev/null
+++ b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByAspectTests.java
@@ -0,0 +1,48 @@
+package org.alfresco.cmis.search;
+
+import org.alfresco.cmis.CmisTest;
+import org.alfresco.utility.data.provider.XMLDataConfig;
+import org.alfresco.utility.data.provider.XMLTestData;
+import org.alfresco.utility.data.provider.XMLTestDataProvider;
+import org.alfresco.utility.exception.TestConfigurationException;
+import org.alfresco.utility.model.QueryModel;
+import org.alfresco.utility.model.TestGroup;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+@Test(groups = { TestGroup.CMIS, TestGroup.QUERIES })
+public class SolrSearchByAspectTests extends CmisTest
+{
+    XMLTestData testData;
+
+    @BeforeClass(alwaysRun = true)
+    public void deployCustomModel() throws TestConfigurationException
+    {
+        dataContent.deployContentModel("shared-resources/model/tas-model.xml");
+        cmisApi.authenticateUser(dataUser.getAdminUser());
+    }
+    
+    @AfterClass(alwaysRun = true)
+    public void cleanupEnvironment() throws Exception
+    {
+        testData.cleanup(dataContent);
+    }
+
+    @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getAllData")
+    @XMLDataConfig(file = "src/main/resources/shared-resources/testdata/search-by-aspect.xml")
+    public void prepareDataForAspectSearch(XMLTestData testData) throws Exception
+    {
+        this.testData = testData;
+        this.testData.createUsers(dataUser);
+        this.testData.createSitesStructure(dataSite, dataContent, dataUser);
+    }
+
+    @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", dependsOnMethods = "prepareDataForAspectSearch")
+    @XMLDataConfig(file = "src/main/resources/shared-resources/testdata/search-by-aspect.xml")
+    public void executeSortedSearchByID(QueryModel query) throws Exception
+    {
+        cmisApi.withQuery(query.getValue())
+            .applyNodeRefsFrom(testData).assertResultsCountIs(query.getResults());
+    }
+}
diff --git a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByIdTests.java b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByIdTests.java
index b1905586d..5d5f61697 100644
--- a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByIdTests.java
+++ b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByIdTests.java
@@ -31,14 +31,14 @@ public class SolrSearchByIdTests extends CmisTest
 
     @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getAllData")
     @XMLDataConfig(file = "src/main/resources/shared-resources/testdata/search-by-id.xml")
-    public void prepareDataForSolrSearch(XMLTestData testData) throws Exception
+    public void prepareDataForSearchById(XMLTestData testData) throws Exception
     {
         this.testData = testData;
         this.testData.createUsers(dataUser);
         this.testData.createSitesStructure(dataSite, dataContent, dataUser);
     }
 
-    @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", dependsOnMethods = "prepareDataForSolrSearch")
+    @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", dependsOnMethods = "prepareDataForSearchById")
     @XMLDataConfig(file = "src/main/resources/shared-resources/testdata/search-by-id.xml")
     public void executeSortedSearchByID(QueryModel query) throws Exception
     {
diff --git a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPathTests.java b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPathTests.java
index 23ec8e715..9bec1ac55 100644
--- a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPathTests.java
+++ b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPathTests.java
@@ -30,7 +30,7 @@ public class SolrSearchByPathTests extends CmisTest
 
     @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getAllData")
     @XMLDataConfig(file = "src/main/resources/shared-resources/testdata/search-by-path.xml")
-    public void prepareEnvironmentData(XMLTestData testData) throws Exception
+    public void prepareDataForSearchByPath(XMLTestData testData) throws Exception
     {
         this.testData = testData;
         testData.createUsers(dataUser);
@@ -39,7 +39,7 @@ public class SolrSearchByPathTests extends CmisTest
         Utility.waitToLoopTime(15);
     }
 
-    @Test(dependsOnMethods = "prepareEnvironmentData", dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
+    @Test(dependsOnMethods = "prepareDataForSearchByPath", dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData")
     @XMLDataConfig(file = "src/main/resources/shared-resources/testdata/search-by-path.xml")
     public void executeSearchByPathQueries(QueryModel query) throws Exception
     {
diff --git a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPropertyTests.java b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPropertyTests.java
index aff244292..3edc4ebdb 100644
--- a/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPropertyTests.java
+++ b/e2e-test/src/test/java/org/alfresco/cmis/search/SolrSearchByPropertyTests.java
@@ -31,14 +31,14 @@ public class SolrSearchByPropertyTests extends CmisTest
 
     @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getAllData")
     @XMLDataConfig(file = "src/main/resources/shared-resources/testdata/search-by-property.xml")
-    public void prepareDataForSolrSearch(XMLTestData testData) throws Exception
+    public void prepareDataForSearchWithProperty(XMLTestData testData) throws Exception
     {
         this.testData = testData;
         this.testData.createUsers(dataUser);
         this.testData.createSitesStructure(dataSite, dataContent, dataUser);
     }
 
-    @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", dependsOnMethods = "prepareDataForSolrSearch")
+    @Test(dataProviderClass = XMLTestDataProvider.class, dataProvider = "getQueriesData", dependsOnMethods = "prepareDataForSearchWithProperty")
     @XMLDataConfig(file = "src/main/resources/shared-resources/testdata/search-by-property.xml")
     public void executeSortedSearchByID(QueryModel query) throws Exception
     {