diff --git a/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java b/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java
index 36f6aef44ea..9ec95d6f24d 100644
--- a/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java
+++ b/src/test/java/org/elasticsearch/search/aggregations/metrics/ValueCountTests.java
@@ -61,12 +61,11 @@ public class ValueCountTests extends ElasticsearchIntegrationTest {
         }
         client().admin().indices().prepareFlush().execute().actionGet();
         client().admin().indices().prepareRefresh().execute().actionGet();
+        ensureSearchable();
     }
 
     @Test
-    @TestLogging("search:TRACE")
     public void unmapped() throws Exception {
-
         SearchResponse searchResponse = client().prepareSearch("idx_unmapped")
                 .setQuery(matchAllQuery())
                 .addAggregation(count("count").field("value"))
diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
index 80e8a4cb1c0..40ea83f459a 100644
--- a/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
+++ b/src/test/java/org/elasticsearch/test/ElasticsearchIntegrationTest.java
@@ -497,7 +497,7 @@ public abstract class ElasticsearchIntegrationTest extends ElasticsearchTestCase
      */
     protected ClusterHealthStatus ensureSearchable(String...indices) {
         // this is just a temporary thing but it's easier to change if it is encapsulated.
-        return ensureYellow(indices);
+        return ensureGreen(indices);
     }
 
     /**