diff --git a/cli/javatests/com/engflow/bazel/invocation/analyzer/consoleoutput/ConsoleOutputTest.java b/cli/javatests/com/engflow/bazel/invocation/analyzer/consoleoutput/ConsoleOutputTest.java
index df8a5c0..53d1494 100644
--- a/cli/javatests/com/engflow/bazel/invocation/analyzer/consoleoutput/ConsoleOutputTest.java
+++ b/cli/javatests/com/engflow/bazel/invocation/analyzer/consoleoutput/ConsoleOutputTest.java
@@ -29,8 +29,8 @@
 import com.engflow.bazel.invocation.analyzer.core.TestDatum.IntegerDatum;
 import com.engflow.bazel.invocation.analyzer.core.TestDatum.StringDatum;
 import com.google.common.base.Throwables;
+import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.junit.Test;
@@ -211,27 +211,15 @@ public void formatAnalysisDataShouldIncludeData() {
     var myChar = new CharDatum('L');
     var myEmptyString = new StringDatum(null);
 
-    var data =
-        new HashMap<Class<? extends DataProvider>, Map<Class<? extends Datum>, Datum>>() {
-          {
-            put(
-                TestDataProvider.class,
-                new HashMap<>() {
-                  {
-                    put(IntegerDatum.class, myInt);
-                    put(DoubleDatum.class, myDouble);
-                    put(StringDatum.class, myEmptyString);
-                  }
-                });
-            put(
-                TestDataProvider2.class,
-                new HashMap<>() {
-                  {
-                    put(CharDatum.class, myChar);
-                  }
-                });
-          }
-        };
+    Map<Class<? extends DataProvider>, Map<Class<? extends Datum>, Datum>> data =
+        ImmutableMap.of(
+            TestDataProvider.class,
+            ImmutableMap.of(
+                IntegerDatum.class, myInt,
+                DoubleDatum.class, myDouble,
+                StringDatum.class, myEmptyString),
+            TestDataProvider2.class,
+            ImmutableMap.of(CharDatum.class, myChar));
 
     ConsoleOutput consoleOutput = new ConsoleOutput(false, false);
 
@@ -259,27 +247,18 @@ public void formatAnalysisDataWithVerboseShouldIncludeVerboseData() {
     var myChar = new CharDatum('L');
     var myEmptyString = new StringDatum(null);
 
-    var data =
-        new HashMap<Class<? extends DataProvider>, Map<Class<? extends Datum>, Datum>>() {
-          {
-            put(
-                TestDataProvider.class,
-                new HashMap<>() {
-                  {
-                    put(IntegerDatum.class, myInt);
-                    put(DoubleDatum.class, myDouble);
-                    put(StringDatum.class, myEmptyString);
-                  }
-                });
-            put(
-                TestDataProvider2.class,
-                new HashMap<>() {
-                  {
-                    put(CharDatum.class, myChar);
-                  }
-                });
-          }
-        };
+    Map<Class<? extends DataProvider>, Map<Class<? extends Datum>, Datum>> data =
+        ImmutableMap.of(
+            TestDataProvider.class,
+            ImmutableMap.of(
+                IntegerDatum.class,
+                myInt,
+                DoubleDatum.class,
+                myDouble,
+                StringDatum.class,
+                myEmptyString),
+            TestDataProvider2.class,
+            ImmutableMap.of(CharDatum.class, myChar));
 
     ConsoleOutput consoleOutput = new ConsoleOutput(false, true);