diff --git a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java
index 07594fb97..6247b048a 100644
--- a/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java
+++ b/src/main/java/org/springframework/data/redis/connection/jedis/JedisClusterZSetCommands.java
@@ -48,6 +48,7 @@ import org.springframework.util.Assert;
  * @author Mark Paluch
  * @author Clement Ong
  * @author Andrey Shlykov
+ * @author Jens Deppe
  * @since 2.0
  */
 class JedisClusterZSetCommands implements RedisZSetCommands {
@@ -1042,7 +1043,7 @@ class JedisClusterZSetCommands implements RedisZSetCommands {
 	 */
 	@Nullable
 	@SuppressWarnings("unchecked")
-	private static Tuple toTuple(List<?> bytes) {
+	private static Tuple toTuple(@Nullable List<?> bytes) {
 
 		if (bytes == null || bytes.isEmpty()) {
 			return null;
diff --git a/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java b/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java
index 27560117e..4935d1cd6 100644
--- a/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/jedis/JedisClusterConnectionTests.java
@@ -2280,8 +2280,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests {
 	@EnabledOnCommand("BZPOPMIN")
 	public void bzPopMinShouldWorkCorrectly() {
 
-		assertThat(clusterConnection.bZPopMin(KEY_1_BYTES, 1, TimeUnit.MILLISECONDS))
-				.isNull();
+		assertThat(clusterConnection.bZPopMin(KEY_1_BYTES, 10, TimeUnit.MILLISECONDS)).isNull();
 
 		nativeConnection.zadd(KEY_1_BYTES, 10D, VALUE_1_BYTES);
 		nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES);
@@ -2308,8 +2307,7 @@ public class JedisClusterConnectionTests implements ClusterConnectionTests {
 	@EnabledOnCommand("BZPOPMAX")
 	public void bzPopMaxShouldWorkCorrectly() {
 
-		assertThat(clusterConnection.bZPopMax(KEY_1_BYTES, 1, TimeUnit.MILLISECONDS))
-				.isNull();
+		assertThat(clusterConnection.bZPopMax(KEY_1_BYTES, 10, TimeUnit.MILLISECONDS)).isNull();
 
 		nativeConnection.zadd(KEY_1_BYTES, 10D, VALUE_1_BYTES);
 		nativeConnection.zadd(KEY_1_BYTES, 20D, VALUE_2_BYTES);
diff --git a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java
index dce5b42fa..bcbb9f17e 100644
--- a/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java
+++ b/src/test/java/org/springframework/data/redis/connection/lettuce/LettuceClusterConnectionTests.java
@@ -97,13 +97,10 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests {
 	private static final GeoLocation<String> PALERMO = new GeoLocation<>("palermo", POINT_PALERMO);
 
 	private static final GeoLocation<byte[]> ARIGENTO_BYTES = new GeoLocation<>(
-			"arigento".getBytes(StandardCharsets.UTF_8),
-			POINT_ARIGENTO);
-	private static final GeoLocation<byte[]> CATANIA_BYTES = new GeoLocation<>(
-			"catania".getBytes(StandardCharsets.UTF_8),
+			"arigento".getBytes(StandardCharsets.UTF_8), POINT_ARIGENTO);
+	private static final GeoLocation<byte[]> CATANIA_BYTES = new GeoLocation<>("catania".getBytes(StandardCharsets.UTF_8),
 			POINT_CATANIA);
-	private static final GeoLocation<byte[]> PALERMO_BYTES = new GeoLocation<>(
-			"palermo".getBytes(StandardCharsets.UTF_8),
+	private static final GeoLocation<byte[]> PALERMO_BYTES = new GeoLocation<>("palermo".getBytes(StandardCharsets.UTF_8),
 			POINT_PALERMO);
 
 	private final RedisClusterClient client;
@@ -183,7 +180,6 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests {
 		factory.destroy();
 	}
 
-
 	@Test // DATAREDIS-315
 	public void appendShouldAddValueCorrectly() {
 
@@ -2320,6 +2316,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests {
 	@EnabledOnCommand("BZPOPMIN")
 	public void bzPopMinShouldWorkCorrectly() {
 
+		assertThat(clusterConnection.bZPopMin(KEY_1_BYTES, 10, TimeUnit.MILLISECONDS)).isNull();
+
 		nativeConnection.zadd(KEY_1, 10D, VALUE_1);
 		nativeConnection.zadd(KEY_1, 20D, VALUE_2);
 		nativeConnection.zadd(KEY_1, 30D, VALUE_3);
@@ -2332,6 +2330,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests {
 	@EnabledOnCommand("ZPOPMAX")
 	public void zPopMaxShouldWorkCorrectly() {
 
+		assertThat(clusterConnection.bZPopMax(KEY_1_BYTES, 10, TimeUnit.MILLISECONDS)).isNull();
+
 		nativeConnection.zadd(KEY_1, 10D, VALUE_1);
 		nativeConnection.zadd(KEY_1, 20D, VALUE_2);
 		nativeConnection.zadd(KEY_1, 30D, VALUE_3);
@@ -2504,8 +2504,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests {
 		nativeConnection.zadd(KEY_1, 20D, VALUE_2);
 		nativeConnection.zadd(KEY_1, 5D, VALUE_3);
 
-		assertThat(clusterConnection.zRangeWithScores(KEY_1_BYTES, 1, 2))
-				.contains(new DefaultTuple(VALUE_1_BYTES, 10D), new DefaultTuple(VALUE_2_BYTES, 20D));
+		assertThat(clusterConnection.zRangeWithScores(KEY_1_BYTES, 1, 2)).contains(new DefaultTuple(VALUE_1_BYTES, 10D),
+				new DefaultTuple(VALUE_2_BYTES, 20D));
 	}
 
 	@Test // DATAREDIS-315
@@ -2622,8 +2622,8 @@ public class LettuceClusterConnectionTests implements ClusterConnectionTests {
 		nativeConnection.zadd(KEY_1, 20D, VALUE_2);
 		nativeConnection.zadd(KEY_1, 5D, VALUE_3);
 
-		assertThat(clusterConnection.zRevRangeWithScores(KEY_1_BYTES, 1, 2))
-				.contains(new DefaultTuple(VALUE_3_BYTES, 5D), new DefaultTuple(VALUE_1_BYTES, 10D));
+		assertThat(clusterConnection.zRevRangeWithScores(KEY_1_BYTES, 1, 2)).contains(new DefaultTuple(VALUE_3_BYTES, 5D),
+				new DefaultTuple(VALUE_1_BYTES, 10D));
 	}
 
 	@Test