diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/AbstractSimpleIndexGatewayTests.java b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/AbstractSimpleIndexGatewayTests.java
similarity index 99%
rename from modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/AbstractSimpleIndexGatewayTests.java
rename to modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/AbstractSimpleIndexGatewayTests.java
index 1372af99b3e..4e44eb8d7d1 100644
--- a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/AbstractSimpleIndexGatewayTests.java
+++ b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/AbstractSimpleIndexGatewayTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.test.integration.gateway;
+package org.elasticsearch.test.integration.gateway.fs;
 
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;
diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.java b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.java
index 0960aaaa090..27770228b53 100644
--- a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.java
+++ b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/BlobStoreSmallBufferSizeFsIndexGatewayTests.java
@@ -19,8 +19,6 @@
 
 package org.elasticsearch.test.integration.gateway.fs;
 
-import org.elasticsearch.test.integration.gateway.AbstractSimpleIndexGatewayTests;
-
 /**
  * @author kimchy (shay.banon)
  */
diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/ChunkFsIndexGatewayTests.java b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/ChunkFsIndexGatewayTests.java
index a561d0e3db2..63a823c1e91 100644
--- a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/ChunkFsIndexGatewayTests.java
+++ b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/ChunkFsIndexGatewayTests.java
@@ -19,8 +19,6 @@
 
 package org.elasticsearch.test.integration.gateway.fs;
 
-import org.elasticsearch.test.integration.gateway.AbstractSimpleIndexGatewayTests;
-
 /**
  * @author kimchy (shay.banon)
  */
diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexGatewayTests.java b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexGatewayTests.java
index e651e729fa1..9e8ce8ebdfb 100644
--- a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexGatewayTests.java
+++ b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexGatewayTests.java
@@ -19,8 +19,6 @@
 
 package org.elasticsearch.test.integration.gateway.fs;
 
-import org.elasticsearch.test.integration.gateway.AbstractSimpleIndexGatewayTests;
-
 /**
  * @author kimchy (shay.banon)
  */
diff --git a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexInRamIndexGatewayTests.java b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexInRamIndexGatewayTests.java
index bf48f24da9d..57b9054e215 100644
--- a/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexInRamIndexGatewayTests.java
+++ b/modules/test/integration/src/test/java/org/elasticsearch/test/integration/gateway/fs/SimpleFsIndexInRamIndexGatewayTests.java
@@ -19,8 +19,6 @@
 
 package org.elasticsearch.test.integration.gateway.fs;
 
-import org.elasticsearch.test.integration.gateway.AbstractSimpleIndexGatewayTests;
-
 /**
  * @author kimchy (shay.banon)
  */