diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionUnitTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionUnitTests.java
index d49ef6850..f0117a9c7 100644
--- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionUnitTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionUnitTests.java
@@ -147,7 +147,7 @@ class JedisClusterConnectionUnitTests {
 		verify(con2Mock, times(1)).clusterReplicate(CLUSTER_NODE_1.getId());
 		verify(con1Mock, atMost(1)).clusterNodes();
 		verify(con1Mock, atMost(1)).close();
-		verifyZeroInteractions(con1Mock);
+		verifyNoMoreInteractions(con1Mock);
 	}
 
 	@Test // DATAREDIS-315
@@ -232,7 +232,7 @@ class JedisClusterConnectionUnitTests {
 		int[] slots = new int[] { 9000, 10000 };
 		connection.clusterDeleteSlots(CLUSTER_NODE_2, slots);
 
-		verify(con2Mock, times(1)).clusterDelSlots((int[]) anyVararg());
+		verify(con2Mock, times(1)).clusterDelSlots((int[]) any());
 	}
 
 	@Test // DATAREDIS-315
diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java
index 10c440e20..31fbb6abe 100644
--- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionUnitTests.java
@@ -163,7 +163,7 @@ class LettuceClusterConnectionUnitTests {
 		connection.clusterForget(CLUSTER_NODE_2);
 
 		verify(clusterConnection1Mock, times(1)).clusterForget(CLUSTER_NODE_2.getId());
-		verifyZeroInteractions(clusterConnection2Mock);
+		verifyNoInteractions(clusterConnection2Mock);
 		verify(clusterConnection3Mock, times(1)).clusterForget(CLUSTER_NODE_2.getId());
 	}
 
@@ -173,7 +173,7 @@ class LettuceClusterConnectionUnitTests {
 		connection.clusterReplicate(CLUSTER_NODE_1, CLUSTER_NODE_2);
 
 		verify(clusterConnection2Mock, times(1)).clusterReplicate(CLUSTER_NODE_1.getId());
-		verifyZeroInteractions(clusterConnection1Mock);
+		verifyNoInteractions(clusterConnection1Mock);
 	}
 
 	@Test // DATAREDIS-315
@@ -334,7 +334,7 @@ class LettuceClusterConnectionUnitTests {
 		connection.time(CLUSTER_NODE_2);
 
 		verify(clusterConnection2Mock, times(1)).time();
-		verifyZeroInteractions(clusterConnection1Mock, clusterConnection3Mock);
+		verifyNoInteractions(clusterConnection1Mock, clusterConnection3Mock);
 	}
 
 	@Test // DATAREDIS-315
@@ -412,6 +412,6 @@ class LettuceClusterConnectionUnitTests {
 		verify(async).blpop(1, KEY_1_BYTES);
 		verify(connectionProviderMock).getConnection(StatefulConnection.class);
 		verifyNoMoreInteractions(connectionProviderMock);
-		verifyZeroInteractions(sharedConnectionMock);
+		verifyNoInteractions(sharedConnectionMock);
 	}
 }
diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProviderUnitTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProviderUnitTests.java
index 56bd2d0c4..d1d123ca5 100644
--- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProviderUnitTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettucePoolingConnectionProviderUnitTests.java
@@ -57,7 +57,7 @@ class LettucePoolingConnectionProviderUnitTests {
 
 		provider.release(provider.getConnection(StatefulRedisConnection.class));
 
-		verifyZeroInteractions(commandsMock);
+		verifyNoInteractions(commandsMock);
 	}
 
 	@Test // DATAREDIS-988
diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveRedisConnectionUnitTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveRedisConnectionUnitTests.java
index 8ed68c1b4..ceb0d3383 100644
--- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveRedisConnectionUnitTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveRedisConnectionUnitTests.java
@@ -72,7 +72,7 @@ class LettuceReactiveRedisConnectionUnitTests {
 
 		new LettuceReactiveRedisConnection(connectionProvider);
 
-		verifyZeroInteractions(connectionProvider);
+		verifyNoInteractions(connectionProvider);
 	}
 
 	@Test // DATAREDIS-720, DATAREDIS-721
@@ -103,7 +103,7 @@ class LettuceReactiveRedisConnectionUnitTests {
 
 		connection.execute(cmd -> Mono.just("foo")).as(StepVerifier::create).expectNext("foo").verifyComplete();
 
-		verifyZeroInteractions(connectionProvider);
+		verifyNoInteractions(connectionProvider);
 	}
 
 	@Test // DATAREDIS-720, DATAREDIS-721
diff --git a/src/test/java/org/springframework/data/redis/core/ConnectionSplittingInterceptorUnitTests.java b/src/test/java/org/springframework/data/redis/core/ConnectionSplittingInterceptorUnitTests.java
index 7f582b72a..267a3bd65 100644
--- a/src/test/java/org/springframework/data/redis/core/ConnectionSplittingInterceptorUnitTests.java
+++ b/src/test/java/org/springframework/data/redis/core/ConnectionSplittingInterceptorUnitTests.java
@@ -71,7 +71,7 @@ class ConnectionSplittingInterceptorUnitTests {
 
 		interceptor.intercept(boundConnectionMock, READONLY_METHOD, new Object[] { new byte[] {} });
 		verify(connectionFactoryMock, times(1)).getConnection();
-		verifyZeroInteractions(boundConnectionMock);
+		verifyNoInteractions(boundConnectionMock);
 	}
 
 	@Test // DATAREDIS-73
@@ -79,7 +79,7 @@ class ConnectionSplittingInterceptorUnitTests {
 
 		interceptor.intercept(boundConnectionMock, WRITE_METHOD, new Object[] { new byte[] {}, 0L });
 		verify(boundConnectionMock, times(1)).expire(any(byte[].class), anyLong());
-		verifyZeroInteractions(connectionFactoryMock);
+		verifyNoInteractions(connectionFactoryMock);
 	}
 
 	@SuppressWarnings("unchecked")
diff --git a/src/test/java/org/springframework/data/redis/test/util/MockitoUtils.java b/src/test/java/org/springframework/data/redis/test/util/MockitoUtils.java
index 933d74c22..5f85a35f7 100644
--- a/src/test/java/org/springframework/data/redis/test/util/MockitoUtils.java
+++ b/src/test/java/org/springframework/data/redis/test/util/MockitoUtils.java
@@ -99,11 +99,6 @@ public class MockitoUtils {
 			return wanted;
 		}
 
-		@Override
-		public InvocationMatcher getWanted() {
-			return wanted;
-		}
-
 	}
 
 }