diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java
index ce389980d..2244cfdb9 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/FacetedSearchTest.java
@@ -125,8 +125,13 @@ public class FacetedSearchTest extends AbstractSearchServicesE2ETest
         
         SearchResponse response = query(query);
         
+        waitForContentIndexing(file4.getContent(), true);
+        
         response.assertThat().entriesListIsNotEmpty();
         response.getContext().assertThat().field("facetQueries").isNotEmpty();
+        Assert.assertTrue(waitForContentIndexing("small", true));
+        Assert.assertTrue(waitForContentIndexing("medium", true));
+        Assert.assertTrue(waitForContentIndexing("large", true));
         
         FacetFieldBucket facet = response.getContext().getFacetQueries().get(0);
         facet.assertThat().field("label").contains("small").and().field("count").isGreaterThan(0);
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java
index 0d28bbb77..573af0ae3 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java
@@ -81,7 +81,7 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest
             assertTrue(baseUrls.contains(instance.getBaseUrl()));
 
             // TODO: Ideally Solr Host and Port should be Parameterised
-            assertNotNull(instance.getHost());
+            assertNotNull(instance.getHost(), "The solr host is not present");
             assertEquals(instance.getPort().intValue(), 8983);
             assertEquals(instance.getState(), "ACTIVE");
             assertEquals(instance.getMode(), "MASTER");
diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java
index e998d5b4c..c2b39fb4f 100644
--- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java
+++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/StatsSearchTest.java
@@ -322,7 +322,9 @@ public class StatsSearchTest extends AbstractSearchServicesE2ETest
         response.getContext().assertThat().field("facets").isNotEmpty();
         RestGenericFacetResponseModel facetResponseModel = response.getContext().getFacets().get(0);
         facetResponseModel.assertThat().field("type").is("stats");
-        facetResponseModel.assertThat().field("label").contains(label);
+        // TODO : Change back to facetResponseModel.assertThat().field("label").is(label);
+        //        when https://issues.alfresco.com/jira/browse/SEARCH-2125 is fixed
+        facetResponseModel.assertThat().field("label").is(label);
         RestGenericBucketModel bucket = facetResponseModel.getBuckets().get(0);
         List<RestGenericMetricModel> metrics = bucket.getMetrics();
         assertEquals(metrics.size(),metricsCount);