diff --git a/dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle b/dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle
index 241f28471b..1ecb7ea88d 100644
--- a/dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle
+++ b/dd-java-agent/instrumentation/okhttp-3/okhttp-3.gradle
@@ -1,15 +1,10 @@
-apply plugin: 'version-scan'
-
-versionScan {
-  group = "com.squareup.okhttp3"
-  module = "okhttp"
-  versions = "[3.0,)"
-  legacyGroup = "com.squareup.okhttp"
-  verifyPresent = [
-    "okhttp3.Cookie"        : null,
-    "okhttp3.ConnectionPool": null,
-    "okhttp3.Headers"       : null,
-  ]
+muzzle {
+  pass {
+    group = "com.squareup.okhttp3"
+    module = "okhttp"
+    versions = "[3.0,)"
+    assertInverse = true
+  }
 }
 
 apply from: "${rootDir}/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java b/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java
index 305d0d2779..bd8ddd15f9 100644
--- a/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java
+++ b/dd-java-agent/instrumentation/okhttp-3/src/main/java/datadog/trace/instrumentation/okhttp3/OkHttp3Instrumentation.java
@@ -1,6 +1,5 @@
 package datadog.trace.instrumentation.okhttp3;
 
-import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
 import static datadog.trace.instrumentation.okhttp3.OkHttpClientSpanDecorator.STANDARD_TAGS;
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -30,17 +29,6 @@ public class OkHttp3Instrumentation extends Instrumenter.Default {
     return named("okhttp3.OkHttpClient");
   }
 
-  @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    return classLoaderHasClasses(
-        "okhttp3.Request",
-        "okhttp3.Response",
-        "okhttp3.Connection",
-        "okhttp3.Cookie",
-        "okhttp3.ConnectionPool",
-        "okhttp3.Headers");
-  }
-
   @Override
   public String[] helperClassNames() {
     return new String[] {