diff --git a/dd-java-agent/instrumentation/netty-4.0/netty-4.0.gradle b/dd-java-agent/instrumentation/netty-4.0/netty-4.0.gradle
index e6d254230b..50d2c311d1 100644
--- a/dd-java-agent/instrumentation/netty-4.0/netty-4.0.gradle
+++ b/dd-java-agent/instrumentation/netty-4.0/netty-4.0.gradle
@@ -1,17 +1,20 @@
-apply plugin: 'version-scan'
-
-versionScan {
-  group = "io.netty"
-  module = "netty-codec-http"
-  legacyModule = "netty"
-  versions = "[4.0.0.Final,4.1.0.Final)"
-  verifyPresent = [
-    "io.netty.handler.codec.spdy.SpdyOrHttpChooser": null,
-  ]
-}
-
 apply from: "${rootDir}/gradle/java.gradle"
 
+muzzle {
+  pass {
+    group = "io.netty"
+    module = "netty-codec-http"
+    versions = "[4.0.0.Final,4.1.0.Final)"
+    assertInverse = true
+  }
+  pass {
+    group = "io.netty"
+    module = "netty"
+    versions = "[4.0.0.Final,4.1.0.Final)"
+    assertInverse = true
+  }
+}
+
 apply plugin: 'org.unbroken-dome.test-sets'
 
 testSets {
diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java
index cf30403561..5932001a3b 100644
--- a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java
@@ -1,7 +1,6 @@
 package datadog.trace.instrumentation.netty40;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
-import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
 import static io.opentracing.log.Fields.ERROR_OBJECT;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
@@ -37,11 +36,6 @@ public class ChannelFutureListenerInstrumentation extends Instrumenter.Default {
         .and(safeHasSuperType(named("io.netty.channel.ChannelFutureListener")));
   }
 
-  @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    return classLoaderHasClasses("io.netty.handler.codec.spdy.SpdyOrHttpChooser");
-  }
-
   @Override
   public String[] helperClassNames() {
     return new String[] {packageName + ".AttributeKeys"};
diff --git a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java
index cd7a72fab2..e56be39144 100644
--- a/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java
+++ b/dd-java-agent/instrumentation/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelPipelineInstrumentation.java
@@ -1,7 +1,6 @@
 package datadog.trace.instrumentation.netty40;
 
 import static datadog.trace.agent.tooling.ByteBuddyElementMatchers.safeHasSuperType;
-import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
 import static net.bytebuddy.matcher.ElementMatchers.isInterface;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.nameStartsWith;
@@ -48,11 +47,6 @@ public class NettyChannelPipelineInstrumentation extends Instrumenter.Default {
     return not(isInterface()).and(safeHasSuperType(named("io.netty.channel.ChannelPipeline")));
   }
 
-  @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    return classLoaderHasClasses("io.netty.handler.codec.spdy.SpdyOrHttpChooser");
-  }
-
   @Override
   public String[] helperClassNames() {
     return new String[] {