diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle b/dd-java-agent/instrumentation/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle
index 4dc955f98e..610b749b9f 100644
--- a/dd-java-agent/instrumentation/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle
+++ b/dd-java-agent/instrumentation/elasticsearch-transport-5.3/elasticsearch-transport-5.3.gradle
@@ -17,6 +17,14 @@ apply from: "${rootDir}/gradle/java.gradle"
 
 testJava8Minimum += '**/*Test.class'
 
+apply plugin: 'org.unbroken-dome.test-sets'
+
+testSets {
+  latestDepTest {
+    dirName = 'test'
+  }
+}
+
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '5.3.0'
 
@@ -34,4 +42,7 @@ dependencies {
 
   testCompile group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.3.0'
   testCompile group: 'org.elasticsearch.client', name: 'transport', version: '5.3.0'
+
+  latestDepTestCompile group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.+'
+  latestDepTestCompile group: 'org.elasticsearch.client', name: 'transport', version: '5.+'
 }
diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-5/elasticsearch-transport-5.gradle b/dd-java-agent/instrumentation/elasticsearch-transport-5/elasticsearch-transport-5.gradle
index 19ceee6764..18d74a5587 100644
--- a/dd-java-agent/instrumentation/elasticsearch-transport-5/elasticsearch-transport-5.gradle
+++ b/dd-java-agent/instrumentation/elasticsearch-transport-5/elasticsearch-transport-5.gradle
@@ -50,6 +50,6 @@ dependencies {
   testCompile group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.0.0'
   testCompile group: 'org.elasticsearch.client', name: 'transport', version: '5.0.0'
 
-  latestDepTestCompile group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '+'
-  latestDepTestCompile group: 'org.elasticsearch.client', name: 'transport', version: '+'
+  latestDepTestCompile group: 'org.elasticsearch.plugin', name: 'transport-netty3-client', version: '5.2.+'
+  latestDepTestCompile group: 'org.elasticsearch.client', name: 'transport', version: '5.2.+'
 }