diff --git a/build.gradle b/build.gradle
index a229a5ab9..1bc7d57a2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -146,7 +146,7 @@ dependencies {
     codeMetrics group: 'org.terasology.config', name: 'codemetrics', version: '1.4.0', ext: 'zip'
 }
 
-configurations.named("testRuntimeClasspath") {
+configurations.matching({ it =~ ~/test(Runtime|Compile|Implementation)Classpath/ }).all {
     gradlegoo.prefers(getResolutionStrategy(), "logging", "jcl-api-capability", "jcl-over-slf4j", "jcl should prefer slf4j when available")
     gradlegoo.prefers(getResolutionStrategy(), "logging", "slf4j-impl-capability", "spf4j-slf4j-test", "tests use slf4j-test")
 
@@ -156,13 +156,6 @@ configurations.named("testRuntimeClasspath") {
     exclude group: "org.hamcrest", module: "hamcrest-library"
 }
 
-configurations.named("testCompileClasspath") {
-    gradlegoo.prefers(getResolutionStrategy(), "logging", "jcl-api-capability", "jcl-over-slf4j", "jcl should prefer slf4j when available")
-    gradlegoo.prefers(getResolutionStrategy(), "logging", "slf4j-impl-capability", "spf4j-slf4j-test", "tests use slf4j-test")
-
-    exclude group: "org.hamcrest", module: "hamcrest-core"
-    exclude group: "org.hamcrest", module: "hamcrest-library"
-}
 
 // Set the expected module Java level (can use a higher Java to run, but should not use features from a higher Java)
 sourceCompatibility = 1.11