diff --git a/src/test/java/org/springframework/data/redis/core/DefaultSetOperationsTests.java b/src/test/java/org/springframework/data/redis/core/DefaultSetOperationsTests.java
index 6fff802e4..1efef4c22 100644
--- a/src/test/java/org/springframework/data/redis/core/DefaultSetOperationsTests.java
+++ b/src/test/java/org/springframework/data/redis/core/DefaultSetOperationsTests.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 import static org.junit.Assert.assertThat;
 import static org.springframework.data.redis.matcher.RedisTestMatchers.isEqual;
+import static org.junit.matchers.JUnitMatchers.hasItems;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -83,6 +84,7 @@ public class DefaultSetOperationsTests<K,V> {
 		});
 	}
 	
+	@SuppressWarnings("unchecked")
 	@Test
 	public void testDistinctRandomMembers() {
 		assumeTrue(RedisTestProfileValueSource.matches("redisVersion", "2.6"));
@@ -95,7 +97,11 @@ public class DefaultSetOperationsTests<K,V> {
 		setOps.add(setKey, v3);
 		Set<V> members = setOps.distinctRandomMembers(setKey, 2);
 		assertEquals(2, members.size());
-		assertTrue(Arrays.asList(new Object[] {v1, v2, v3}).containsAll(members));
+		Set<V> expected = new HashSet<V>();
+		expected.add(v1);
+		expected.add(v2);
+		expected.add(v3);
+		assertThat(expected, hasItems((V[])members.toArray()));
 	}
 
 	@Test
@@ -103,9 +109,15 @@ public class DefaultSetOperationsTests<K,V> {
 		assumeTrue(RedisTestProfileValueSource.matches("redisVersion", "2.6"));
 		K setKey = keyFactory.instance();
 		V v1 = valueFactory.instance();
+		V v2 = valueFactory.instance();
 		setOps.add(setKey, v1);
+		setOps.add(setKey, v2);
 		List<V> members = setOps.randomMembers(setKey, 2);
-		assertEquals(Arrays.asList(new Object[] {v1, v1}), members);
+		// No guaranteed order on returned List
+		HashSet<V> expected = new HashSet<V>();
+		expected.add(v1);
+		expected.add(v2);
+		assertThat(new HashSet<V>(members), isEqual(expected));
 	}
 
 	@Test
diff --git a/src/test/java/org/springframework/data/redis/core/DefaultZSetOperationsTests.java b/src/test/java/org/springframework/data/redis/core/DefaultZSetOperationsTests.java
index 4ebeab346..6ff5b0ef3 100644
--- a/src/test/java/org/springframework/data/redis/core/DefaultZSetOperationsTests.java
+++ b/src/test/java/org/springframework/data/redis/core/DefaultZSetOperationsTests.java
@@ -106,6 +106,7 @@ public class DefaultZSetOperationsTests<K,V> {
 		V value1 = valueFactory.instance();
 		V value2 = valueFactory.instance();
 		V value3 = valueFactory.instance();
+		System.out.println(value1 + "*" + value2 + "*" + value3);
 		zSetOps.add(key, value1, 1.9);
 		zSetOps.add(key, value2, 3.7);
 		zSetOps.add(key, value3, 5.8);
diff --git a/src/test/java/org/springframework/data/redis/core/RedisTemplateTests.java b/src/test/java/org/springframework/data/redis/core/RedisTemplateTests.java
index 93803d373..0212d8cf1 100644
--- a/src/test/java/org/springframework/data/redis/core/RedisTemplateTests.java
+++ b/src/test/java/org/springframework/data/redis/core/RedisTemplateTests.java
@@ -108,7 +108,7 @@ public class RedisTemplateTests<K,V> {
 		assertNotNull(serializedValue);
 		redisTemplate.delete(key1);
 		redisTemplate.restore(key1, serializedValue, 0, TimeUnit.SECONDS);
-		assertEquals(value1, redisTemplate.boundValueOps(key1).get());
+		assertThat(redisTemplate.boundValueOps(key1).get(), isEqual(value1));
 	}
 
 	@Test
@@ -121,7 +121,7 @@ public class RedisTemplateTests<K,V> {
 		assertNotNull(serializedValue);
 		redisTemplate.delete(key1);
 		redisTemplate.restore(key1, serializedValue, 200, TimeUnit.MILLISECONDS);
-		assertEquals(value1, redisTemplate.boundValueOps(key1).get());
+		assertThat(redisTemplate.boundValueOps(key1).get(), isEqual(value1));
 		waitFor(new TestCondition() {
 			public boolean passes() {
 				return (!redisTemplate.hasKey(key1));