diff --git a/jvm/jvm-analysis-impl/resources/messages/JvmAnalysisBundle.properties b/jvm/jvm-analysis-impl/resources/messages/JvmAnalysisBundle.properties
index fac18c92efcd..baf983b1d415 100644
--- a/jvm/jvm-analysis-impl/resources/messages/JvmAnalysisBundle.properties
+++ b/jvm/jvm-analysis-impl/resources/messages/JvmAnalysisBundle.properties
@@ -89,9 +89,9 @@ jvm.inspections.testonly.visiblefortesting=@VisibleForTesting makes little sense
 jvm.inspections.test.method.without.assertion.display.name=Test method without any assertions
 jvm.inspections.test.method.without.assertion.problem.descriptor=Test method <code>#ref()</code> contains no assertions #loc
 
-jvm.inspections.test.case.with.constructor.display.name=JUnit TestCase with non-trivial constructors
-jvm.inspections.test.case.with.constructor.problem.descriptor=Initialization logic in constructor <code>#ref()</code> instead of 'setup' life cycle method #loc
-jvm.inspections.test.case.with.constructor.problem.descriptor.initializer=Initialization logic in initializer instead of 'setup' life cycle method
+jvm.inspections.test.case.with.constructor.display.name=TestCase with non-trivial constructors
+jvm.inspections.test.case.with.constructor.problem.descriptor=Initialization logic in constructor <code>#ref()</code> instead of 'setup()' life cycle method #loc
+jvm.inspections.test.case.with.constructor.problem.descriptor.initializer=Initialization logic in initializer instead of 'setup()' life cycle method
 
 jvm.inspections.junit3.super.teardown.display.name=JUnit 3 'super.tearDown()' is not called from 'finally' block
 jvm.inspections.junit3.super.teardown.problem.descriptor=<code>#ref()</code> is not called from 'finally' block #loc
diff --git a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/JavaTestCaseWithConstructorInspectionTest.kt b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/JavaTestCaseWithConstructorInspectionTest.kt
index 612caba76872..4d653c8ccffe 100644
--- a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/JavaTestCaseWithConstructorInspectionTest.kt
+++ b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/JavaTestCaseWithConstructorInspectionTest.kt
@@ -56,7 +56,7 @@ class JavaTestCaseWithConstructorInspectionTest : TestCaseWithConstructorInspect
       import junit.framework.TestCase;
 
       public class TestCaseWithConstructorInspection1 extends TestCase {
-          public <warning descr="Initialization logic in constructor 'TestCaseWithConstructorInspection1()' instead of 'setup' life cycle method">TestCaseWithConstructorInspection1</warning>() {
+          public <warning descr="Initialization logic in constructor 'TestCaseWithConstructorInspection1()' instead of 'setup()' life cycle method">TestCaseWithConstructorInspection1</warning>() {
               System.out.println("");
           }
       }
@@ -68,7 +68,7 @@ class JavaTestCaseWithConstructorInspectionTest : TestCaseWithConstructorInspect
       import junit.framework.TestCase;
       
       public class TestCaseWithConstructorInspection3 extends TestCase {
-          public <warning descr="Initialization logic in constructor 'TestCaseWithConstructorInspection3()' instead of 'setup' life cycle method">TestCaseWithConstructorInspection3</warning>() {
+          public <warning descr="Initialization logic in constructor 'TestCaseWithConstructorInspection3()' instead of 'setup()' life cycle method">TestCaseWithConstructorInspection3</warning>() {
               super();
               System.out.println("TestCaseWithConstructorInspection3.TestCaseWithConstructorInspection3");
           }
@@ -80,7 +80,7 @@ class JavaTestCaseWithConstructorInspectionTest : TestCaseWithConstructorInspect
   fun `test highlighting Junit 4`() {
     myFixture.testHighlighting(ULanguage.JAVA, """
       public class JUnit4TestCaseWithConstructor {
-        public <warning descr="Initialization logic in constructor 'JUnit4TestCaseWithConstructor()' instead of 'setup' life cycle method">JUnit4TestCaseWithConstructor</warning>() {
+        public <warning descr="Initialization logic in constructor 'JUnit4TestCaseWithConstructor()' instead of 'setup()' life cycle method">JUnit4TestCaseWithConstructor</warning>() {
           System.out.println();
           System.out.println();
           System.out.println();
diff --git a/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/KotlinTestCaseWithConstructorInspectionTest.kt b/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/KotlinTestCaseWithConstructorInspectionTest.kt
index 501fa8453927..7c0d4e9e162f 100644
--- a/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/KotlinTestCaseWithConstructorInspectionTest.kt
+++ b/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/KotlinTestCaseWithConstructorInspectionTest.kt
@@ -59,18 +59,17 @@ class KotlinTestCaseWithConstructorInspectionTest : TestCaseWithConstructorInspe
       import junit.framework.TestCase
 
       class TestCaseWithConstructorInspection1() : TestCase() {
-          <warning descr="Initialization logic in constructor 'constructor()' instead of 'setup' life cycle method">constructor</warning>(x: Int) : this() {
+          <warning descr="Initialization logic in constructor 'constructor()' instead of 'setup()' life cycle method">constructor</warning>(x: Int) : this() {
               println(x)
           }
       }
     """.trimIndent(), "TestCaseWithConstructorInspection1")
   }
 
-
   fun `test highlighting Junit 4`() {
     myFixture.testHighlighting(ULanguage.KOTLIN, """
       public class JUnit4TestCaseWithConstructor {
-        <warning descr="Initialization logic in constructor 'constructor()' instead of 'setup' life cycle method">constructor</warning>() {
+        <warning descr="Initialization logic in constructor 'constructor()' instead of 'setup()' life cycle method">constructor</warning>() {
           println()
           println()
           println()