diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepository.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepository.java
index 27284637f3..628e00b395 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepository.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepository.java
@@ -118,9 +118,9 @@ public class RedisMultiMetricRepository implements MultiMetricRepository {
 		Set<String> range = this.zSetOperations.range(0, -1);
 		Collection<String> result = new ArrayList<String>();
 		for (String key : range) {
-			result.add(nameFor(this.prefix + key));
+			result.add(key.substring(this.prefix.length()));
 		}
-		return range;
+		return result;
 	}
 
 	@Override
diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java
index 3c104d0439..853e1e997a 100644
--- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java
+++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMultiMetricRepositoryTests.java
@@ -17,6 +17,7 @@
 package org.springframework.boot.actuate.metrics.repository.redis;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -102,7 +103,9 @@ public class RedisMultiMetricRepositoryTests {
 				"foo.val", 12.3), new Metric<Number>("foo.bar", 11.3)));
 		this.repository.set("bar", Arrays.<Metric<?>> asList(new Metric<Number>(
 				"bar.val", 12.3), new Metric<Number>("bar.foo", 11.3)));
-		assertEquals(2, Iterables.collection(this.repository.groups()).size());
+		Collection<String> groups = Iterables.collection(this.repository.groups());
+		assertEquals(2, groups.size());
+		assertTrue("Wrong groups: " + groups, groups.contains("foo"));
 	}
 
 	@Test