diff --git a/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/AnalyzeH2CachesIT.java b/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/AnalyzeH2CachesIT.java
index 7c55849..7ac52f3 100644
--- a/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/AnalyzeH2CachesIT.java
+++ b/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/AnalyzeH2CachesIT.java
@@ -47,11 +47,11 @@
     String result = adminSshSession.exec(cmd);
 
     adminSshSession.assertSuccess();
-    assertThat(result).contains("[cache \"git_file_diff\"]\n" + "\tmaxEntries = 1\n");
-    assertThat(result).contains("[cache \"gerrit_file_diff\"]\n" + "\tmaxEntries = 2\n");
-    assertThat(result).contains("[cache \"accounts\"]\n" + "\tmaxEntries = 4\n");
-    assertThat(result).contains("[cache \"diff_summary\"]\n" + "\tmaxEntries = 1\n");
-    assertThat(result).contains("[cache \"persisted_projects\"]\n" + "\tmaxEntries = 3\n");
+    assertThat(result).contains("[cache \"git_file_diff\"]");
+    assertThat(result).contains("[cache \"gerrit_file_diff\"]");
+    assertThat(result).contains("[cache \"accounts\"]");
+    assertThat(result).contains("[cache \"diff_summary\"]");
+    assertThat(result).contains("[cache \"persisted_projects\"]");
   }
 
   @Test
diff --git a/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/ChronicleMapCacheExtendedIT.java b/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/ChronicleMapCacheExtendedIT.java
index 6fec793..4735477 100644
--- a/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/ChronicleMapCacheExtendedIT.java
+++ b/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/ChronicleMapCacheExtendedIT.java
@@ -77,7 +77,7 @@
   @Override
   protected void beforeTest(Description description) throws Exception {
     super.beforeTest(description);
-    testCacheName += description.getMethodName();
+    testCacheName += System.nanoTime();
   }
 
   @Test