diff --git a/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java b/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java
index c8463c0ac..e8a0f955c 100644
--- a/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java
+++ b/e2e-test/java/org/alfresco/rest/search/AbstractSearchTest.java
@@ -166,23 +166,17 @@ public class AbstractSearchTest extends RestTest
      * @return true (indexing is finished) if search returns appropriate results
      * @throws Exception
      */
-    public boolean waitForIndexing(String userQuery, Boolean expectedInResults) throws Exception
+    public boolean waitForIndexing(String userQuery, boolean expectedInResults) throws Exception
     {
-        Boolean found = false;
-        Boolean resultAsExpected = false;
+        boolean found = false;
+        boolean resultAsExpected = false;
         String expectedStatusCode = HttpStatus.OK.toString();
 
-        SearchRequest searchRequest = createQuery(userQuery);
-        SearchResponse response = query(searchRequest);
-
         // Repeat search until the query results are as expected or Search Retry count is hit
         for (int searchCount = 1; searchCount <= 3; searchCount++)
         {
-            if (searchCount > 1)
-            {
-                // Wait for the solr indexing.
-                Utility.waitToLoopTime(properties.getSolrWaitTimeInSeconds(), "Wait For Indexing");
-            }
+            SearchRequest searchRequest = createQuery(userQuery);
+            SearchResponse response = query(searchRequest);
 
             if (restClient.getStatusCode().matches(expectedStatusCode))
             {
@@ -196,11 +190,16 @@ public class AbstractSearchTest extends RestTest
                 }
 
                 // Loop again if result is not as expected: To cater for solr lag: eventual consistency
-                resultAsExpected = (expectedInResults.equals(found));
+                resultAsExpected = (expectedInResults == found);
                 if (resultAsExpected)
                 {
                     break;
                 }
+                else
+                {
+                 // Wait for the solr indexing.
+                    Utility.waitToLoopTime(properties.getSolrWaitTimeInSeconds(), "Wait For Indexing");
+                }
             }
             else
             {