diff --git a/dd-java-agent/instrumentation/grpc-1.5/grpc-1.5.gradle b/dd-java-agent/instrumentation/grpc-1.5/grpc-1.5.gradle
index 1aa2301534..e78bbd13d0 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/grpc-1.5.gradle
+++ b/dd-java-agent/instrumentation/grpc-1.5/grpc-1.5.gradle
@@ -1,12 +1,9 @@
-apply plugin: 'version-scan'
-
-versionScan {
-  group = "io.grpc"
-  module = "grpc-core"
-  versions = "[1.5.0,)"
-  verifyPresent = [
-    "io.grpc.InternalServerInterceptors": null,
-  ]
+muzzle {
+  pass {
+    group = "io.grpc"
+    module = "grpc-core"
+    versions = "[1.5.0,)"
+  }
 }
 
 buildscript {
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientBuilderInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientBuilderInstrumentation.java
index eaaeab4138..7e29b2a69c 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientBuilderInstrumentation.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/GrpcClientBuilderInstrumentation.java
@@ -1,6 +1,5 @@
 package datadog.trace.instrumentation.grpc.client;
 
-import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
@@ -27,11 +26,6 @@ public class GrpcClientBuilderInstrumentation extends Instrumenter.Default {
     return named("io.grpc.internal.AbstractManagedChannelImplBuilder");
   }
 
-  @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    return classLoaderHasClasses("io.grpc.InternalServerInterceptors");
-  }
-
   @Override
   public String[] helperClassNames() {
     return new String[] {
diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerBuilderInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerBuilderInstrumentation.java
index 2f74b50fde..5a7a4b6a92 100644
--- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerBuilderInstrumentation.java
+++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/GrpcServerBuilderInstrumentation.java
@@ -1,6 +1,5 @@
 package datadog.trace.instrumentation.grpc.server;
 
-import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 
@@ -27,11 +26,6 @@ public class GrpcServerBuilderInstrumentation extends Instrumenter.Default {
     return named("io.grpc.internal.AbstractServerImplBuilder");
   }
 
-  @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    return classLoaderHasClasses("io.grpc.InternalServerInterceptors");
-  }
-
   @Override
   public String[] helperClassNames() {
     return new String[] {