diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle b/dd-java-agent/instrumentation/datastax-cassandra-2.3/datastax-cassandra-2.3.gradle
similarity index 65%
rename from dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle
rename to dd-java-agent/instrumentation/datastax-cassandra-2.3/datastax-cassandra-2.3.gradle
index d27cef31a5..8267e4678b 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra-3.2/datastax-cassandra-3.2.gradle
+++ b/dd-java-agent/instrumentation/datastax-cassandra-2.3/datastax-cassandra-2.3.gradle
@@ -1,16 +1,9 @@
-// TODO: VersionScan plugin does not report which version failed, which is making it hard to get meaningful results out of this block.
-// Once versionScan can report on which version failed, this can be enabled.
-// The desire is to apply the instrumentation to cassandra-datastax 2.3 and beyond.
-
-apply plugin: 'version-scan'
-
-versionScan {
-  group = "com.datastax.cassandra"
-  module = "cassandra-driver-core"
-  versions = "[3.2.0,)"
-  verifyPresent = [
-    "com.datastax.driver.core.Duration": null,
-  ]
+muzzle {
+  pass {
+    group = "com.datastax.cassandra"
+    module = "cassandra-driver-core"
+    versions = "[2.3.0,)"
+  }
 }
 
 apply from: "${rootDir}/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.2/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
similarity index 92%
rename from dd-java-agent/instrumentation/datastax-cassandra-3.2/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
rename to dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
index 2f8afa8f8c..fa27c78ad5 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra-3.2/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
+++ b/dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
@@ -1,6 +1,5 @@
 package datadog.trace.instrumentation.datastax.cassandra;
 
-import static datadog.trace.agent.tooling.ClassLoaderMatcher.classLoaderHasClasses;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.isPrivate;
 import static net.bytebuddy.matcher.ElementMatchers.named;
@@ -30,11 +29,6 @@ public class CassandraClientInstrumentation extends Instrumenter.Default {
     return named("com.datastax.driver.core.Cluster$Manager");
   }
 
-  @Override
-  public ElementMatcher<ClassLoader> classLoaderMatcher() {
-    return classLoaderHasClasses("com.datastax.driver.core.Duration");
-  }
-
   @Override
   public String[] helperClassNames() {
     return new String[] {
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.2/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java b/dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-3.2/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
rename to dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-3.2/src/test/groovy/CassandraClientTest.groovy b/dd-java-agent/instrumentation/datastax-cassandra-2.3/src/test/groovy/CassandraClientTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-3.2/src/test/groovy/CassandraClientTest.groovy
rename to dd-java-agent/instrumentation/datastax-cassandra-2.3/src/test/groovy/CassandraClientTest.groovy
diff --git a/settings.gradle b/settings.gradle
index 657cd030b0..f7edeacbca 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,7 +14,7 @@ include ':dd-java-agent:instrumentation:apache-httpclient-4.3'
 include ':dd-java-agent:instrumentation:aws-java-sdk-1.11.0'
 include ':dd-java-agent:instrumentation:aws-java-sdk-1.11.106'
 include ':dd-java-agent:instrumentation:couchbase-2.0'
-include ':dd-java-agent:instrumentation:datastax-cassandra-3.2'
+include ':dd-java-agent:instrumentation:datastax-cassandra-2.3'
 include ':dd-java-agent:instrumentation:elasticsearch-rest-5'
 include ':dd-java-agent:instrumentation:elasticsearch-transport-2'
 include ':dd-java-agent:instrumentation:elasticsearch-transport-5'