diff --git a/src/test/java/com/android/tools/r8/keepanno/utils/KeepItemAnnotationGenerator.java b/src/test/java/com/android/tools/r8/keepanno/utils/KeepItemAnnotationGenerator.java
index 016d85c..a84a54e 100644
--- a/src/test/java/com/android/tools/r8/keepanno/utils/KeepItemAnnotationGenerator.java
+++ b/src/test/java/com/android/tools/r8/keepanno/utils/KeepItemAnnotationGenerator.java
@@ -2198,7 +2198,7 @@
       fn.accept(generator);
       String formatted = byteStream.toString();
       if (file.toString().endsWith(".java")) {
-        formatted = CodeGenerationBase.formatRawOutput(formatted);
+        formatted = CodeGenerationBase.javaFormatRawOutput(formatted);
       }
       Path resolved = Paths.get(ToolHelper.getProjectRoot()).resolve(file);
       write.accept(resolved, formatted);
@@ -2217,7 +2217,7 @@
       String formatted = byteStream.toString();
       Path file = source(f.apply(generator));
       if (file.toString().endsWith(".java")) {
-        formatted = CodeGenerationBase.formatRawOutput(formatted);
+        formatted = CodeGenerationBase.javaFormatRawOutput(formatted);
       }
       Path resolved = Paths.get(ToolHelper.getProjectRoot()).resolve(file);
       write.accept(resolved, formatted);
