diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/QueryMapperUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/QueryMapperUnitTests.java
index 059c2585b..0914fe057 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/QueryMapperUnitTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/convert/QueryMapperUnitTests.java
@@ -16,7 +16,6 @@
 package org.springframework.data.cassandra.core.convert;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 import static org.springframework.data.domain.Sort.Order.*;
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplateUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplateUnitTests.java
index 201bf5dbb..e4ac8e6c1 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplateUnitTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplateUnitTests.java
@@ -117,7 +117,7 @@ class ReactiveCqlTemplateUnitTests {
 
 		Mono<Boolean> mono = template.execute("UPDATE user SET a = 'b';");
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		mono.as(StepVerifier::create).expectNext(false).verifyComplete();
 
@@ -209,7 +209,7 @@ class ReactiveCqlTemplateUnitTests {
 
 		Flux<Boolean> flux = template.query("UPDATE user SET a = 'b';", resultSet -> Mono.just(resultSet.wasApplied()));
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		flux.as(StepVerifier::create).expectNext(true).verifyComplete();
 
@@ -328,7 +328,7 @@ class ReactiveCqlTemplateUnitTests {
 
 		Flux<Boolean> flux = template.execute(Flux.just("UPDATE user SET a = 'b';", "UPDATE user SET x = 'y';"));
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		flux.as(StepVerifier::create).expectNext(true).expectNext(false).verifyComplete();
 
@@ -419,7 +419,7 @@ class ReactiveCqlTemplateUnitTests {
 		Flux<Boolean> flux = template.query(SimpleStatement.newInstance("UPDATE user SET a = 'b';"),
 				resultSet -> Mono.just(resultSet.wasApplied()));
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 		flux.as(StepVerifier::create).expectNext(true).verifyComplete();
 		verify(session).execute(any(Statement.class));
 	}
@@ -591,7 +591,7 @@ class ReactiveCqlTemplateUnitTests {
 		Flux<ReactiveResultSet> flux = template.execute("UPDATE user SET a = 'b';",
 				(session, ps) -> session.execute(ps.bind()));
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		flux.as(StepVerifier::create).expectNext(reactiveResultSet).verifyComplete();
 
@@ -607,7 +607,7 @@ class ReactiveCqlTemplateUnitTests {
 		Flux<ReactiveResultSet> flux = template.execute(session -> Mono.just(preparedStatement),
 				(session, ps) -> session.execute(boundStatement));
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		flux.as(StepVerifier::create).expectNext(reactiveResultSet).verifyComplete();
 
@@ -643,7 +643,7 @@ class ReactiveCqlTemplateUnitTests {
 
 		Flux<Row> flux = template.query(session -> Mono.just(preparedStatement), ReactiveResultSet::rows);
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		flux.as(StepVerifier::create).expectNext(row).verifyComplete();
 		verify(preparedStatement).bind();
@@ -660,7 +660,7 @@ class ReactiveCqlTemplateUnitTests {
 			return boundStatement;
 		}, ReactiveResultSet::rows);
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		flux.as(StepVerifier::create).expectNext(row).verifyComplete();
 
@@ -678,7 +678,7 @@ class ReactiveCqlTemplateUnitTests {
 			return boundStatement;
 		}, (row, rowNum) -> row);
 
-		verifyZeroInteractions(session);
+		verifyNoInteractions(session);
 
 		flux.as(StepVerifier::create).expectNext(row).verifyComplete();
 
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityUnitTests.java
index 9a5c9a307..e11693030 100755
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityUnitTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntityUnitTests.java
@@ -170,7 +170,7 @@ class BasicCassandraPersistentEntityUnitTests {
 		AssociationHandler<CassandraPersistentProperty> handlerMock = mock(AssociationHandler.class);
 		entity.doWithAssociations(handlerMock);
 
-		verifyZeroInteractions(handlerMock);
+		verifyNoInteractions(handlerMock);
 	}
 
 	@Table("messages")
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparatorUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparatorUnitTests.java
index 7f7d436a5..c0aaf7b7b 100755
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparatorUnitTests.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparatorUnitTests.java
@@ -46,8 +46,8 @@ class CassandraPersistentPropertyComparatorUnitTests {
 
 		assertThat(INSTANCE.compare(null, null)).isEqualTo(0);
 
-		verifyZeroInteractions(left);
-		verifyZeroInteractions(right);
+		verifyNoInteractions(left);
+		verifyNoInteractions(right);
 	}
 
 	@Test // DATACASS-248
@@ -55,8 +55,8 @@ class CassandraPersistentPropertyComparatorUnitTests {
 
 		assertThat(INSTANCE.compare(left, null)).isEqualTo(1);
 
-		verifyZeroInteractions(left);
-		verifyZeroInteractions(right);
+		verifyNoInteractions(left);
+		verifyNoInteractions(right);
 	}
 
 	@Test // DATACASS-248
@@ -64,8 +64,8 @@ class CassandraPersistentPropertyComparatorUnitTests {
 
 		assertThat(INSTANCE.compare(null, right)).isEqualTo(-1);
 
-		verifyZeroInteractions(left);
-		verifyZeroInteractions(right);
+		verifyNoInteractions(left);
+		verifyNoInteractions(right);
 	}
 
 	@Test // DATACASS-248
@@ -74,8 +74,8 @@ class CassandraPersistentPropertyComparatorUnitTests {
 		assertThat(INSTANCE.compare(left, left)).isEqualTo(0);
 		assertThat(INSTANCE.compare(right, right)).isEqualTo(0);
 
-		verifyZeroInteractions(left);
-		verifyZeroInteractions(right);
+		verifyNoInteractions(left);
+		verifyNoInteractions(right);
 	}
 
 	@Test // DATACASS-248