diff --git a/java/codeserver/highlighting/resources/messages/JavaCompilationErrorBundle.properties b/java/codeserver/highlighting/resources/messages/JavaCompilationErrorBundle.properties
index 8015783977bb..fbba78919847 100644
--- a/java/codeserver/highlighting/resources/messages/JavaCompilationErrorBundle.properties
+++ b/java/codeserver/highlighting/resources/messages/JavaCompilationErrorBundle.properties
@@ -516,7 +516,7 @@ unnamed.variable.without.initializer=Unnamed variable declaration must have an i
 return.outside.switch.expression=Return outside of enclosing switch expression
 return.compact.constructor='return' statement is not allowed in compact constructor
 return.outside.method=Return outside method
-return.before.explicit.constructor.call='return' not allowed before ''{0}'' call
+return.before.explicit.constructor.call=''return'' not allowed before ''{0}'' call
 return.value.missing=Missing return value
 return.from.void.method=Cannot return a value from a method with void result type
 return.from.constructor=Cannot return a value from a constructor
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/FlexibleConstructorBodies.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/FlexibleConstructorBodies.java
index 72b54f1baba9..e44e5ceb4fee 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/FlexibleConstructorBodies.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/FlexibleConstructorBodies.java
@@ -49,7 +49,7 @@ class B extends A {
   B(boolean b, int i) {
     <error descr="Cannot reference 'super' before superclass constructor is called">super</error>.i = i;
     <error descr="Cannot reference 'this' before superclass constructor is called">this</error>.i = i;
-    if (false) <error descr="return not allowed before 'super()' call">return;</error>
+    if (false) <error descr="'return' not allowed before 'super()' call">return;</error>
     super(i);
   }
 
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/StatementsBeforeSuper.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/StatementsBeforeSuper.java
index 7b4f8090a462..04aaeb4cc813 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/StatementsBeforeSuper.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/StatementsBeforeSuper.java
@@ -39,7 +39,7 @@ class B extends A {
     }
   }
   B(boolean b, int i) {
-    if (false) <error descr="return not allowed before 'super()' call">return;</error>
+    if (false) <error descr="'return' not allowed before 'super()' call">return;</error>
     super(i);
   }