diff --git a/.travis.yml b/.travis.yml
index 1018354c7..98e82b35f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,8 @@ stages:
     if: (branch = master AND type = push) OR (tag IS present)
 jobs:
   include:
-    - env: SBT_COURSIER=1
+    - env: SBT_COURSIER=1 SBT_COURSIER_TEST_GROUP=1
+    - env: SBT_COURSIER=1 SBT_COURSIER_TEST_GROUP=2
     - env: SBT_SHADING=1
     - env: SBT_PGP_COURSIER=1
     - stage: release
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/aar-packaging/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/aar-packaging/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/classifiers/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/classifiers/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/project/helper.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/helper.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/project/helper.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/helper.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/clean/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/clean/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/project/src/main/scala/sbt/MyPlugin.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/src/main/scala/App.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/src/main/scala/App.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/src/main/scala/App.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/src/main/scala/App.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/config-deps-resolution/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/config-deps-resolution/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/credentials b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/credentials
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/credentials
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/credentials
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-from-file/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-from-file/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials-sbt/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials-sbt/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/credentials/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/credentials/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/whatDependsOnResult.log b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/whatDependsOnResult.log
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/dependency-graph/whatDependsOnResult.log
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/dependency-graph/whatDependsOnResult.log
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/coursier b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/coursier
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/coursier
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/coursier
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/Dummy.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/Dummy.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/Dummy.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/Dummy.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/exclude-dependencies/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/exclude-dependencies/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/a/src/main/scala/A.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/a/src/main/scala/A.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/a/src/main/scala/A.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/a/src/main/scala/A.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/b/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/b/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/b/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/b/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/fallback-dependencies-inter-project/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/fallback-dependencies-inter-project/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-no-head/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-no-head/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from-wrong-url/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from-wrong-url/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/from/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/from/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/from/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/hadoop-yarn-server-resourcemanager/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/hadoop-yarn-server-resourcemanager/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/in-memory-cache/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/in-memory-cache/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/a/src/main/scala/A.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/a/src/main/scala/A.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/a/src/main/scala/A.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/a/src/main/scala/A.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/b/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/b/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/b/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/b/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project-resolvers/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project-resolvers/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/a/src/main/scala/A.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/a/src/main/scala/A.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/a/src/main/scala/A.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/a/src/main/scala/A.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/b/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/b/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/b/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/b/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/inter-project/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/inter-project/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/logger/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/logger/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/logger/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/logger/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/logger/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/logger/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-1/logger/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/maven-compatible/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/maven-compatible/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/missing-credentials/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/missing-credentials/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/neo-sbt-scalafmt/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/neo-sbt-scalafmt/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/no-pom-artifact/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/no-pom-artifact/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/output b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/output
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/output
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/output
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/profiles/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/profiles/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/README b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/README
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/README
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/README
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/pubring.pgp b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/pubring.pgp
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/pubring.pgp
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/pubring.pgp
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/secring.pgp b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/secring.pgp
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/secring.pgp
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/secring.pgp
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/src/main/scala/Foo.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/src/main/scala/Foo.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/src/main/scala/Foo.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/src/main/scala/Foo.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-signed/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-signed/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/publish-local-sources-javadoc-conf/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/publish-local-sources-javadoc-conf/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/project/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/project/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/project/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/sbt-assembly/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/sbt-assembly/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-jars/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-jars/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-js/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-js/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/scala-sources-javadoc-jars/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/scala-sources-javadoc-jars/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/simple/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/simple/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/a/src/main/scala/a/A.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/a/src/main/scala/a/A.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/a/src/main/scala/a/A.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/a/src/main/scala/a/A.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/a/src/test/scala/a/ATest.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/a/src/test/scala/a/ATest.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/a/src/test/scala/a/ATest.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/a/src/test/scala/a/ATest.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/b/src/main/scala/b/B.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/b/src/main/scala/b/B.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/b/src/main/scala/b/B.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/b/src/main/scala/b/B.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/b/src/test/scala/b/BTest.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/b/src/test/scala/b/BTest.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/b/src/test/scala/b/BTest.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/b/src/test/scala/b/BTest.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/tests-classifier/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/tests-classifier/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-force-version-stdlib/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-force-version-stdlib/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/src/main/scala/Foo.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/src/main/scala/Foo.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/src/main/scala/Foo.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/src/main/scala/Foo.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel-with-dependencies/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel-with-dependencies/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/typelevel/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/typelevel/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/src/main/scala/Foo.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/src/main/scala/Foo.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/src/main/scala/Foo.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/src/main/scala/Foo.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/unidoc/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/unidoc/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/update-sbt-classifiers/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/update-sbt-classifiers/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/update-sbt-classifiers/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/update-sbt-classifiers/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/update-sbt-classifiers/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/update-sbt-classifiers/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/update-sbt-classifiers/test
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/build.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/build.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/build.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/build.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/project/plugins.sbt b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/project/plugins.sbt
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/project/plugins.sbt
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/src/main/scala/Main.scala b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/src/main/scala/Main.scala
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/src/main/scala/Main.scala
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/src/main/scala/Main.scala
diff --git a/modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/test b/modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/test
similarity index 100%
rename from modules/sbt-coursier/src/sbt-test/sbt-coursier/zookeeper/test
rename to modules/sbt-coursier/src/sbt-test/sbt-coursier-group-2/zookeeper/test
diff --git a/scripts/travis.sh b/scripts/travis.sh
index e29a63a7d..4d73ff70e 100755
--- a/scripts/travis.sh
+++ b/scripts/travis.sh
@@ -16,7 +16,7 @@ sbtShading() {
 }
 
 runSbtCoursierTests() {
-  ./metadata/scripts/with-test-repo.sh sbt ++$TRAVIS_SCALA_VERSION sbt-coursier/test sbt-coursier/scripted
+  ./metadata/scripts/with-test-repo.sh sbt ++$TRAVIS_SCALA_VERSION sbt-coursier/test "sbt-coursier/scripted sbt-coursier-group-$SBT_COURSIER_TEST_GROUP/*"
 }
 
 runSbtShadingTests() {