diff --git a/compiler/fir/analysis-tests/test/org/jetbrains/kotlin/test/runners/AbstractFirLoadCompiledKotlinTestBase.kt b/compiler/fir/analysis-tests/test/org/jetbrains/kotlin/test/runners/AbstractFirLoadCompiledJvmKotlinTestBase.kt
similarity index 90%
rename from compiler/fir/analysis-tests/test/org/jetbrains/kotlin/test/runners/AbstractFirLoadCompiledKotlinTestBase.kt
rename to compiler/fir/analysis-tests/test/org/jetbrains/kotlin/test/runners/AbstractFirLoadCompiledJvmKotlinTestBase.kt
index b0ccec93a06..75daa2b7d2a 100644
--- a/compiler/fir/analysis-tests/test/org/jetbrains/kotlin/test/runners/AbstractFirLoadCompiledKotlinTestBase.kt
+++ b/compiler/fir/analysis-tests/test/org/jetbrains/kotlin/test/runners/AbstractFirLoadCompiledJvmKotlinTestBase.kt
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.test.frontend.fir.FirOutputArtifact
 import org.jetbrains.kotlin.test.model.*
 import org.jetbrains.kotlin.test.runners.codegen.commonConfigurationForTest
 
-abstract class AbstractFirLoadCompiledKotlinTestBase<F : ResultingArtifact.FrontendOutput<F>> :
+abstract class AbstractFirLoadCompiledJvmKotlinTestBase<F : ResultingArtifact.FrontendOutput<F>> :
     AbstractKotlinCompilerWithTargetBackendTest(TargetBackend.JVM_IR)
 {
     protected abstract val frontendKind: FrontendKind<F>
@@ -50,7 +50,7 @@ abstract class AbstractFirLoadCompiledKotlinTestBase<F : ResultingArtifact.Front
     }
 }
 
