diff --git a/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/ChronicleMapCacheTest.java b/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/ChronicleMapCacheTest.java
index 5d380ff..739c688 100644
--- a/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/ChronicleMapCacheTest.java
+++ b/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/ChronicleMapCacheTest.java
@@ -406,7 +406,7 @@
     gerritConfig.setInt("cache", TEST_CACHE_NAME, "percentageHotKeys", percentageHotKeys);
     gerritConfig.save();
 
-    ChronicleMapCacheImpl<String, String> cache = newCacheWithMetrics(TEST_CACHE_NAME, cachedValue);
+    newCacheWithMetrics(TEST_CACHE_NAME, cachedValue);
 
     assertThat(getMetric(hotKeysCapacityMetricName).getValue()).isEqualTo(expectedCapacity);
   }
@@ -503,16 +503,6 @@
     return newCache(true, cacheName, cachedValue, null, null, null, null, 1, metricMaker);
   }
 
-  private ChronicleMapCacheImpl<String, String> newCacheWithMetrics(
-      String cacheName,
-      String cachedValue,
-      CacheSerializer<String> keySerializer,
-      CacheSerializer<String> valueSerializer)
-      throws IOException {
-    return newCache(
-        true, cacheName, cachedValue, null, null, null, null, 1, new DisabledMetricMaker());
-  }
-
   private ChronicleMapCacheImpl<String, String> newCache(
       Boolean withLoader,
       String cacheName,
