diff --git a/client/src/test/java/com/metamx/druid/client/cache/MapCacheBrokerTest.java b/client/src/test/java/com/metamx/druid/client/cache/MapCacheTest.java
similarity index 98%
rename from client/src/test/java/com/metamx/druid/client/cache/MapCacheBrokerTest.java
rename to client/src/test/java/com/metamx/druid/client/cache/MapCacheTest.java
index 78f071ca539..23a3bd1d641 100644
--- a/client/src/test/java/com/metamx/druid/client/cache/MapCacheBrokerTest.java
+++ b/client/src/test/java/com/metamx/druid/client/cache/MapCacheTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 
 /**
  */
-public class MapCacheBrokerTest
+public class MapCacheTest
 {
   private static final byte[] HI = "hi".getBytes();
   private static final byte[] HO = "ho".getBytes();
diff --git a/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBrokerBenchmark.java b/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBenchmark.java
similarity index 96%
rename from client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBrokerBenchmark.java
rename to client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBenchmark.java
index 7827e0779b0..3a746c9484b 100644
--- a/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBrokerBenchmark.java
+++ b/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBenchmark.java
@@ -17,7 +17,7 @@ import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
-public class MemcachedCacheBrokerBenchmark extends SimpleBenchmark
+public class MemcachedCacheBenchmark extends SimpleBenchmark
 {
   private static final String BASE_KEY = "test_2012-11-26T00:00:00.000Z_2012-11-27T00:00:00.000Z_2012-11-27T04:11:25.979Z_";
   public static final String NAMESPACE = "default";
@@ -114,6 +114,6 @@ public class MemcachedCacheBrokerBenchmark extends SimpleBenchmark
   }
 
   public static void main(String[] args) throws Exception {
-    Runner.main(MemcachedCacheBrokerBenchmark.class, args);
+    Runner.main(MemcachedCacheBenchmark.class, args);
   }
 }
diff --git a/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBrokerTest.java b/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheTest.java
similarity index 99%
rename from client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBrokerTest.java
rename to client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheTest.java
index a87441d5b36..287d208db62 100644
--- a/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheBrokerTest.java
+++ b/client/src/test/java/com/metamx/druid/client/cache/MemcachedCacheTest.java
@@ -50,7 +50,7 @@ import java.util.concurrent.TimeoutException;
 
 /**
  */
-public class MemcachedCacheBrokerTest
+public class MemcachedCacheTest
 {
   private static final byte[] HI = "hi".getBytes();
   private static final byte[] HO = "ho".getBytes();