diff --git a/java-cassandra/pom.xml b/java-cassandra/pom.xml
index 3866f2a1d5..4e16bb867a 100644
--- a/java-cassandra/pom.xml
+++ b/java-cassandra/pom.xml
@@ -24,7 +24,7 @@
         <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
         
         <!-- Cassandra -->
-        <cassandra-driver-core.version>3.0.3</cassandra-driver-core.version>
+        <cassandra-driver-core.version>3.1.0</cassandra-driver-core.version>
   	</properties>
   
   	<dependencies>
@@ -40,10 +40,16 @@
 		<dependency>
 		    <groupId>org.cassandraunit</groupId>
 		    <artifactId>cassandra-unit</artifactId>
-		    <version>2.2.2.1</version>
+		    <version>3.0.0.1</version>
 		</dependency>
 		
-		
+		<!-- This guava version is required for cassandra-unit 3.0.0.1 -->
+		<dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>19.0</version>
+        </dependency>
+        
   		<!-- logging -->
 
         <dependency>
diff --git a/java-cassandra/src/main/java/com/baeldung/cassandra/java/client/domain/Book.java b/java-cassandra/src/main/java/com/baeldung/cassandra/java/client/domain/Book.java
index 25ff9e2f22..490aaf7080 100644
--- a/java-cassandra/src/main/java/com/baeldung/cassandra/java/client/domain/Book.java
+++ b/java-cassandra/src/main/java/com/baeldung/cassandra/java/client/domain/Book.java
@@ -14,7 +14,7 @@ public class Book {
 
     private String publisher;
 
-    public Book() {
+    Book() {
         
     }
     
diff --git a/java-cassandra/src/test/java/com/baeldung/cassandra/java/client/repository/BookRepositoryIntegrationTest.java b/java-cassandra/src/test/java/com/baeldung/cassandra/java/client/repository/BookRepositoryIntegrationTest.java
index c6db326547..62eae94c7c 100644
--- a/java-cassandra/src/test/java/com/baeldung/cassandra/java/client/repository/BookRepositoryIntegrationTest.java
+++ b/java-cassandra/src/test/java/com/baeldung/cassandra/java/client/repository/BookRepositoryIntegrationTest.java
@@ -38,7 +38,7 @@ public class BookRepositoryIntegrationTest {
     @BeforeClass
     public static void init() throws ConfigurationException, TTransportException, IOException, InterruptedException {
         // Start an embedded Cassandra Server
-        EmbeddedCassandraServerHelper.startEmbeddedCassandra();
+        EmbeddedCassandraServerHelper.startEmbeddedCassandra(20000L);
     }
 
     @Before
diff --git a/java-cassandra/src/test/java/com/baeldung/cassandra/java/client/repository/KeyspaceRepositoryIntegrationTest.java b/java-cassandra/src/test/java/com/baeldung/cassandra/java/client/repository/KeyspaceRepositoryIntegrationTest.java
index 8d4c1d5d9c..9df46b3176 100644
--- a/java-cassandra/src/test/java/com/baeldung/cassandra/java/client/repository/KeyspaceRepositoryIntegrationTest.java
+++ b/java-cassandra/src/test/java/com/baeldung/cassandra/java/client/repository/KeyspaceRepositoryIntegrationTest.java
@@ -32,7 +32,7 @@ public class KeyspaceRepositoryIntegrationTest {
     @BeforeClass
     public static void init() throws ConfigurationException, TTransportException, IOException, InterruptedException {
         // Start an embedded Cassandra Server
-        EmbeddedCassandraServerHelper.startEmbeddedCassandra();
+        EmbeddedCassandraServerHelper.startEmbeddedCassandra(20000L);
     }
 
     @Before
@@ -50,7 +50,7 @@ public class KeyspaceRepositoryIntegrationTest {
 
         // ResultSet result = session.execute("SELECT * FROM system_schema.keyspaces WHERE keyspace_name = 'testBaeldungKeyspace';");
 
-        ResultSet result = session.execute("SELECT * FROM system.schema_keyspaces;");
+        ResultSet result = session.execute("SELECT * FROM system_schema.keyspaces;");
 
         // Check if the Keyspace exists in the returned keyspaces.
         List<String> matchedKeyspaces = result.all().stream().filter(r -> r.getString(0).equals(keyspaceName.toLowerCase())).map(r -> r.getString(0)).collect(Collectors.toList());
@@ -65,7 +65,7 @@ public class KeyspaceRepositoryIntegrationTest {
         // schemaRepository.createKeyspace(keyspaceName, "SimpleStrategy", 1);
         schemaRepository.deleteKeyspace(keyspaceName);
 
-        ResultSet result = session.execute("SELECT * FROM system.schema_keyspaces;");
+        ResultSet result = session.execute("SELECT * FROM system_schema.keyspaces;");
         boolean isKeyspaceCreated = result.all().stream().anyMatch(r -> r.getString(0).equals(keyspaceName.toLowerCase()));
         assertFalse(isKeyspaceCreated);
     }