-open class AbstractFirLoadK1CompiledKotlin : AbstractFirLoadCompiledKotlinTestBase<ClassicFrontendOutputArtifact>() {
+open class AbstractFirLoadK1CompiledJvmKotlinTest : AbstractFirLoadCompiledJvmKotlinTestBase<ClassicFrontendOutputArtifact>() {
     override val frontendKind: FrontendKind<ClassicFrontendOutputArtifact>
         get() = FrontendKinds.ClassicFrontend
     override val frontendFacade: Constructor<FrontendFacade<ClassicFrontendOutputArtifact>>
@@ -59,7 +59,7 @@ open class AbstractFirLoadK1CompiledKotlin : AbstractFirLoadCompiledKotlinTestBa
         get() = ::ClassicFrontend2IrConverter
 }
 
-open class AbstractFirLoadK2CompiledKotlin : AbstractFirLoadCompiledKotlinTestBase<FirOutputArtifact>() {
+open class AbstractFirLoadK2CompiledJvmKotlinTest : AbstractFirLoadCompiledJvmKotlinTestBase<FirOutputArtifact>() {
     override val frontendKind: FrontendKind<FirOutputArtifact>
         get() = FrontendKinds.FIR
     override val frontendFacade: Constructor<FrontendFacade<FirOutputArtifact>>
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLoadK1CompiledKotlinGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLoadK1CompiledJvmKotlinTestGenerated.java
similarity index 99%
rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLoadK1CompiledKotlinGenerated.java
rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLoadK1CompiledJvmKotlinTestGenerated.java
index 9856330a5d8..4dc76de5bca 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLoadK1CompiledKotlinGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLoadK1CompiledJvmKotlinTestGenerated.java
@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-public class FirLoadK1CompiledKotlinGenerated extends AbstractFirLoadK1CompiledKotlin {
+public class FirLoadK1CompiledJvmKotlinTestGenerated extends AbstractFirLoadK1CompiledJvmKotlinTest {
     @Nested
     @TestMetadata("compiler/testData/loadJava/compiledKotlin")
     @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLoadK2CompiledKotlinGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLoadK2CompiledJvmKotlinTestGenerated.java
similarity index 99%
rename from compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLoadK2CompiledKotlinGenerated.java
rename to compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLoadK2CompiledJvmKotlinTestGenerated.java
index 202585e7d97..79bd0b8d4b2 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLoadK2CompiledKotlinGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLoadK2CompiledJvmKotlinTestGenerated.java
@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
 
 /** This class is generated by {@link org.jetbrains.kotlin.test.generators.GenerateCompilerTestsKt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
-public class FirLoadK2CompiledKotlinGenerated extends AbstractFirLoadK2CompiledKotlin {
+public class FirLoadK2CompiledJvmKotlinTestGenerated extends AbstractFirLoadK2CompiledJvmKotlinTest {
     @Nested
     @TestMetadata("compiler/testData/loadJava/compiledKotlin")
     @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
index 9c6c9712bd1..4683c70df33 100644
--- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
+++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit5CompilerTests.kt
@@ -265,12 +265,12 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
         }
 
         testGroup("compiler/fir/analysis-tests/tests-gen", "compiler/testData") {
-            testClass<AbstractFirLoadK1CompiledKotlin> {
+            testClass<AbstractFirLoadK1CompiledJvmKotlinTest> {
                 model("loadJava/compiledKotlin", extension = "kt")
                 model("loadJava/compiledKotlinWithStdlib", extension = "kt")
             }
 
-            testClass<AbstractFirLoadK2CompiledKotlin> {
+            testClass<AbstractFirLoadK2CompiledJvmKotlinTest> {
                 model("loadJava/compiledKotlin", extension = "kt")
                 model("loadJava/compiledKotlinWithStdlib", extension = "kt")
             }
diff --git a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
index 0411daa4fde..3ce573fa6b1 100644
--- a/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+++ b/generators/tests/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.assignment.plugin.AbstractFirLightTreeBlackBoxCodege
 import org.jetbrains.kotlin.assignment.plugin.AbstractFirPsiAssignmentPluginDiagnosticTest
 import org.jetbrains.kotlin.assignment.plugin.AbstractIrBlackBoxCodegenTestAssignmentPlugin
 import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirLightTreePluginBlackBoxCodegenTest
-import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirLoadK2CompiledKotlinWithPluginTest
+import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirLoadK2CompiledWithPluginJvmKotlinTest
 import org.jetbrains.kotlin.fir.plugin.runners.AbstractFirPsiPluginDiagnosticTest
 import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5
 import org.jetbrains.kotlin.generators.impl.generateTestGroupSuite
@@ -262,7 +262,7 @@ fun main(args: Array<String>) {
                 model("box")
             }
 
-            testClass<AbstractFirLoadK2CompiledKotlinWithPluginTest> {
+            testClass<AbstractFirLoadK2CompiledWithPluginJvmKotlinTest> {
                 model("firLoadK2Compiled")
             }
         }
diff --git a/plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirLoadK2CompiledKotlinWithPluginTestGenerated.java b/plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirLoadK2CompiledWithPluginJvmKotlinTestGenerated.java
similarity index 92%
rename from plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirLoadK2CompiledKotlinWithPluginTestGenerated.java
rename to plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirLoadK2CompiledWithPluginJvmKotlinTestGenerated.java
index b8609ce115e..e3d0e410392 100644
--- a/plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirLoadK2CompiledKotlinWithPluginTestGenerated.java
+++ b/plugins/fir-plugin-prototype/tests-gen/org/jetbrains/kotlin/fir/plugin/runners/FirLoadK2CompiledWithPluginJvmKotlinTestGenerated.java
@@ -19,7 +19,7 @@ import java.util.regex.Pattern;
 @SuppressWarnings("all")
 @TestMetadata("plugins/fir-plugin-prototype/testData/firLoadK2Compiled")
 @TestDataPath("$PROJECT_ROOT")
-public class FirLoadK2CompiledKotlinWithPluginTestGenerated extends AbstractFirLoadK2CompiledKotlinWithPluginTest {
+public class FirLoadK2CompiledWithPluginJvmKotlinTestGenerated extends AbstractFirLoadK2CompiledWithPluginJvmKotlinTest {
     @Test
     public void testAllFilesPresentInFirLoadK2Compiled() throws Exception {
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/fir-plugin-prototype/testData/firLoadK2Compiled"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
diff --git a/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt b/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt
index fa4f61cd7ff..dfc55ce84e7 100644
--- a/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt
+++ b/plugins/fir-plugin-prototype/tests/org/jetbrains/kotlin/fir/plugin/runners/PluginPrototypeTests.kt
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.plugin.services.PluginAnnotationsProvider
 import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.ENABLE_PLUGIN_PHASES
 import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_DUMP
-import org.jetbrains.kotlin.test.runners.AbstractFirLoadK2CompiledKotlin
+import org.jetbrains.kotlin.test.runners.AbstractFirLoadK2CompiledJvmKotlinTest
 import org.jetbrains.kotlin.test.runners.AbstractFirPsiDiagnosticTest
 import org.jetbrains.kotlin.test.runners.codegen.AbstractFirLightTreeBlackBoxCodegenTest
 import org.jetbrains.kotlin.test.runners.enableLazyResolvePhaseChecking
@@ -29,7 +29,7 @@ abstract class AbstractFirPsiPluginDiagnosticTest : AbstractFirPsiDiagnosticTest
     }
 }
 
-open class AbstractFirLoadK2CompiledKotlinWithPluginTest : AbstractFirLoadK2CompiledKotlin() {
+open class AbstractFirLoadK2CompiledWithPluginJvmKotlinTest : AbstractFirLoadK2CompiledJvmKotlinTest() {
     override fun configure(builder: TestConfigurationBuilder) {
         super.configure(builder)
         builder.commonFirWithPluginFrontendConfiguration()