diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java
index 904f3b08f62..690d0259659 100644
--- a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java
+++ b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixCommandInstrumentation.java
@@ -27,11 +27,6 @@ public HystrixCommandInstrumentation() {
     super("hystrix");
   }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
   @Override
   public AgentBuilder apply(final AgentBuilder agentBuilder) {
     return agentBuilder
diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java
index 290bc418f1c..b2d6c3ea94a 100644
--- a/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java
+++ b/dd-java-agent/instrumentation/hystrix-1.4/src/main/java/datadog/trace/instrumentation/hystrix/HystrixThreadPoolInstrumentation.java
@@ -22,11 +22,6 @@ public HystrixThreadPoolInstrumentation() {
     super("hystrix");
   }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
   @Override
   public AgentBuilder apply(final AgentBuilder agentBuilder) {
     return agentBuilder
diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy b/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy
index a0d992b3b50..402b2fab704 100644
--- a/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy
+++ b/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixTest.groovy
@@ -10,11 +10,10 @@ import static datadog.trace.agent.test.ListWriterAssert.assertTraces
 import static datadog.trace.agent.test.TestUtils.runUnderTrace
 
 class HystrixTest extends AgentTestRunner {
-  static {
-    System.setProperty("dd.integration.hystrix.enabled", "true")
-    // Uncomment for debugging:
-//    System.setProperty("hystrix.command.default.execution.timeout.enabled", "false")
-  }
+  // Uncomment for debugging:
+  // static {
+  //  System.setProperty("hystrix.command.default.execution.timeout.enabled", "false")
+  // }
 
   def "test command #action"() {
     setup:
diff --git a/dd-java-agent/instrumentation/jax-rs-client/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java b/dd-java-agent/instrumentation/jax-rs-client/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java
index 3fd04d7708a..4e48c7fef02 100644
--- a/dd-java-agent/instrumentation/jax-rs-client/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/jax-rs-client/src/main/java/datadog/trace/instrumentation/jaxrs/JaxRsClientInstrumentation.java
@@ -21,11 +21,6 @@ public JaxRsClientInstrumentation() {
     super("jax-rs", "jaxrs", "jax-rs-client");
   }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
   @Override
   protected AgentBuilder apply(final AgentBuilder agentBuilder) {
     return agentBuilder
diff --git a/dd-java-agent/instrumentation/jax-rs-client/src/test/groovy/JaxRsClientTest.groovy b/dd-java-agent/instrumentation/jax-rs-client/src/test/groovy/JaxRsClientTest.groovy
index 5ffae435211..f20b0e53842 100644
--- a/dd-java-agent/instrumentation/jax-rs-client/src/test/groovy/JaxRsClientTest.groovy
+++ b/dd-java-agent/instrumentation/jax-rs-client/src/test/groovy/JaxRsClientTest.groovy
@@ -18,10 +18,6 @@ import java.util.concurrent.atomic.AtomicReference
 import static ratpack.groovy.test.embed.GroovyEmbeddedApp.ratpack
 
 class JaxRsClientTest extends AgentTestRunner {
-  static {
-    System.setProperty("dd.integration.jax-rs.enabled", "true")
-  }
-
   def receivedHeaders = new AtomicReference<Headers>()
   def server = ratpack {
     handlers {
diff --git a/dd-java-agent/instrumentation/play-2.4/src/latestDepTest/groovy/Play26Test.groovy b/dd-java-agent/instrumentation/play-2.4/src/latestDepTest/groovy/Play26Test.groovy
index c4a1b938f03..5c209a0abf6 100644
--- a/dd-java-agent/instrumentation/play-2.4/src/latestDepTest/groovy/Play26Test.groovy
+++ b/dd-java-agent/instrumentation/play-2.4/src/latestDepTest/groovy/Play26Test.groovy
@@ -8,10 +8,6 @@ import play.test.Helpers
 import spock.lang.Shared
 
 class Play26Test extends AgentTestRunner {
-  static {
-    System.setProperty("dd.integration.play.enabled", "true")
-  }
-
   @Shared
   int port = TestUtils.randomOpenPort()
   @Shared
diff --git a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play/PlayInstrumentation.java b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play/PlayInstrumentation.java
index f71b6687283..93acd519b6d 100644
--- a/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play/PlayInstrumentation.java
+++ b/dd-java-agent/instrumentation/play-2.4/src/main/java/datadog/trace/instrumentation/play/PlayInstrumentation.java
@@ -42,11 +42,6 @@ public PlayInstrumentation() {
     super("play");
   }
 
-  @Override
-  protected boolean defaultEnabled() {
-    return false;
-  }
-
   @Override
   public AgentBuilder apply(final AgentBuilder agentBuilder) {
     return agentBuilder
diff --git a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/Play24Test.groovy b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/Play24Test.groovy
index 12c8d302689..ea6e0ca9e10 100644
--- a/dd-java-agent/instrumentation/play-2.4/src/test/groovy/Play24Test.groovy
+++ b/dd-java-agent/instrumentation/play-2.4/src/test/groovy/Play24Test.groovy
@@ -8,10 +8,6 @@ import play.test.Helpers
 import spock.lang.Shared
 
 class Play24Test extends AgentTestRunner {
-  static {
-    System.setProperty("dd.integration.play.enabled", "true")
-  }
-
   @Shared
   int port = TestUtils.randomOpenPort()
   @Shared