diff --git a/src/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.yml b/src/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.yml
deleted file mode 100644
index e6fa6b986d8..00000000000
--- a/src/test/java/org/elasticsearch/test/integration/broadcast/BroadcastActionsTests.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-cluster:
-  routing:
-    schedule: 100ms
-index:
-  number_of_shards: 5
-  number_of_replicas: 1
-      
diff --git a/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java b/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java
index f959bd370bd..338f7ebc721 100644
--- a/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java
+++ b/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.java
@@ -59,6 +59,7 @@ public class IndexLifecycleActionTests extends AbstractNodesTests {
         Settings settings = settingsBuilder()
                 .put(SETTING_NUMBER_OF_SHARDS, 11)
                 .put(SETTING_NUMBER_OF_REPLICAS, 1)
+                .put("cluster.routing.schedule", "20ms") // reroute every 20ms so we identify new nodes fast
                 .build();
 
         // start one server
@@ -192,6 +193,7 @@ public class IndexLifecycleActionTests extends AbstractNodesTests {
         Settings settings = settingsBuilder()
                 .put(SETTING_NUMBER_OF_SHARDS, 11)
                 .put(SETTING_NUMBER_OF_REPLICAS, 0)
+                .put("cluster.routing.schedule", "20ms") // reroute every 20ms so we identify new nodes fast
                 .build();
 
         // start one server
@@ -325,6 +327,7 @@ public class IndexLifecycleActionTests extends AbstractNodesTests {
         Settings settings = settingsBuilder()
                 .put(SETTING_NUMBER_OF_SHARDS, 11)
                 .put(SETTING_NUMBER_OF_REPLICAS, 0)
+                .put("cluster.routing.schedule", "20ms") // reroute every 20ms so we identify new nodes fast
                 .build();
 
         // start one server
diff --git a/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.yml b/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.yml
deleted file mode 100644
index 30d98181d38..00000000000
--- a/src/test/java/org/elasticsearch/test/integration/indexlifecycle/IndexLifecycleActionTests.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-cluster:
-  routing:
-    schedule: 100ms
-index:
-  number_of_shards: 11
-  number_of_replicas: 1
diff --git a/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.java
index 9fabec3f095..c39cb8b2c78 100644
--- a/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.java
+++ b/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.java
@@ -22,6 +22,9 @@ package org.elasticsearch.test.integration.search.indicesboost;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.client.Client;
+import org.elasticsearch.cluster.metadata.IndexMetaData;
+import org.elasticsearch.common.settings.ImmutableSettings;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.test.integration.AbstractNodesTests;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -44,7 +47,11 @@ public class SimpleIndicesBoostSearchTests extends AbstractNodesTests {
 
     @BeforeMethod
     public void createNodes() throws Exception {
-        startNode("server1");
+        Settings nodeSettings = ImmutableSettings.settingsBuilder()
+                .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1)
+                .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0)
+                .build();
+        startNode("server1", nodeSettings);
         client = getClient();
     }
 
diff --git a/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.yml b/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.yml
deleted file mode 100644
index e700f1f35fa..00000000000
--- a/src/test/java/org/elasticsearch/test/integration/search/indicesboost/SimpleIndicesBoostSearchTests.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-cluster:
-  routing:
-    schedule: 100ms
-index:
-  number_of_shards: 1
-  number_of_replicas: 0
diff --git a/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.java b/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.java
index c2b9646e751..6a5211d2353 100644
--- a/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.java
+++ b/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.java
@@ -21,6 +21,9 @@ package org.elasticsearch.test.integration.search.scriptfilter;
 
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.Client;
+import org.elasticsearch.cluster.metadata.IndexMetaData;
+import org.elasticsearch.common.settings.ImmutableSettings;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.search.sort.SortOrder;
 import org.elasticsearch.test.integration.AbstractNodesTests;
 import org.testng.annotations.AfterMethod;
@@ -45,7 +48,11 @@ public class ScriptFilterSearchTests extends AbstractNodesTests {
 
     @BeforeMethod
     public void createNodes() throws Exception {
-        startNode("server1");
+        Settings nodeSettings = ImmutableSettings.settingsBuilder()
+                .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1)
+                .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0)
+                .build();
+        startNode("server1", nodeSettings);
         client = getClient();
     }
 
diff --git a/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.yml b/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.yml
deleted file mode 100644
index e700f1f35fa..00000000000
--- a/src/test/java/org/elasticsearch/test/integration/search/scriptfilter/ScriptFilterSearchTests.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-cluster:
-  routing:
-    schedule: 100ms
-index:
-  number_of_shards: 1
-  number_of_replicas: 0