diff --git a/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java b/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java
index 5b79f8808..0d4674af8 100644
--- a/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java
+++ b/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java
@@ -19,7 +19,6 @@
 package org.alfresco.rest.search;
 
 import org.alfresco.rest.RestTest;
-import org.alfresco.rest.model.RestNodeModelsCollection;
 import org.alfresco.rest.model.builder.NodesBuilder;
 import org.alfresco.utility.model.ContentModel;
 import org.alfresco.utility.model.FileModel;
@@ -30,7 +29,11 @@ import org.alfresco.utility.model.UserModel;
 import org.testng.annotations.BeforeClass;
 
 /**
- * Abstract Search test.
+ * Abstract Search test class that contains useful methods
+ * such as:
+ *  <ul>
+ *      <li>Preparing the data to index.
+ *      <li>Preparing search requests.
  * @author Michael Suzuki
  *
  */
@@ -66,14 +69,20 @@ public class AbstractSearchTest extends RestTest
         dataContent.usingSite(siteModel).usingResource(cm).createContent(file);
         dataContent.usingSite(siteModel).usingResource(cm).createContent(file2);
     }
-    
-    protected RestNodeModelsCollection query(String term) throws Exception
+    /**
+     * Helper method which create an http post request to Search API end point.
+     * @param term String search term
+     * @return {@link SearchResponse} response.
+     * @throws Exception if error
+     */
+    protected SearchResponse query(String term) throws Exception
     {
-        return restClient.authenticateUser(userModel)
-                .withCoreAPI()
-                .usingParams("term=" + term)
-                .usingQueries()
-                .findNodes();
+        RestRequestQueryModel queryReq = new RestRequestQueryModel();
+        
+        queryReq.setLanguage("afts");
+        queryReq.setQuery(term);
+        SearchRequest query = new SearchRequest(queryReq);
+        return restClient.authenticateUser(dataUser.getAdminUser()).withSearchAPI().search(query);
     }
     
 }
diff --git a/e2e-test/java/org/alfresco/rest/search/SearchTest.java b/e2e-test/java/org/alfresco/rest/search/SearchTest.java
index 036ee5c97..a0bcb4610 100644
--- a/e2e-test/java/org/alfresco/rest/search/SearchTest.java
+++ b/e2e-test/java/org/alfresco/rest/search/SearchTest.java
@@ -18,7 +18,6 @@
  */
 package org.alfresco.rest.search;
 
-import org.alfresco.rest.model.RestNodeModelsCollection;
 import org.alfresco.utility.model.TestGroup;
 import org.springframework.http.HttpStatus;
 import org.testng.annotations.Test;
@@ -30,21 +29,22 @@ import org.testng.annotations.Test;
  */
 public class SearchTest extends AbstractSearchTest
 {
-    @Test(groups={TestGroup.SEARCH})
+    @Test(groups={TestGroup.SEARCH, TestGroup.REST_API})
     public void searchCreatedData() throws Exception
     {        
-        RestNodeModelsCollection nodes =  query("cars");
+        SearchResponse nodes =  query("ipsum");
         restClient.assertStatusCodeIs(HttpStatus.OK);
         nodes.assertThat().entriesListIsNotEmpty();
+        
         nodes =  query("fox");
         restClient.assertStatusCodeIs(HttpStatus.OK);
         nodes.assertThat().entriesListIsNotEmpty();
     }
     
-    @Test(groups={TestGroup.SEARCH})
+    @Test(groups={TestGroup.SEARCH,TestGroup.REST_API})
     public void searchNonIndexedData() throws Exception
     {        
-        RestNodeModelsCollection nodes =  query("yeti");
+        SearchResponse nodes =  query("yeti");
         restClient.assertStatusCodeIs(HttpStatus.OK);
         nodes.assertThat().entriesListIsEmpty();
     }