diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution/a/A.java b/sbt/src/sbt-test/dependency-management/cached-resolution-basic/a/A.java
similarity index 100%
rename from sbt/src/sbt-test/dependency-management/cached-resolution/a/A.java
rename to sbt/src/sbt-test/dependency-management/cached-resolution-basic/a/A.java
diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution/c/C.java b/sbt/src/sbt-test/dependency-management/cached-resolution-basic/c/C.java
similarity index 100%
rename from sbt/src/sbt-test/dependency-management/cached-resolution/c/C.java
rename to sbt/src/sbt-test/dependency-management/cached-resolution-basic/c/C.java
diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution/multi.sbt b/sbt/src/sbt-test/dependency-management/cached-resolution-basic/multi.sbt
similarity index 100%
rename from sbt/src/sbt-test/dependency-management/cached-resolution/multi.sbt
rename to sbt/src/sbt-test/dependency-management/cached-resolution-basic/multi.sbt
diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution/test b/sbt/src/sbt-test/dependency-management/cached-resolution-basic/test
similarity index 100%
rename from sbt/src/sbt-test/dependency-management/cached-resolution/test
rename to sbt/src/sbt-test/dependency-management/cached-resolution-basic/test
diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution3/multi.sbt b/sbt/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt
similarity index 100%
rename from sbt/src/sbt-test/dependency-management/cached-resolution3/multi.sbt
rename to sbt/src/sbt-test/dependency-management/cached-resolution-exclude/multi.sbt
diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution3/test b/sbt/src/sbt-test/dependency-management/cached-resolution-exclude/test
similarity index 100%
rename from sbt/src/sbt-test/dependency-management/cached-resolution3/test
rename to sbt/src/sbt-test/dependency-management/cached-resolution-exclude/test
diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution2/multi.sbt b/sbt/src/sbt-test/dependency-management/cached-resolution-force/multi.sbt
similarity index 100%
rename from sbt/src/sbt-test/dependency-management/cached-resolution2/multi.sbt
rename to sbt/src/sbt-test/dependency-management/cached-resolution-force/multi.sbt
diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution2/test b/sbt/src/sbt-test/dependency-management/cached-resolution-force/test
similarity index 100%
rename from sbt/src/sbt-test/dependency-management/cached-resolution2/test
rename to sbt/src/sbt-test/dependency-management/cached-resolution-force/test
diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution4/multi.sbt b/sbt/src/sbt-test/dependency-management/cached-resolution-overrides/multi.sbt
similarity index 100%
rename from sbt/src/sbt-test/dependency-management/cached-resolution4/multi.sbt
rename to sbt/src/sbt-test/dependency-management/cached-resolution-overrides/multi.sbt
diff --git a/sbt/src/sbt-test/dependency-management/cached-resolution4/test b/sbt/src/sbt-test/dependency-management/cached-resolution-overrides/test
similarity index 100%
rename from sbt/src/sbt-test/dependency-management/cached-resolution4/test
rename to sbt/src/sbt-test/dependency-management/cached-resolution-overrides/test