diff --git a/dd-java-agent/instrumentation/java-concurrent/java-concurrent.gradle b/dd-java-agent/instrumentation/java-concurrent/java-concurrent.gradle
index 5b12ac9edb..255ba26aa0 100644
--- a/dd-java-agent/instrumentation/java-concurrent/java-concurrent.gradle
+++ b/dd-java-agent/instrumentation/java-concurrent/java-concurrent.gradle
@@ -12,6 +12,11 @@ compileSlickTestGroovy {
   dependsOn compileSlickTestScala
 }
 
+// Work around for https://github.com/gradle/gradle/issues/6735. Remove on gradle >4.10.1
+compileSlickTestScala {
+  analysisFiles.setFrom(files())
+}
+
 dependencies {
   compile project(':dd-trace-api')
   compile project(':dd-java-agent:agent-tooling')
diff --git a/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle b/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle
index 1014bab501..c050b33e13 100644
--- a/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle
+++ b/dd-java-agent/instrumentation/play-2.4/play-2.4.gradle
@@ -20,6 +20,11 @@ muzzle {
   }
 }
 
+// Work around for https://github.com/gradle/gradle/issues/6735. Remove on gradle >4.10.1
+compileLatestDepTestScala {
+  analysisFiles.setFrom(files())
+}
+
 dependencies {
   compileOnly group: 'com.typesafe.play', name: 'play_2.11', version: '2.4.0'
 
diff --git a/dd-trace-java.gradle b/dd-trace-java.gradle
index 37c4cd9a23..c4fb321441 100644
--- a/dd-trace-java.gradle
+++ b/dd-trace-java.gradle
@@ -53,7 +53,7 @@ buildScan {
   }
 }
 
-ext.gradleWrapperVersion = '4.9'
+ext.gradleWrapperVersion = '4.10.1'
 task wrapper(type: Wrapper) {
   gradleVersion = gradleWrapperVersion
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 758de960ec..0d4a951687 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a95009c3b9..5c1b6c95b8 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/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists