diff --git a/.circleci/config.yml b/.circleci/config.yml
index 25497f8f66..441e24103a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -117,7 +117,7 @@ jobs:
     environment:
       - JAVA8_HOME: /usr/lib/jvm/java-8-openjdk-amd64
       # Tests under Java8 should have complete coverage.
-      - TEST_TASK: test latestDepTest jacocoTestCoverageVerification jacocoTestReport
+      - TEST_TASK: test latestDepTest jacocoTestReport jacocoTestCoverageVerification
 
   test_9:
     <<: *default_test_job
diff --git a/dd-java-agent/agent-bootstrap/agent-bootstrap.gradle b/dd-java-agent/agent-bootstrap/agent-bootstrap.gradle
index 154c6d8eeb..27d932ee61 100644
--- a/dd-java-agent/agent-bootstrap/agent-bootstrap.gradle
+++ b/dd-java-agent/agent-bootstrap/agent-bootstrap.gradle
@@ -5,9 +5,7 @@ plugins {
 
 apply from: "${rootDir}/gradle/java.gradle"
 
-whitelistedInstructionClasses += whitelistedBranchClasses += [
-  'datadog.trace.bootstrap.*'
-]
+excludedClassesConverage += [ 'datadog.trace.bootstrap.*'  ]
 
 dependencies {
   compile project(':dd-trace-api')
diff --git a/dd-java-agent/agent-tooling/agent-tooling.gradle b/dd-java-agent/agent-tooling/agent-tooling.gradle
index 47f34b80d8..d84a956fdf 100644
--- a/dd-java-agent/agent-tooling/agent-tooling.gradle
+++ b/dd-java-agent/agent-tooling/agent-tooling.gradle
@@ -1,8 +1,6 @@
 apply from: "${rootDir}/gradle/java.gradle"
 
-whitelistedInstructionClasses += whitelistedBranchClasses += [
-  'datadog.trace.agent.tooling.*'
-]
+excludedClassesConverage += [ 'datadog.trace.agent.tooling.*' ]
 
 configurations {
   // classpath used by the instrumentation muzzle plugin
diff --git a/dd-java-agent/instrumentation/instrumentation.gradle b/dd-java-agent/instrumentation/instrumentation.gradle
index 351dbf1b79..96d379b9de 100644
--- a/dd-java-agent/instrumentation/instrumentation.gradle
+++ b/dd-java-agent/instrumentation/instrumentation.gradle
@@ -39,9 +39,7 @@ subprojects { subProj ->
   }
 }
 
-whitelistedInstructionClasses += whitelistedBranchClasses += [
-  'datadog.trace.instrumentation.*'
-]
+excludedClassesConverage += [ 'datadog.trace.instrumentation.*' ]
 
 dependencies {
   compile(project(':dd-java-agent:agent-tooling')) {
diff --git a/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle b/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle
index 0718cfbd7b..fbcbd36dd5 100644
--- a/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle
+++ b/dd-java-agent/instrumentation/java-concurrent/akka-testing/akka-testing.gradle
@@ -1,9 +1,7 @@
 apply from: "${rootDir}/gradle/java.gradle"
 apply plugin: 'scala'
 
-whitelistedInstructionClasses += whitelistedBranchClasses += [
-  '*'
-]
+excludedClassesConverage += [ '*' ]
 
 dependencies {
   compile project(':dd-trace-api')
diff --git a/dd-java-agent/testing/testing.gradle b/dd-java-agent/testing/testing.gradle
index e357656a4a..9ba4a359dc 100644
--- a/dd-java-agent/testing/testing.gradle
+++ b/dd-java-agent/testing/testing.gradle
@@ -2,9 +2,9 @@ apply from: "${rootDir}/gradle/java.gradle"
 
 minimumBranchCoverage = 0.5
 minimumInstructionCoverage = 0.6
-whitelistedInstructionClasses += whitelistedBranchClasses += [
+excludedClassesConverage += [
   'datadog.trace.agent.test.*Assert',
-  'datadog.trace.agent.test.AgentTestRunner.1',
+  'datadog.trace.agent.test.AgentTestRunner.ErrorCountingListener',
   'datadog.trace.agent.test.TestUtils'
 ]
 
diff --git a/dd-trace-ot/dd-trace-ot.gradle b/dd-trace-ot/dd-trace-ot.gradle
index e418a10991..174ac7fef2 100644
--- a/dd-trace-ot/dd-trace-ot.gradle
+++ b/dd-trace-ot/dd-trace-ot.gradle
@@ -9,7 +9,7 @@ apply from: "${rootDir}/gradle/publish.gradle"
 
 minimumBranchCoverage = 0.5
 minimumInstructionCoverage = 0.6
-whitelistedInstructionClasses += whitelistedBranchClasses += [
+excludedClassesConverage += [
   'datadog.trace.common.writer.ListWriter',
   'datadog.trace.common.sampling.PrioritySampling'
 ]
diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle
index fc3cc6b012..fa1148209e 100644
--- a/gradle/jacoco.gradle
+++ b/gradle/jacoco.gradle
@@ -13,16 +13,22 @@ jacocoTestReport {
   }
 }
 
-if (project.parent.hasProperty("whitelistedBranchClasses")) {
-  project.ext.whitelistedBranchClasses = parent.whitelistedBranchClasses
+if (project.parent.hasProperty("excludedClassesConverage")) {
+  project.ext.excludedClassesConverage = parent.excludedClassesConverage
 } else {
-  project.ext.whitelistedBranchClasses = []
+  project.ext.excludedClassesConverage = []
 }
 
-if (project.parent.hasProperty("whitelistedInstructionClasses")) {
-  project.ext.whitelistedInstructionClasses = parent.whitelistedInstructionClasses
+if (project.parent.hasProperty("excludedClassesBranchConverage")) {
+  project.ext.excludedClassesBranchConverage = parent.excludedClassesBranchConverage
 } else {
-  project.ext.whitelistedInstructionClasses = []
+  project.ext.excludedClassesBranchConverage = []
+}
+
+if (project.parent.hasProperty("excludedClassesInstructionConverage")) {
+  project.ext.excludedClassesInstructionConverage = parent.excludedClassesInstructionConverage
+} else {
+  project.ext.excludedClassesInstructionConverage = []
 }
 
 // defaults can be overridden per project:
@@ -34,7 +40,7 @@ afterEvaluate {
     violationRules {
       rule {
         element = 'CLASS'
-        excludes = project.whitelistedBranchClasses
+        excludes = project.excludedClassesBranchConverage + project.excludedClassesConverage
         limit {
           counter = 'BRANCH'
           minimum = project.minimumBranchCoverage
@@ -43,7 +49,7 @@ afterEvaluate {
 
       rule {
         element = 'CLASS'
-        excludes = project.whitelistedInstructionClasses
+        excludes = project.excludedClassesInstructionConverage + project.excludedClassesConverage
         limit {
           counter = 'INSTRUCTION'
           minimum = project.minimumInstructionCoverage