diff --git a/spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBeanUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBeanUnitTests.java
index 78d4078f7..bca973320 100755
--- a/spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBeanUnitTests.java
+++ b/spring-cql/src/test/java/org/springframework/cassandra/config/CassandraCqlClusterFactoryBeanUnitTests.java
@@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.isA;
 import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.anyString;
 
 import org.junit.Test;
-import org.mockito.Matchers;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.datastax.driver.core.*;
@@ -213,7 +213,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests {
 	@Test // DATACASS-226
 	public void shouldSetSslOptions() throws Exception {
 
-		SSLOptions sslOptions = JdkSSLOptions.builder().build();
+		SSLOptions sslOptions = RemoteEndpointAwareJdkSSLOptions.builder().build();
 
 		CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean();
 		bean.setSslEnabled(true);
@@ -272,7 +272,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests {
 
 		final Cluster.Builder mockClusterBuilder = mock(Cluster.Builder.class);
 
-		when(mockClusterBuilder.addContactPoints(Matchers.<String[]> anyVararg())).thenReturn(mockClusterBuilder);
+		when(mockClusterBuilder.addContactPoints(anyString())).thenReturn(mockClusterBuilder);
 
 		CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean() {
 			@Override
@@ -293,7 +293,7 @@ public class CassandraCqlClusterFactoryBeanUnitTests {
 
 		final Cluster.Builder mockClusterBuilder = mock(Cluster.Builder.class);
 
-		when(mockClusterBuilder.addContactPoints(Matchers.<String[]> anyVararg())).thenReturn(mockClusterBuilder);
+		when(mockClusterBuilder.addContactPoints(anyString())).thenReturn(mockClusterBuilder);
 
 		CassandraCqlClusterFactoryBean bean = new CassandraCqlClusterFactoryBean() {
 			@Override
diff --git a/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraAccessorUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraAccessorUnitTests.java
index 718d46562..7b8ca06ca 100755
--- a/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraAccessorUnitTests.java
+++ b/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraAccessorUnitTests.java
@@ -88,7 +88,7 @@ public class CassandraAccessorUnitTests {
 	public void setAndGetSession() {
 
 		cassandraAccessor.setSession(mockSession);
-		assertThat(cassandraAccessor.getSession()).isSameAs(mockSession);
+		assertThat(cassandraAccessor.getSessionFactory().getSession()).isSameAs(mockSession);
 	}
 
 	@Test // DATACASS-286
diff --git a/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraExceptionTranslatorUnitTests.java b/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraExceptionTranslatorUnitTests.java
index 164823ec6..f9ce7f46b 100755
--- a/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraExceptionTranslatorUnitTests.java
+++ b/spring-cql/src/test/java/org/springframework/cassandra/support/CassandraExceptionTranslatorUnitTests.java
@@ -201,8 +201,8 @@ public class CassandraExceptionTranslatorUnitTests {
 	@Test // DATACASS-402
 	public void shouldTranslateWriteFailureException() {
 
-		DataAccessException result = sut
-				.translateExceptionIfPossible(new WriteFailureException(ConsistencyLevel.ALL, WriteType.BATCH, 1, 5, 1));
+		DataAccessException result = sut.translateExceptionIfPossible(
+				new WriteFailureException(ConsistencyLevel.ALL, WriteType.BATCH, 1, 5, 1, Collections.emptyMap()));
 
 		assertThat(result).isInstanceOf(DataAccessResourceFailureException.class)
 				.hasMessageStartingWith("Cassandra failure during").hasCauseInstanceOf(WriteFailureException.class);
@@ -211,8 +211,8 @@ public class CassandraExceptionTranslatorUnitTests {
 	@Test // DATACASS-402
 	public void shouldTranslateReadFailureException() {
 
-		DataAccessException result = sut
-				.translateExceptionIfPossible(new ReadFailureException(ConsistencyLevel.ALL, 1, 5, 1, true));
+		DataAccessException result = sut.translateExceptionIfPossible(
+				new ReadFailureException(ConsistencyLevel.ALL, 1, 5, 1, Collections.emptyMap(), true));
 
 		assertThat(result).isInstanceOf(DataAccessResourceFailureException.class)
 				.hasMessageStartingWith("Cassandra failure during").hasCauseInstanceOf(ReadFailureException.class);
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropperUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropperUnitTests.java
index 728d47f1f..6cd5492ef 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropperUnitTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaDropperUnitTests.java
@@ -27,7 +27,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.cassandra.core.cql.CqlIdentifier;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.cassandra.mapping.BasicCassandraMappingContext;