diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayModule.java b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayModule.java
index 990f8187c385..14b10d4d85e4 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayModule.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/gateway/GatewayModule.java
@@ -25,7 +25,7 @@ import org.elasticsearch.common.inject.Module;
 import org.elasticsearch.common.inject.Modules;
 import org.elasticsearch.common.inject.SpawnModules;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.gateway.none.NoneGatewayModule;
+import org.elasticsearch.gateway.local.LocalGatewayModule;
 
 /**
  * @author kimchy (shay.banon)
@@ -39,7 +39,7 @@ public class GatewayModule extends AbstractModule implements SpawnModules {
     }
 
     @Override public Iterable<? extends Module> spawnModules() {
-        return ImmutableList.of(Modules.createModule(settings.getAsClass("gateway.type", NoneGatewayModule.class, "org.elasticsearch.gateway.", "GatewayModule"), settings));
+        return ImmutableList.of(Modules.createModule(settings.getAsClass("gateway.type", LocalGatewayModule.class, "org.elasticsearch.gateway.", "GatewayModule"), settings));
     }
 
     @Override protected void configure() {
diff --git a/modules/jarjar/build.gradle b/modules/jarjar/build.gradle
index a1c4c09390cd..83b2ff2f180a 100644
--- a/modules/jarjar/build.gradle
+++ b/modules/jarjar/build.gradle
@@ -62,7 +62,7 @@ jar << {
         copy(file: jarjarArchivePath, tofile: jar.archivePath)
         delete(file: jarjarArchivePath)
 
-        // seems like empty dirst still exists, unjar and clean them
+        // seems like empty dirs still exists, unjar and clean them
         unjar(src: jar.archivePath, dest: "build/tmp/extracted")
         delete(dir: "build/tmp/extracted/jsr166y")
         delete(dir: "build/tmp/extracted/gnu/trove")
diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/AbstractNodesTests.java b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/AbstractNodesTests.java
index 4e72fb2a7d5e..a49ecb747a1e 100644
--- a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/AbstractNodesTests.java
+++ b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/AbstractNodesTests.java
@@ -59,6 +59,12 @@ public abstract class AbstractNodesTests {
                 .put(settings)
                 .put("name", id)
                 .build();
+
+        if (finalSettings.get("gateway.type") == null) {
+            // default to non gateway
+            finalSettings = settingsBuilder().put(finalSettings).put("gateway.type", "none").build();
+        }
+
         Node node = nodeBuilder()
                 .settings(finalSettings)
                 .build();
diff --git a/plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/test/client/BuilderActionsTests.groovy b/plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/test/client/BuilderActionsTests.groovy
index e85ea2698420..034160af1022 100644
--- a/plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/test/client/BuilderActionsTests.groovy
+++ b/plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/test/client/BuilderActionsTests.groovy
@@ -42,6 +42,9 @@ class BuilderActionsTests {
             node {
                 local = true
             }
+            gateway {
+                type = "none"
+            }
         }
 
         node = nodeBuilder.node()
diff --git a/plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/test/client/DifferentApiExecutionTests.groovy b/plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/test/client/DifferentApiExecutionTests.groovy
index eeb41e0a4111..1d9518972bc8 100644
--- a/plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/test/client/DifferentApiExecutionTests.groovy
+++ b/plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/test/client/DifferentApiExecutionTests.groovy
@@ -45,6 +45,9 @@ class DifferentApiExecutionTests {
             node {
                 local = true
             }
+            gateway {
+                type = "none"
+            }
         }
 
         node = nodeBuilder.node()
diff --git a/plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/test/client/SimpleActionsTests.groovy b/plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/test/client/SimpleActionsTests.groovy
index 8df14452d871..f3cc4366f572 100644
--- a/plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/test/client/SimpleActionsTests.groovy
+++ b/plugins/client/groovy/src/test/groovy/org/elasticsearch/groovy/test/client/SimpleActionsTests.groovy
@@ -41,6 +41,9 @@ class SimpleActionsTests {
             node {
                 local = true
             }
+            gateway {
+                type = "none"
+            }
         }
 
         node = nodeBuilder.node()
diff --git a/plugins/mapper/attachments/src/test/java/org/elasticsearch/plugin/mapper/attachments/test/SimpleAttachmentIntegrationTests.java b/plugins/mapper/attachments/src/test/java/org/elasticsearch/plugin/mapper/attachments/test/SimpleAttachmentIntegrationTests.java
index 82a80a1fc900..8b7c150f0479 100644
--- a/plugins/mapper/attachments/src/test/java/org/elasticsearch/plugin/mapper/attachments/test/SimpleAttachmentIntegrationTests.java
+++ b/plugins/mapper/attachments/src/test/java/org/elasticsearch/plugin/mapper/attachments/test/SimpleAttachmentIntegrationTests.java
@@ -47,7 +47,7 @@ public class SimpleAttachmentIntegrationTests {
     private Node node;
 
     @BeforeClass public void setupServer() {
-        node = nodeBuilder().local(true).node();
+        node = nodeBuilder().local(true).settings(settingsBuilder().put("gateway.type", "none")).node();
     }
 
     @AfterClass public void closeServer() {
diff --git a/plugins/transport/memcached/src/test/java/org/elasticsearch/memcached/test/AbstractMemcachedActionsTests.java b/plugins/transport/memcached/src/test/java/org/elasticsearch/memcached/test/AbstractMemcachedActionsTests.java
index 867d65605353..2cd809f19191 100644
--- a/plugins/transport/memcached/src/test/java/org/elasticsearch/memcached/test/AbstractMemcachedActionsTests.java
+++ b/plugins/transport/memcached/src/test/java/org/elasticsearch/memcached/test/AbstractMemcachedActionsTests.java
@@ -31,6 +31,7 @@ import java.io.IOException;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
+import static org.elasticsearch.common.settings.ImmutableSettings.*;
 import static org.elasticsearch.common.xcontent.XContentFactory.*;
 import static org.elasticsearch.node.NodeBuilder.*;
 import static org.hamcrest.MatcherAssert.*;
@@ -47,7 +48,7 @@ public abstract class AbstractMemcachedActionsTests {
 
     @BeforeMethod
     public void setup() throws IOException {
-        node = nodeBuilder().node();
+        node = nodeBuilder().settings(settingsBuilder().put("gateway.type", "none")).node();
         memcachedClient = createMemcachedClient();
     }