diff --git a/pom.xml b/pom.xml
index 23737357f3acc..9a3293073f513 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2126,18 +2126,6 @@
                 </exclusions>
             </dependency>
 
-            <dependency>
-                <groupId>com.facebook.presto.cassandra</groupId>
-                <artifactId>cassandra-driver</artifactId>
-                <version>3.6.0-1</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>io.netty</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <dependency>
                 <groupId>com.facebook.presto</groupId>
                 <artifactId>presto-delta</artifactId>
@@ -2277,6 +2265,12 @@
                 <artifactId>commons-compress</artifactId>
                 <version>${dep.commons.compress.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.datastax.cassandra</groupId>
+                <artifactId>cassandra-driver-core</artifactId>
+                <version>3.11.5</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/presto-cassandra/pom.xml b/presto-cassandra/pom.xml
index 8754ba771c2e2..ef242b31d6b35 100644
--- a/presto-cassandra/pom.xml
+++ b/presto-cassandra/pom.xml
@@ -17,8 +17,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.facebook.presto.cassandra</groupId>
-            <artifactId>cassandra-driver</artifactId>
+            <groupId>com.datastax.cassandra</groupId>
+            <artifactId>cassandra-driver-core</artifactId>
         </dependency>
 
         <dependency>
@@ -185,6 +185,17 @@
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <!-- This is to fix the upper bound issues arising out of different components-->
+        <dependencies>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-handler</artifactId>
+                <version>4.1.107.Final</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <plugins>
             <plugin>
diff --git a/presto-cassandra/src/test/java/com/datastax/driver/core/TestHost.java b/presto-cassandra/src/test/java/com/datastax/driver/core/TestHost.java
index 4eccfd9e0f6e6..b99a7b85c74fa 100644
--- a/presto-cassandra/src/test/java/com/datastax/driver/core/TestHost.java
+++ b/presto-cassandra/src/test/java/com/datastax/driver/core/TestHost.java
@@ -20,6 +20,6 @@ public class TestHost
 {
     public TestHost(InetSocketAddress address)
     {
-        super(address, new ConvictionPolicy.DefaultConvictionPolicy.Factory(), Cluster.builder().addContactPoints("localhost").build().manager);
+        super(new TranslatedAddressEndPoint(address), new ConvictionPolicy.DefaultConvictionPolicy.Factory(), Cluster.builder().addContactPoints("localhost").build().manager);
     }
 }
diff --git a/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntegrationSmokeTest.java b/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntegrationSmokeTest.java
index 83e3106a055bb..4639f8af90f8b 100644
--- a/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntegrationSmokeTest.java
+++ b/presto-cassandra/src/test/java/com/facebook/presto/cassandra/TestCassandraIntegrationSmokeTest.java
@@ -344,6 +344,7 @@ public void testKeyspaceNameAmbiguity()
 
     @Test
     public void testTableNameAmbiguity()
+            throws Exception
     {
         session.execute("CREATE KEYSPACE keyspace_4 WITH REPLICATION = {'class':'SimpleStrategy', 'replication_factor': 1}");
         assertContainsEventually(() -> execute("SHOW SCHEMAS FROM cassandra"), resultBuilder(getSession(), createUnboundedVarcharType())
@@ -355,6 +356,9 @@ public void testTableNameAmbiguity()
         session.execute("CREATE TABLE keyspace_4.\"TaBlE_4\" (column_4 bigint PRIMARY KEY)");
         session.execute("CREATE TABLE keyspace_4.\"tAbLe_4\" (column_4 bigint PRIMARY KEY)");
 
+        // This is added for Cassandra to refresh its metadata so that we don't encounter a race condition in the forthcoming steps and achieve eventual consistency.
+        Thread.sleep(1000);
+
         // Although in Presto all the schema and table names are always displayed as lowercase
         assertContainsEventually(() -> execute("SHOW TABLES FROM cassandra.keyspace_4"), resultBuilder(getSession(), createUnboundedVarcharType())
                 .row("table_4")
diff --git a/presto-product-tests/pom.xml b/presto-product-tests/pom.xml
index 7baac719517ba..c9e4124ce2967 100644
--- a/presto-product-tests/pom.xml
+++ b/presto-product-tests/pom.xml
@@ -133,8 +133,15 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>com.facebook.presto.cassandra</groupId>
-            <artifactId>cassandra-driver</artifactId>
+            <groupId>com.datastax.cassandra</groupId>
+            <artifactId>cassandra-driver-core</artifactId>
+            <version>3.11.5</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.netty</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.scala-lang</groupId>