diff --git a/pom.xml b/pom.xml
index e9e2aaedc..9b3e9cfcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
 		<jta>1.1</jta>
 		<beanutils>1.9.4</beanutils>
 		<xstream>1.4.19</xstream>
+		<mockito>4.11.0</mockito>
 		<pool>2.11.1</pool>
 		<lettuce>6.1.10.RELEASE</lettuce>
 		<jedis>3.8.0</jedis>
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 89f731db1..e1f1a52ff 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
@@ -46,7 +46,6 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-
 import org.springframework.data.redis.connection.ClusterCommandExecutor;
 import org.springframework.data.redis.connection.ClusterNodeResourceProvider;
 import org.springframework.data.redis.connection.ClusterTopologyProvider;
@@ -307,7 +306,7 @@ class LettuceClusterConnectionUnitTests {
 		int[] slots = new int[] { 9000, 10000 };
 		connection.clusterDeleteSlots(CLUSTER_NODE_2, slots);
 
-		verify(clusterConnection2Mock, times(1)).clusterDelSlots((int[]) any());
+		verify(clusterConnection2Mock, times(1)).clusterDelSlots(any(int[].class));
 	}
 
 	@Test // DATAREDIS-315
diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSubscriptionUnitTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSubscriptionUnitTests.java
index 7929253fb..ad455f5dd 100644
--- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSubscriptionUnitTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceReactiveSubscriptionUnitTests.java
@@ -67,7 +67,7 @@ class LettuceReactiveSubscriptionUnitTests {
 	@Test // DATAREDIS-612
 	void shouldSubscribeChannels() {
 
-		when(commandsMock.subscribe(any())).thenReturn(Mono.empty());
+		when(commandsMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
 
 		Mono<Void> subscribe = subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar"));
 
@@ -82,7 +82,7 @@ class LettuceReactiveSubscriptionUnitTests {
 	@Test // DATAREDIS-612
 	void shouldSubscribeChannelsShouldFail() {
 
-		when(commandsMock.subscribe(any())).thenReturn(Mono.error(new RedisConnectionException("Foo")));
+		when(commandsMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.error(new RedisConnectionException("Foo")));
 
 		Mono<Void> subscribe = subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar"));
 
@@ -92,7 +92,7 @@ class LettuceReactiveSubscriptionUnitTests {
 	@Test // DATAREDIS-612
 	void shouldSubscribePatterns() {
 
-		when(commandsMock.psubscribe(any())).thenReturn(Mono.empty());
+		when(commandsMock.psubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
 
 		Mono<Void> subscribe = subscription.pSubscribe(getByteBuffer("foo"), getByteBuffer("bar"));
 
@@ -107,33 +107,33 @@ class LettuceReactiveSubscriptionUnitTests {
 	@Test // DATAREDIS-612
 	void shouldUnsubscribeChannels() {
 
-		when(commandsMock.subscribe(any())).thenReturn(Mono.empty());
-		when(commandsMock.unsubscribe(any())).thenReturn(Mono.empty());
+		when(commandsMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
+		when(commandsMock.unsubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
 		subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar")).as(StepVerifier::create).verifyComplete();
 
 		subscription.unsubscribe().as(StepVerifier::create).verifyComplete();
 
 		assertThat(subscription.getChannels()).isEmpty();
-		verify(commandsMock).unsubscribe(any());
+		verify(commandsMock).unsubscribe(any(ByteBuffer[].class));
 	}
 
 	@Test // DATAREDIS-612
 	void shouldUnsubscribePatterns() {
 
-		when(commandsMock.psubscribe(any())).thenReturn(Mono.empty());
-		when(commandsMock.punsubscribe(any())).thenReturn(Mono.empty());
+		when(commandsMock.psubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
+		when(commandsMock.punsubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
 		subscription.pSubscribe(getByteBuffer("foo"), getByteBuffer("bar")).as(StepVerifier::create).verifyComplete();
 
 		subscription.pUnsubscribe().as(StepVerifier::create).verifyComplete();
 
 		assertThat(subscription.getPatterns()).isEmpty();
-		verify(commandsMock).punsubscribe(any());
+		verify(commandsMock).punsubscribe(any(ByteBuffer[].class));
 	}
 
 	@Test // DATAREDIS-612
 	void shouldEmitChannelMessage() {
 
-		when(commandsMock.subscribe(any())).thenReturn(Mono.empty());
+		when(commandsMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
 		subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar")).as(StepVerifier::create).verifyComplete();
 
 		DirectProcessor<io.lettuce.core.pubsub.api.reactive.ChannelMessage<ByteBuffer, ByteBuffer>> emitter = DirectProcessor
@@ -153,7 +153,7 @@ class LettuceReactiveSubscriptionUnitTests {
 	@Test // DATAREDIS-612
 	void shouldEmitPatternMessage() {
 
-		when(commandsMock.psubscribe(any())).thenReturn(Mono.empty());
+		when(commandsMock.psubscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
 		subscription.pSubscribe(getByteBuffer("foo*"), getByteBuffer("bar*")).as(StepVerifier::create).verifyComplete();
 
 		DirectProcessor<io.lettuce.core.pubsub.api.reactive.PatternMessage<ByteBuffer, ByteBuffer>> emitter = DirectProcessor
@@ -175,7 +175,7 @@ class LettuceReactiveSubscriptionUnitTests {
 	@Test // DATAREDIS-612
 	void shouldEmitError() {
 
-		when(commandsMock.subscribe(any())).thenReturn(Mono.empty());
+		when(commandsMock.subscribe(any(ByteBuffer[].class))).thenReturn(Mono.empty());
 		subscription.subscribe(getByteBuffer("foo"), getByteBuffer("bar")).as(StepVerifier::create).verifyComplete();
 
 		DirectProcessor<io.lettuce.core.pubsub.api.reactive.ChannelMessage<ByteBuffer, ByteBuffer>> emitter = DirectProcessor
diff --git a/src/test/java/org/springframework/data/redis/core/DefaultClusterOperationsUnitTests.java b/src/test/java/org/springframework/data/redis/core/DefaultClusterOperationsUnitTests.java
index 551da9122..dbb6c85ff 100644
--- a/src/test/java/org/springframework/data/redis/core/DefaultClusterOperationsUnitTests.java
+++ b/src/test/java/org/springframework/data/redis/core/DefaultClusterOperationsUnitTests.java
@@ -27,11 +27,9 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-
 import org.springframework.data.redis.connection.RedisClusterCommands.AddSlots;
 import org.springframework.data.redis.connection.RedisClusterConnection;
 import org.springframework.data.redis.connection.RedisClusterNode;
@@ -142,7 +140,7 @@ class DefaultClusterOperationsUnitTests {
 
 		clusterOps.addSlots(NODE_1, 1, 2, 3);
 
-		verify(connection, times(1)).clusterAddSlots(eq(NODE_1), Mockito.<int[]> any());
+		verify(connection, times(1)).clusterAddSlots(eq(NODE_1), any(int[].class));
 	}
 
 	@Test // DATAREDIS-315
@@ -155,7 +153,7 @@ class DefaultClusterOperationsUnitTests {
 
 		clusterOps.addSlots(NODE_1, new SlotRange(1, 3));
 
-		verify(connection, times(1)).clusterAddSlots(eq(NODE_1), Mockito.<int[]> any());
+		verify(connection, times(1)).clusterAddSlots(eq(NODE_1), any(int[].class));
 	}
 
 	@Test // DATAREDIS-315
diff --git a/src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java b/src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java
index 61cf27060..a53bf1c49 100644
--- a/src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java
+++ b/src/test/java/org/springframework/data/redis/core/IndexWriterUnitTests.java
@@ -31,7 +31,6 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -127,10 +126,10 @@ class IndexWriterUnitTests {
 
 		writer.removeAllIndexes(KEYSPACE);
 
-		ArgumentCaptor<byte[]> captor = ArgumentCaptor.forClass(byte[].class);
+		ArgumentCaptor<byte[][]> captor = ArgumentCaptor.forClass(byte[][].class);
 
 		verify(connectionMock, times(1)).del(captor.capture());
-		assertThat(captor.getAllValues()).contains(indexKey1, indexKey2);
+		assertThat(captor.getAllValues()).contains(new byte[][] { indexKey1, indexKey2 });
 	}
 
 	@Test // DATAREDIS-425