diff --git a/java/java-tests/testData/codeInsight/template/SerrConsumerConflict-out.java b/java/java-tests/testData/codeInsight/template/SerrConsumerConflict-out.java
index 8eceabd95384..1dd14da6a657 100644
--- a/java/java-tests/testData/codeInsight/template/SerrConsumerConflict-out.java
+++ b/java/java-tests/testData/codeInsight/template/SerrConsumerConflict-out.java
@@ -2,7 +2,8 @@ import java.util.List;
 
 class System {
 
+  // Conflict resolution deliberately not supported
   static void foo(List<String> ls) {
-    ls.forEach(java.lang.System.err::println<caret>);
+    ls.forEach(System.err::println<caret>);
   }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/codeInsight/template/SerrConsumerConflict.java b/java/java-tests/testData/codeInsight/template/SerrConsumerConflict.java
index ebeca652d2a3..c11bc2bbc13a 100644
--- a/java/java-tests/testData/codeInsight/template/SerrConsumerConflict.java
+++ b/java/java-tests/testData/codeInsight/template/SerrConsumerConflict.java
@@ -2,6 +2,7 @@ import java.util.List;
 
 class System {
 
+  // Conflict resolution deliberately not supported
   static void foo(List<String> ls) {
     ls.forEach(<caret>);
   }