diff --git a/gradle/publish-jar.gradle b/gradle/publish-jar.gradle
index 9a996808f..e57bab66f 100644
--- a/gradle/publish-jar.gradle
+++ b/gradle/publish-jar.gradle
@@ -48,3 +48,8 @@ publishing {
         }
     }
 }
+
+// Turning off module metadata so that all consumers just use regular POMs
+tasks.withType(GenerateModuleMetadata) {
+    enabled = false
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a36ac3057..5c69cc541 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-6.0-20190828220044+0000-bin.zip
+distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-6.0-20190904072820+0000-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/tracing-api/build.gradle b/tracing-api/build.gradle
index e9840be60..9b5018ebf 100644
--- a/tracing-api/build.gradle
+++ b/tracing-api/build.gradle
@@ -1,10 +1,10 @@
 apply from: "$rootDir/gradle/publish-jar.gradle"
 
 dependencies {
-    testCompile "junit:junit"
-    testCompile "org.assertj:assertj-core"
-    testCompile "org.mockito:mockito-core"
-    testCompile "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
+    testImplementation "junit:junit"
+    testImplementation "org.assertj:assertj-core"
+    testImplementation "org.mockito:mockito-core"
+    testImplementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml"
 
     annotationProcessor "org.immutables:value"
     compileOnly "org.immutables:value::annotations"
diff --git a/tracing-jaxrs/build.gradle b/tracing-jaxrs/build.gradle
index 3c5b2db18..0f6a20164 100644
--- a/tracing-jaxrs/build.gradle
+++ b/tracing-jaxrs/build.gradle
@@ -22,11 +22,11 @@ dependencies {
     compile project(":tracing")
     compile "javax.ws.rs:javax.ws.rs-api"
 
-    testCompile "ch.qos.logback:logback-classic"
-    testCompile "junit:junit"
-    testCompile "org.assertj:assertj-core"
-    testCompile "org.jmock:jmock"
-    testCompile "org.mockito:mockito-core"
+    testImplementation "ch.qos.logback:logback-classic"
+    testImplementation "junit:junit"
+    testImplementation "org.assertj:assertj-core"
+    testImplementation "org.jmock:jmock"
+    testImplementation "org.mockito:mockito-core"
 
     annotationProcessor "org.immutables:value"
     compileOnly "org.immutables:value::annotations"
diff --git a/tracing-jersey/build.gradle b/tracing-jersey/build.gradle
index edd3203fe..330360d4b 100644
--- a/tracing-jersey/build.gradle
+++ b/tracing-jersey/build.gradle
@@ -24,10 +24,10 @@ dependencies {
     implementation 'javax.ws.rs:javax.ws.rs-api'
     implementation project(':tracing-api')
 
-    testCompile "io.dropwizard:dropwizard-testing"
-    testCompile "junit:junit"
-    testCompile "org.hamcrest:hamcrest-all"
-    testCompile "org.mockito:mockito-core"
+    testImplementation "io.dropwizard:dropwizard-testing"
+    testImplementation "junit:junit"
+    testImplementation "org.hamcrest:hamcrest-all"
+    testImplementation "org.mockito:mockito-core"
 
     compileOnly "org.immutables:value::annotations"
     testCompileOnly "org.immutables:value::annotations"
diff --git a/tracing-okhttp3/build.gradle b/tracing-okhttp3/build.gradle
index 7170e4c69..d0f12ff9e 100644
--- a/tracing-okhttp3/build.gradle
+++ b/tracing-okhttp3/build.gradle
@@ -22,9 +22,9 @@ dependencies {
 
     implementation project(':tracing-api')
 
-    testCompile "junit:junit"
-    testCompile "org.assertj:assertj-core"
-    testCompile "org.mockito:mockito-core"
+    testImplementation "junit:junit"
+    testImplementation "org.assertj:assertj-core"
+    testImplementation "org.mockito:mockito-core"
 
     compileOnly "org.immutables:value::annotations"
     testCompileOnly "org.immutables:value::annotations"
diff --git a/tracing/build.gradle b/tracing/build.gradle
index 52921037f..090fc0493 100644
--- a/tracing/build.gradle
+++ b/tracing/build.gradle
@@ -32,13 +32,13 @@ dependencies {
     implementation 'com.google.code.findbugs:jsr305'
     implementation 'com.google.errorprone:error_prone_annotations'
 
-    testCompile "ch.qos.logback:logback-classic"
-    testCompile "com.palantir.safe-logging:preconditions-assertj"
-    testCompile "junit:junit"
-    testCompile "org.assertj:assertj-core"
-    testCompile "org.jmock:jmock"
-    testCompile "org.mockito:mockito-core"
-    testCompile "io.zipkin.java:zipkin"
+    testImplementation "ch.qos.logback:logback-classic"
+    testImplementation "com.palantir.safe-logging:preconditions-assertj"
+    testImplementation "junit:junit"
+    testImplementation "org.assertj:assertj-core"
+    testImplementation "org.jmock:jmock"
+    testImplementation "org.mockito:mockito-core"
+    testImplementation "io.zipkin.java:zipkin"
 
     annotationProcessor "org.immutables:value"
     compileOnly "org.immutables:value::annotations"