diff --git a/src/test/java/org/elasticsearch/test/stress/rollingrestart/QuickRollingRestartStressTest.java b/src/test/java/org/elasticsearch/test/stress/rollingrestart/QuickRollingRestartStressTest.java
index 214651fe4fd..99a42d47b1d 100644
--- a/src/test/java/org/elasticsearch/test/stress/rollingrestart/QuickRollingRestartStressTest.java
+++ b/src/test/java/org/elasticsearch/test/stress/rollingrestart/QuickRollingRestartStressTest.java
@@ -87,7 +87,7 @@ public class QuickRollingRestartStressTest {
             System.out.println("--> done rolling restart [" + rollingRestart + "]");
 
             System.out.println("--> waiting for green state now...");
-            ClusterHealthResponse clusterHealthResponse = client.client().admin().cluster().prepareHealth().setWaitForGreenStatus().setTimeout("10m").execute().actionGet();
+            ClusterHealthResponse clusterHealthResponse = client.client().admin().cluster().prepareHealth().setWaitForGreenStatus().setWaitForRelocatingShards(0).setTimeout("10m").execute().actionGet();
             if (clusterHealthResponse.timedOut()) {
                 System.err.println("--> timed out waiting for green state...");
                 ClusterState state = client.client().admin().cluster().prepareState().execute().actionGet().state();