diff --git a/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java b/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java
index cca46cfa98c..7b927c1e588 100644
--- a/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java
+++ b/core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java
@@ -98,8 +98,7 @@ public class OldIndexBackwardsCompatibilityIT extends ESIntegTestCase {
 
     private List<String> loadIndexesList(String prefix) throws IOException {
         List<String> indexes = new ArrayList<>();
-        Path dir = getDataPath(".");
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir, prefix + "-*.zip")) {
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(getBwcIndicesPath(), prefix + "-*.zip")) {
             for (Path path : stream) {
                 indexes.add(path.getFileName().toString());
             }
diff --git a/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java b/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java
index 14bcfc79076..9ef4238e3b9 100644
--- a/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java
+++ b/core/src/test/java/org/elasticsearch/bwcompat/RestoreBackwardsCompatIT.java
@@ -62,12 +62,12 @@ public class RestoreBackwardsCompatIT extends AbstractSnapshotIntegTestCase {
             // Configure using path.repo
             return settingsBuilder()
                     .put(super.nodeSettings(nodeOrdinal))
-                    .put("path.repo", reposRoot())
+                    .put("path.repo", getBwcIndicesPath())
                     .build();
         } else {
             // Configure using url white list
             try {
-                URI repoJarPatternUri = new URI("jar:" + reposRoot().toUri().toString() + "*.zip!/repo/");
+                URI repoJarPatternUri = new URI("jar:" + getBwcIndicesPath().toUri().toString() + "*.zip!/repo/");
                 return settingsBuilder()
                         .put(super.nodeSettings(nodeOrdinal))
                         .putArray("repositories.url.allowed_urls", repoJarPatternUri.toString())
@@ -128,10 +128,6 @@ public class RestoreBackwardsCompatIT extends AbstractSnapshotIntegTestCase {
         }
     }
 
-    private Path reposRoot() {
-        return getDataPath(".");
-    }
-
     private List<String> repoVersions() throws Exception {
         return listRepoVersions("repo");
     }
@@ -142,7 +138,7 @@ public class RestoreBackwardsCompatIT extends AbstractSnapshotIntegTestCase {
 
     private List<String> listRepoVersions(String prefix) throws Exception {
         List<String> repoVersions = new ArrayList<>();
-        Path repoFiles = reposRoot();
+        Path repoFiles = getBwcIndicesPath();
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(repoFiles, prefix + "-*.zip")) {
             for (Path entry : stream) {
                 String fileName = entry.getFileName().toString();
@@ -155,8 +151,8 @@ public class RestoreBackwardsCompatIT extends AbstractSnapshotIntegTestCase {
     }
 
     private void createRepo(String prefix, String version, String repo) throws Exception {
-        String repoFile = prefix + "-" + version + ".zip";
-        URI repoFileUri = getDataPath(repoFile).toUri();
+        Path repoFile = getBwcIndicesPath().resolve(prefix + "-" + version + ".zip");
+        URI repoFileUri = repoFile.toUri();
         URI repoJarUri = new URI("jar:" + repoFileUri.toString() + "!/repo/");
         logger.info("-->  creating repository [{}] for version [{}]", repo, version);
         assertAcked(client().admin().cluster().preparePutRepository(repo)
diff --git a/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java b/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java
index 606af846b35..8d495a006cb 100644
--- a/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java
+++ b/core/src/test/java/org/elasticsearch/common/util/MultiDataPathUpgraderTests.java
@@ -141,8 +141,7 @@ public class MultiDataPathUpgraderTests extends ESTestCase {
      */
     public void testUpgradeRealIndex() throws IOException, URISyntaxException {
         List<Path> indexes = new ArrayList<>();
-        Path dir = getDataPath("/" + OldIndexBackwardsCompatibilityIT.class.getPackage().getName().replace('.', '/')); // the files are in the same pkg as the OldIndexBackwardsCompatibilityTests test
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir, "index-*.zip")) {
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(getBwcIndicesPath(), "index-*.zip")) {
             for (Path path : stream) {
                 indexes.add(path);
             }
diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
index 5a1efd1bfbb..35939d37807 100644
--- a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
+++ b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
@@ -1786,8 +1786,7 @@ public class InternalEngineTests extends ESTestCase {
 
     public void testUpgradeOldIndex() throws IOException {
         List<Path> indexes = new ArrayList<>();
-        Path dir = getDataPath("/" + OldIndexBackwardsCompatibilityIT.class.getPackage().getName().replace('.', '/')); // the files are in the same pkg as the OldIndexBackwardsCompatibilityTests test
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir, "index-*.zip")) {
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(getBwcIndicesPath(), "index-*.zip")) {
             for (Path path : stream) {
                 indexes.add(path);
             }
diff --git a/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java b/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
index 5d153c70524..93bc537299c 100644
--- a/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
+++ b/core/src/test/java/org/elasticsearch/index/translog/TranslogTests.java
@@ -1157,8 +1157,7 @@ public class TranslogTests extends ESTestCase {
 
     public void testUpgradeOldTranslogFiles() throws IOException {
         List<Path> indexes = new ArrayList<>();
-        Path dir = getDataPath("/" + OldIndexBackwardsCompatibilityIT.class.getPackage().getName().replace('.', '/')); // the files are in the same pkg as the OldIndexBackwardsCompatibilityTests test
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir, "index-*.zip")) {
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(getBwcIndicesPath(), "index-*.zip")) {
             for (Path path : stream) {
                 indexes.add(path);
             }
diff --git a/core/src/test/java/org/elasticsearch/test/ESTestCase.java b/core/src/test/java/org/elasticsearch/test/ESTestCase.java
index 05acf01f5cf..2916cbb0d48 100644
--- a/core/src/test/java/org/elasticsearch/test/ESTestCase.java
+++ b/core/src/test/java/org/elasticsearch/test/ESTestCase.java
@@ -488,6 +488,10 @@ public abstract class ESTestCase extends LuceneTestCase {
         }
     }
 
+    public Path getBwcIndicesPath() {
+        return getDataPath("/indices/bwc");
+    }
+
     /** Returns a random number of temporary paths. */
     public String[] tmpPaths() {
         final int numPaths = TestUtil.nextInt(random(), 1, 3);
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.Beta1.zip b/core/src/test/resources/indices/bwc/index-0.90.0.Beta1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.Beta1.zip
rename to core/src/test/resources/indices/bwc/index-0.90.0.Beta1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC1.zip b/core/src/test/resources/indices/bwc/index-0.90.0.RC1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC1.zip
rename to core/src/test/resources/indices/bwc/index-0.90.0.RC1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC2.zip b/core/src/test/resources/indices/bwc/index-0.90.0.RC2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.RC2.zip
rename to core/src/test/resources/indices/bwc/index-0.90.0.RC2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.zip b/core/src/test/resources/indices/bwc/index-0.90.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.0.zip
rename to core/src/test/resources/indices/bwc/index-0.90.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.1.zip b/core/src/test/resources/indices/bwc/index-0.90.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.1.zip
rename to core/src/test/resources/indices/bwc/index-0.90.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.10.zip b/core/src/test/resources/indices/bwc/index-0.90.10.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.10.zip
rename to core/src/test/resources/indices/bwc/index-0.90.10.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.11.zip b/core/src/test/resources/indices/bwc/index-0.90.11.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.11.zip
rename to core/src/test/resources/indices/bwc/index-0.90.11.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.12.zip b/core/src/test/resources/indices/bwc/index-0.90.12.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.12.zip
rename to core/src/test/resources/indices/bwc/index-0.90.12.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.13.zip b/core/src/test/resources/indices/bwc/index-0.90.13.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.13.zip
rename to core/src/test/resources/indices/bwc/index-0.90.13.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.2.zip b/core/src/test/resources/indices/bwc/index-0.90.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.2.zip
rename to core/src/test/resources/indices/bwc/index-0.90.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.3.zip b/core/src/test/resources/indices/bwc/index-0.90.3.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.3.zip
rename to core/src/test/resources/indices/bwc/index-0.90.3.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.4.zip b/core/src/test/resources/indices/bwc/index-0.90.4.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.4.zip
rename to core/src/test/resources/indices/bwc/index-0.90.4.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.5.zip b/core/src/test/resources/indices/bwc/index-0.90.5.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.5.zip
rename to core/src/test/resources/indices/bwc/index-0.90.5.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.6.zip b/core/src/test/resources/indices/bwc/index-0.90.6.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.6.zip
rename to core/src/test/resources/indices/bwc/index-0.90.6.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.7.zip b/core/src/test/resources/indices/bwc/index-0.90.7.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.7.zip
rename to core/src/test/resources/indices/bwc/index-0.90.7.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.8.zip b/core/src/test/resources/indices/bwc/index-0.90.8.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.8.zip
rename to core/src/test/resources/indices/bwc/index-0.90.8.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.9.zip b/core/src/test/resources/indices/bwc/index-0.90.9.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-0.90.9.zip
rename to core/src/test/resources/indices/bwc/index-0.90.9.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta1.zip b/core/src/test/resources/indices/bwc/index-1.0.0.Beta1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta1.zip
rename to core/src/test/resources/indices/bwc/index-1.0.0.Beta1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta2.zip b/core/src/test/resources/indices/bwc/index-1.0.0.Beta2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.Beta2.zip
rename to core/src/test/resources/indices/bwc/index-1.0.0.Beta2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC1.zip b/core/src/test/resources/indices/bwc/index-1.0.0.RC1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC1.zip
rename to core/src/test/resources/indices/bwc/index-1.0.0.RC1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC2.zip b/core/src/test/resources/indices/bwc/index-1.0.0.RC2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.RC2.zip
rename to core/src/test/resources/indices/bwc/index-1.0.0.RC2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.zip b/core/src/test/resources/indices/bwc/index-1.0.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.0.zip
rename to core/src/test/resources/indices/bwc/index-1.0.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.1.zip b/core/src/test/resources/indices/bwc/index-1.0.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.1.zip
rename to core/src/test/resources/indices/bwc/index-1.0.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.2.zip b/core/src/test/resources/indices/bwc/index-1.0.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.2.zip
rename to core/src/test/resources/indices/bwc/index-1.0.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.3.zip b/core/src/test/resources/indices/bwc/index-1.0.3.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.0.3.zip
rename to core/src/test/resources/indices/bwc/index-1.0.3.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.0.zip b/core/src/test/resources/indices/bwc/index-1.1.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.0.zip
rename to core/src/test/resources/indices/bwc/index-1.1.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.1.zip b/core/src/test/resources/indices/bwc/index-1.1.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.1.zip
rename to core/src/test/resources/indices/bwc/index-1.1.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.2.zip b/core/src/test/resources/indices/bwc/index-1.1.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.1.2.zip
rename to core/src/test/resources/indices/bwc/index-1.1.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.0.zip b/core/src/test/resources/indices/bwc/index-1.2.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.0.zip
rename to core/src/test/resources/indices/bwc/index-1.2.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.1.zip b/core/src/test/resources/indices/bwc/index-1.2.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.1.zip
rename to core/src/test/resources/indices/bwc/index-1.2.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.2.zip b/core/src/test/resources/indices/bwc/index-1.2.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.2.zip
rename to core/src/test/resources/indices/bwc/index-1.2.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.3.zip b/core/src/test/resources/indices/bwc/index-1.2.3.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.3.zip
rename to core/src/test/resources/indices/bwc/index-1.2.3.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.4.zip b/core/src/test/resources/indices/bwc/index-1.2.4.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.2.4.zip
rename to core/src/test/resources/indices/bwc/index-1.2.4.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.0.zip b/core/src/test/resources/indices/bwc/index-1.3.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.0.zip
rename to core/src/test/resources/indices/bwc/index-1.3.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.1.zip b/core/src/test/resources/indices/bwc/index-1.3.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.1.zip
rename to core/src/test/resources/indices/bwc/index-1.3.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.2.zip b/core/src/test/resources/indices/bwc/index-1.3.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.2.zip
rename to core/src/test/resources/indices/bwc/index-1.3.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.3.zip b/core/src/test/resources/indices/bwc/index-1.3.3.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.3.zip
rename to core/src/test/resources/indices/bwc/index-1.3.3.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.4.zip b/core/src/test/resources/indices/bwc/index-1.3.4.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.4.zip
rename to core/src/test/resources/indices/bwc/index-1.3.4.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.5.zip b/core/src/test/resources/indices/bwc/index-1.3.5.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.5.zip
rename to core/src/test/resources/indices/bwc/index-1.3.5.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.6.zip b/core/src/test/resources/indices/bwc/index-1.3.6.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.6.zip
rename to core/src/test/resources/indices/bwc/index-1.3.6.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.7.zip b/core/src/test/resources/indices/bwc/index-1.3.7.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.7.zip
rename to core/src/test/resources/indices/bwc/index-1.3.7.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.8.zip b/core/src/test/resources/indices/bwc/index-1.3.8.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.8.zip
rename to core/src/test/resources/indices/bwc/index-1.3.8.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.9.zip b/core/src/test/resources/indices/bwc/index-1.3.9.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.3.9.zip
rename to core/src/test/resources/indices/bwc/index-1.3.9.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.Beta1.zip b/core/src/test/resources/indices/bwc/index-1.4.0.Beta1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.Beta1.zip
rename to core/src/test/resources/indices/bwc/index-1.4.0.Beta1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.zip b/core/src/test/resources/indices/bwc/index-1.4.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.0.zip
rename to core/src/test/resources/indices/bwc/index-1.4.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.1.zip b/core/src/test/resources/indices/bwc/index-1.4.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.1.zip
rename to core/src/test/resources/indices/bwc/index-1.4.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.2.zip b/core/src/test/resources/indices/bwc/index-1.4.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.2.zip
rename to core/src/test/resources/indices/bwc/index-1.4.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.3.zip b/core/src/test/resources/indices/bwc/index-1.4.3.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.3.zip
rename to core/src/test/resources/indices/bwc/index-1.4.3.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.4.zip b/core/src/test/resources/indices/bwc/index-1.4.4.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.4.zip
rename to core/src/test/resources/indices/bwc/index-1.4.4.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.5.zip b/core/src/test/resources/indices/bwc/index-1.4.5.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.4.5.zip
rename to core/src/test/resources/indices/bwc/index-1.4.5.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.0.zip b/core/src/test/resources/indices/bwc/index-1.5.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.0.zip
rename to core/src/test/resources/indices/bwc/index-1.5.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.1.zip b/core/src/test/resources/indices/bwc/index-1.5.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.1.zip
rename to core/src/test/resources/indices/bwc/index-1.5.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.2.zip b/core/src/test/resources/indices/bwc/index-1.5.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.5.2.zip
rename to core/src/test/resources/indices/bwc/index-1.5.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.6.0.zip b/core/src/test/resources/indices/bwc/index-1.6.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.6.0.zip
rename to core/src/test/resources/indices/bwc/index-1.6.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.6.1.zip b/core/src/test/resources/indices/bwc/index-1.6.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.6.1.zip
rename to core/src/test/resources/indices/bwc/index-1.6.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.6.2.zip b/core/src/test/resources/indices/bwc/index-1.6.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.6.2.zip
rename to core/src/test/resources/indices/bwc/index-1.6.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.7.0.zip b/core/src/test/resources/indices/bwc/index-1.7.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.7.0.zip
rename to core/src/test/resources/indices/bwc/index-1.7.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/index-1.7.1.zip b/core/src/test/resources/indices/bwc/index-1.7.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/index-1.7.1.zip
rename to core/src/test/resources/indices/bwc/index-1.7.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.Beta2.zip b/core/src/test/resources/indices/bwc/repo-1.0.0.Beta2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.Beta2.zip
rename to core/src/test/resources/indices/bwc/repo-1.0.0.Beta2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC1.zip b/core/src/test/resources/indices/bwc/repo-1.0.0.RC1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC1.zip
rename to core/src/test/resources/indices/bwc/repo-1.0.0.RC1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC2.zip b/core/src/test/resources/indices/bwc/repo-1.0.0.RC2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.RC2.zip
rename to core/src/test/resources/indices/bwc/repo-1.0.0.RC2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.zip b/core/src/test/resources/indices/bwc/repo-1.0.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.0.zip
rename to core/src/test/resources/indices/bwc/repo-1.0.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.1.zip b/core/src/test/resources/indices/bwc/repo-1.0.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.1.zip
rename to core/src/test/resources/indices/bwc/repo-1.0.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.2.zip b/core/src/test/resources/indices/bwc/repo-1.0.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.2.zip
rename to core/src/test/resources/indices/bwc/repo-1.0.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.3.zip b/core/src/test/resources/indices/bwc/repo-1.0.3.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.0.3.zip
rename to core/src/test/resources/indices/bwc/repo-1.0.3.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.0.zip b/core/src/test/resources/indices/bwc/repo-1.1.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.0.zip
rename to core/src/test/resources/indices/bwc/repo-1.1.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.1.zip b/core/src/test/resources/indices/bwc/repo-1.1.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.1.zip
rename to core/src/test/resources/indices/bwc/repo-1.1.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.2.zip b/core/src/test/resources/indices/bwc/repo-1.1.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.1.2.zip
rename to core/src/test/resources/indices/bwc/repo-1.1.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.0.zip b/core/src/test/resources/indices/bwc/repo-1.2.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.0.zip
rename to core/src/test/resources/indices/bwc/repo-1.2.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.1.zip b/core/src/test/resources/indices/bwc/repo-1.2.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.1.zip
rename to core/src/test/resources/indices/bwc/repo-1.2.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.2.zip b/core/src/test/resources/indices/bwc/repo-1.2.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.2.zip
rename to core/src/test/resources/indices/bwc/repo-1.2.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.3.zip b/core/src/test/resources/indices/bwc/repo-1.2.3.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.3.zip
rename to core/src/test/resources/indices/bwc/repo-1.2.3.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.4.zip b/core/src/test/resources/indices/bwc/repo-1.2.4.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.2.4.zip
rename to core/src/test/resources/indices/bwc/repo-1.2.4.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.0.zip b/core/src/test/resources/indices/bwc/repo-1.3.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.0.zip
rename to core/src/test/resources/indices/bwc/repo-1.3.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.1.zip b/core/src/test/resources/indices/bwc/repo-1.3.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.1.zip
rename to core/src/test/resources/indices/bwc/repo-1.3.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.2.zip b/core/src/test/resources/indices/bwc/repo-1.3.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.2.zip
rename to core/src/test/resources/indices/bwc/repo-1.3.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.3.zip b/core/src/test/resources/indices/bwc/repo-1.3.3.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.3.zip
rename to core/src/test/resources/indices/bwc/repo-1.3.3.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.4.zip b/core/src/test/resources/indices/bwc/repo-1.3.4.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.4.zip
rename to core/src/test/resources/indices/bwc/repo-1.3.4.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.5.zip b/core/src/test/resources/indices/bwc/repo-1.3.5.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.5.zip
rename to core/src/test/resources/indices/bwc/repo-1.3.5.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.6.zip b/core/src/test/resources/indices/bwc/repo-1.3.6.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.6.zip
rename to core/src/test/resources/indices/bwc/repo-1.3.6.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.7.zip b/core/src/test/resources/indices/bwc/repo-1.3.7.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.7.zip
rename to core/src/test/resources/indices/bwc/repo-1.3.7.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.8.zip b/core/src/test/resources/indices/bwc/repo-1.3.8.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.8.zip
rename to core/src/test/resources/indices/bwc/repo-1.3.8.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.9.zip b/core/src/test/resources/indices/bwc/repo-1.3.9.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.3.9.zip
rename to core/src/test/resources/indices/bwc/repo-1.3.9.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.Beta1.zip b/core/src/test/resources/indices/bwc/repo-1.4.0.Beta1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.Beta1.zip
rename to core/src/test/resources/indices/bwc/repo-1.4.0.Beta1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.zip b/core/src/test/resources/indices/bwc/repo-1.4.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.0.zip
rename to core/src/test/resources/indices/bwc/repo-1.4.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.1.zip b/core/src/test/resources/indices/bwc/repo-1.4.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.1.zip
rename to core/src/test/resources/indices/bwc/repo-1.4.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.2.zip b/core/src/test/resources/indices/bwc/repo-1.4.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.2.zip
rename to core/src/test/resources/indices/bwc/repo-1.4.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.3.zip b/core/src/test/resources/indices/bwc/repo-1.4.3.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.3.zip
rename to core/src/test/resources/indices/bwc/repo-1.4.3.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.4.zip b/core/src/test/resources/indices/bwc/repo-1.4.4.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.4.zip
rename to core/src/test/resources/indices/bwc/repo-1.4.4.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.5.zip b/core/src/test/resources/indices/bwc/repo-1.4.5.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.4.5.zip
rename to core/src/test/resources/indices/bwc/repo-1.4.5.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.0.zip b/core/src/test/resources/indices/bwc/repo-1.5.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.0.zip
rename to core/src/test/resources/indices/bwc/repo-1.5.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.1.zip b/core/src/test/resources/indices/bwc/repo-1.5.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.1.zip
rename to core/src/test/resources/indices/bwc/repo-1.5.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.2.zip b/core/src/test/resources/indices/bwc/repo-1.5.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.5.2.zip
rename to core/src/test/resources/indices/bwc/repo-1.5.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.6.0.zip b/core/src/test/resources/indices/bwc/repo-1.6.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.6.0.zip
rename to core/src/test/resources/indices/bwc/repo-1.6.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.6.1.zip b/core/src/test/resources/indices/bwc/repo-1.6.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.6.1.zip
rename to core/src/test/resources/indices/bwc/repo-1.6.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.6.2.zip b/core/src/test/resources/indices/bwc/repo-1.6.2.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.6.2.zip
rename to core/src/test/resources/indices/bwc/repo-1.6.2.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.7.0.zip b/core/src/test/resources/indices/bwc/repo-1.7.0.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.7.0.zip
rename to core/src/test/resources/indices/bwc/repo-1.7.0.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/repo-1.7.1.zip b/core/src/test/resources/indices/bwc/repo-1.7.1.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/repo-1.7.1.zip
rename to core/src/test/resources/indices/bwc/repo-1.7.1.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/unsupported-0.20.6.zip b/core/src/test/resources/indices/bwc/unsupported-0.20.6.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/unsupported-0.20.6.zip
rename to core/src/test/resources/indices/bwc/unsupported-0.20.6.zip
diff --git a/core/src/test/resources/org/elasticsearch/bwcompat/unsupportedrepo-0.20.6.zip b/core/src/test/resources/indices/bwc/unsupportedrepo-0.20.6.zip
similarity index 100%
rename from core/src/test/resources/org/elasticsearch/bwcompat/unsupportedrepo-0.20.6.zip
rename to core/src/test/resources/indices/bwc/unsupportedrepo-0.20.6.zip
diff --git a/dev-tools/create_bwc_index.py b/dev-tools/create_bwc_index.py
index 22ba7f78ce5..d780b2af5e2 100644
--- a/dev-tools/create_bwc_index.py
+++ b/dev-tools/create_bwc_index.py
@@ -333,7 +333,7 @@ def parse_config():
                         help='Recreate all existing backwards compatibility indexes')
   parser.add_argument('--releases-dir', '-d', default='backwards', metavar='DIR',
                       help='The directory containing elasticsearch releases')
-  parser.add_argument('--output-dir', '-o', default='core/src/test/resources/org/elasticsearch/bwcompat',
+  parser.add_argument('--output-dir', '-o', default='core/src/test/resources/indices/bwc',
                       help='The directory to write the zipped index into')
   parser.add_argument('--tcp-port', default=DEFAULT_TRANSPORT_TCP_PORT, type=int,
                       help='The port to use as the minimum port for TCP communication')
diff --git a/dev-tools/create_bwc_repo_with_ancient_indices.py b/dev-tools/create_bwc_repo_with_ancient_indices.py
index 27d166d2b6a..5c6b8222b02 100644
--- a/dev-tools/create_bwc_repo_with_ancient_indices.py
+++ b/dev-tools/create_bwc_repo_with_ancient_indices.py
@@ -63,7 +63,7 @@ def main():
     create_bwc_index.shutdown_node(node)
     print('%s server output:\n%s' % (second_version, node.stdout.read().decode('utf-8')))
 
-    create_bwc_index.compress(tmp_dir, "src/test/resources/org/elasticsearch/bwcompat", 'unsupportedrepo-%s.zip' % first_version, 'repo')
+    create_bwc_index.compress(tmp_dir, "src/test/resources/indices/bwc", 'unsupportedrepo-%s.zip' % first_version, 'repo')
 
     node = None
   finally: