diff --git a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/junit/JavaJUnitMalformedDeclarationTest.kt b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/junit/JavaJUnitMalformedDeclarationInspectionTest.kt
similarity index 99%
rename from jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/junit/JavaJUnitMalformedDeclarationTest.kt
rename to jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/junit/JavaJUnitMalformedDeclarationInspectionTest.kt
index e9d5b42635f0..b919d7ddce5c 100644
--- a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/junit/JavaJUnitMalformedDeclarationTest.kt
+++ b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/junit/JavaJUnitMalformedDeclarationInspectionTest.kt
@@ -1,9 +1,9 @@
 package com.intellij.codeInspection.tests.java.test.junit
 
 import com.intellij.codeInspection.tests.ULanguage
-import com.intellij.codeInspection.tests.test.junit.JUnitMalformedDeclarationTestBase
+import com.intellij.codeInspection.tests.test.junit.JUnitMalformedDeclarationInspectionTestBase
 
-class JavaJUnitMalformedDeclarationTest : JUnitMalformedDeclarationTestBase() {
+class JavaJUnitMalformedDeclarationInspectionTest : JUnitMalformedDeclarationInspectionTestBase() {
   /* Malformed extensions */
   fun `test malformed extension no highlighting`() {
     myFixture.testHighlighting(ULanguage.JAVA, """
diff --git a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/junit/JavaJUnitUnconstructableInspectionTest.kt b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/junit/JavaJUnitUnconstructableInspectionTest.kt
index 22b069a4ece4..64274de0b8c4 100644
--- a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/junit/JavaJUnitUnconstructableInspectionTest.kt
+++ b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/tests/java/test/junit/JavaJUnitUnconstructableInspectionTest.kt
@@ -1,9 +1,9 @@
 package com.intellij.codeInspection.tests.java.test.junit
 
 import com.intellij.codeInspection.tests.ULanguage
-import com.intellij.codeInspection.tests.test.junit.JUnitUnconstructableTestCaseTestBase
+import com.intellij.codeInspection.tests.test.junit.JUnitUnconstructableTestCaseInspectionTestBase
 
-class JavaJUnitUnconstructableInspectionTest : JUnitUnconstructableTestCaseTestBase() {
+class JavaJUnitUnconstructableInspectionTest : JUnitUnconstructableTestCaseInspectionTestBase() {
   fun testPlain() {
     myFixture.testHighlighting(ULanguage.JAVA, """
       class Plain { }
diff --git a/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/junit/KotlinJUnitMalformedDeclarationTest.kt b/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/junit/KotlinJUnitMalformedDeclarationInspectionTest.kt
similarity index 99%
rename from jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/junit/KotlinJUnitMalformedDeclarationTest.kt
rename to jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/junit/KotlinJUnitMalformedDeclarationInspectionTest.kt
index 08f449aa5762..9e3891fd1738 100644
--- a/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/junit/KotlinJUnitMalformedDeclarationTest.kt
+++ b/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/junit/KotlinJUnitMalformedDeclarationInspectionTest.kt
@@ -1,7 +1,7 @@
 package com.intellij.codeInspection.tests.kotlin.test.junit
 
 import com.intellij.codeInspection.tests.ULanguage
-import com.intellij.codeInspection.tests.test.junit.JUnitMalformedDeclarationTestBase
+import com.intellij.codeInspection.tests.test.junit.JUnitMalformedDeclarationInspectionTestBase
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.roots.ContentEntry
 import com.intellij.openapi.roots.ModifiableRootModel
@@ -10,7 +10,7 @@ import com.intellij.testFramework.PsiTestUtil
 import com.intellij.util.PathUtil
 import java.io.File
 
-class KotlinJUnitMalformedDeclarationTest : JUnitMalformedDeclarationTestBase() {
+class KotlinJUnitMalformedDeclarationInspectionTest : JUnitMalformedDeclarationInspectionTestBase() {
   override fun getProjectDescriptor(): LightProjectDescriptor = object : JUnitProjectDescriptor(sdkLevel) {
     override fun configureModule(module: Module, model: ModifiableRootModel, contentEntry: ContentEntry) {
       super.configureModule(module, model, contentEntry)
diff --git a/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/junit/KotlinJUnitUnconstructableInspectionTest.kt b/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/junit/KotlinJUnitUnconstructableInspectionTest.kt
index 8783a5303cf8..ef96d736cc18 100644
--- a/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/junit/KotlinJUnitUnconstructableInspectionTest.kt
+++ b/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/tests/kotlin/test/junit/KotlinJUnitUnconstructableInspectionTest.kt
@@ -1,9 +1,9 @@
 package com.intellij.codeInspection.tests.kotlin.test.junit
 
 import com.intellij.codeInspection.tests.ULanguage
-import com.intellij.codeInspection.tests.test.junit.JUnitUnconstructableTestCaseTestBase
+import com.intellij.codeInspection.tests.test.junit.JUnitUnconstructableTestCaseInspectionTestBase
 
-class KotlinJUnitUnconstructableInspectionTest : JUnitUnconstructableTestCaseTestBase() {
+class KotlinJUnitUnconstructableInspectionTest : JUnitUnconstructableTestCaseInspectionTestBase() {
   fun testPlain() {
     myFixture.testHighlighting(ULanguage.KOTLIN, """
       class Plain { }
diff --git a/jvm/jvm-analysis-tests/src/com/intellij/codeInspection/tests/test/junit/JUnitMalformedDeclarationTestBase.kt b/jvm/jvm-analysis-tests/src/com/intellij/codeInspection/tests/test/junit/JUnitMalformedDeclarationInspectionTestBase.kt
similarity index 91%
rename from jvm/jvm-analysis-tests/src/com/intellij/codeInspection/tests/test/junit/JUnitMalformedDeclarationTestBase.kt
rename to jvm/jvm-analysis-tests/src/com/intellij/codeInspection/tests/test/junit/JUnitMalformedDeclarationInspectionTestBase.kt
index 9c93c8b4a42a..3aebf3b55c52 100644
--- a/jvm/jvm-analysis-tests/src/com/intellij/codeInspection/tests/test/junit/JUnitMalformedDeclarationTestBase.kt
+++ b/jvm/jvm-analysis-tests/src/com/intellij/codeInspection/tests/test/junit/JUnitMalformedDeclarationInspectionTestBase.kt
@@ -8,7 +8,7 @@ import com.intellij.openapi.roots.ModifiableRootModel
 import com.intellij.pom.java.LanguageLevel
 import com.intellij.testFramework.LightProjectDescriptor
 
-abstract class JUnitMalformedDeclarationTestBase : UastInspectionTestBase() {
+abstract class JUnitMalformedDeclarationInspectionTestBase : UastInspectionTestBase() {
   override val inspection = JUnitMalformedDeclarationInspection()
 
   protected open class JUnitProjectDescriptor(languageLevel: LanguageLevel) : ProjectDescriptor(languageLevel) {
diff --git a/jvm/jvm-analysis-tests/src/com/intellij/codeInspection/tests/test/junit/JUnitUnconstructableTestCaseTestBase.kt b/jvm/jvm-analysis-tests/src/com/intellij/codeInspection/tests/test/junit/JUnitUnconstructableTestCaseInspectionTestBase.kt
similarity index 92%
rename from jvm/jvm-analysis-tests/src/com/intellij/codeInspection/tests/test/junit/JUnitUnconstructableTestCaseTestBase.kt
rename to jvm/jvm-analysis-tests/src/com/intellij/codeInspection/tests/test/junit/JUnitUnconstructableTestCaseInspectionTestBase.kt
index 02640c98ca98..0aa20a0f4b1c 100644
--- a/jvm/jvm-analysis-tests/src/com/intellij/codeInspection/tests/test/junit/JUnitUnconstructableTestCaseTestBase.kt
+++ b/jvm/jvm-analysis-tests/src/com/intellij/codeInspection/tests/test/junit/JUnitUnconstructableTestCaseInspectionTestBase.kt
@@ -3,7 +3,7 @@ package com.intellij.codeInspection.tests.test.junit
 import com.intellij.codeInspection.test.junit.JUnitUnconstructableTestCaseInspection
 import com.intellij.codeInspection.tests.UastInspectionTestBase
 
-abstract class JUnitUnconstructableTestCaseTestBase : UastInspectionTestBase() {
+abstract class JUnitUnconstructableTestCaseInspectionTestBase : UastInspectionTestBase() {
   override val inspection = JUnitUnconstructableTestCaseInspection()
 
   override fun setUp() {