diff --git a/dd-java-agent/instrumentation/elasticsearch-rest-5/elasticsearch-rest-5.gradle b/dd-java-agent/instrumentation/elasticsearch-rest-5/elasticsearch-rest-5.gradle
index eb97dca2aa..99bc4e5525 100644
--- a/dd-java-agent/instrumentation/elasticsearch-rest-5/elasticsearch-rest-5.gradle
+++ b/dd-java-agent/instrumentation/elasticsearch-rest-5/elasticsearch-rest-5.gradle
@@ -15,6 +15,8 @@
 
 apply from: "${rootDir}/gradle/java.gradle"
 
+testJava8Minimum += '**/*Test.class'
+
 apply plugin: 'org.unbroken-dome.test-sets'
 
 testSets {
diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-2/elasticsearch-transport-2.gradle b/dd-java-agent/instrumentation/elasticsearch-transport-2/elasticsearch-transport-2.gradle
index 22a7074c6e..8371b6d5bb 100644
--- a/dd-java-agent/instrumentation/elasticsearch-transport-2/elasticsearch-transport-2.gradle
+++ b/dd-java-agent/instrumentation/elasticsearch-transport-2/elasticsearch-transport-2.gradle
@@ -11,6 +11,8 @@ versionScan {
 
 apply from: "${rootDir}/gradle/java.gradle"
 
+testJava8Only += '**/*Test.class'
+
 apply plugin: 'org.unbroken-dome.test-sets'
 
 testSets {
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 0bd09cf7b5..b41a5568b9 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
@@ -14,6 +14,8 @@ versionScan {
 
 apply from: "${rootDir}/gradle/java.gradle"
 
+testJava8Minimum += '**/*Test.class'
+
 apply plugin: 'org.unbroken-dome.test-sets'
 
 testSets {
diff --git a/dd-java-agent/instrumentation/elasticsearch-transport-6/elasticsearch-transport-6.gradle b/dd-java-agent/instrumentation/elasticsearch-transport-6/elasticsearch-transport-6.gradle
index 61e36180f7..982d3a42e8 100644
--- a/dd-java-agent/instrumentation/elasticsearch-transport-6/elasticsearch-transport-6.gradle
+++ b/dd-java-agent/instrumentation/elasticsearch-transport-6/elasticsearch-transport-6.gradle
@@ -14,6 +14,8 @@ versionScan {
 
 apply from: "${rootDir}/gradle/java.gradle"
 
+testJava8Minimum += '**/*Test.class'
+
 apply plugin: 'org.unbroken-dome.test-sets'
 
 testSets {