diff --git a/dd-java-agent/instrumentation/datastax-cassandra-2.3/datastax-cassandra-2.3.gradle b/dd-java-agent/instrumentation/datastax-cassandra-3/datastax-cassandra-3.gradle
similarity index 89%
rename from dd-java-agent/instrumentation/datastax-cassandra-2.3/datastax-cassandra-2.3.gradle
rename to dd-java-agent/instrumentation/datastax-cassandra-3/datastax-cassandra-3.gradle
index 85172f0f34..a7ee17b8c8 100644
--- a/dd-java-agent/instrumentation/datastax-cassandra-2.3/datastax-cassandra-2.3.gradle
+++ b/dd-java-agent/instrumentation/datastax-cassandra-3/datastax-cassandra-3.gradle
@@ -9,7 +9,8 @@ muzzle {
   pass {
     group = "com.datastax.cassandra"
     module = "cassandra-driver-core"
-    versions = "[2.3.0,)"
+    versions = "[3.0,4.0)"
+    assertInverse = true
   }
 }
 
@@ -24,7 +25,7 @@ testSets {
 }
 
 dependencies {
-  compileOnly group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
+  compileOnly group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.0.0'
 
   compile project(':dd-java-agent:agent-tooling')
 
@@ -37,5 +38,5 @@ dependencies {
   testCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.2.0'
   testCompile group: 'org.cassandraunit', name: 'cassandra-unit', version: '3.1.3.2'
 
-  latestDepTestCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '+'
+  latestDepTestCompile group: 'com.datastax.cassandra', name: 'cassandra-driver-core', version: '3.+'
 }
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java b/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
rename to dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientDecorator.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java b/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
rename to dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/CassandraClientInstrumentation.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java b/dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-2.3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
rename to dd-java-agent/instrumentation/datastax-cassandra-3/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java
diff --git a/dd-java-agent/instrumentation/datastax-cassandra-2.3/src/test/groovy/CassandraClientTest.groovy b/dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy
similarity index 100%
rename from dd-java-agent/instrumentation/datastax-cassandra-2.3/src/test/groovy/CassandraClientTest.groovy
rename to dd-java-agent/instrumentation/datastax-cassandra-3/src/test/groovy/CassandraClientTest.groovy
diff --git a/settings.gradle b/settings.gradle
index 399961f2d4..9965569729 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -29,7 +29,7 @@ include ':dd-java-agent:instrumentation:apache-httpclient-4'
 include ':dd-java-agent:instrumentation:aws-java-sdk-1.11.0'
 include ':dd-java-agent:instrumentation:aws-java-sdk-2.2'
 include ':dd-java-agent:instrumentation:couchbase-2.0'
-include ':dd-java-agent:instrumentation:datastax-cassandra-2.3'
+include ':dd-java-agent:instrumentation:datastax-cassandra-3'
 include ':dd-java-agent:instrumentation:dropwizard'
 include ':dd-java-agent:instrumentation:dropwizard:dropwizard-views'
 include ':dd-java-agent:instrumentation:elasticsearch'