diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmIrAgainstOldBoxTestGenerated.java
similarity index 91%
rename from compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxTestGenerated.java
rename to compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmIrAgainstOldBoxTestGenerated.java
index cc3c7b87494..9b7a4574475 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmIrAgainstOldBoxTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmIrAgainstOldBoxTestGenerated.java
@@ -3,649 +3,741 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.codegen.ir;
+package org.jetbrains.kotlin.test.runners.codegen;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
 import org.jetbrains.kotlin.test.TargetBackend;
 import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.regex.Pattern;
 
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin")
 @TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
 public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath);
-    }
-
+    @Test
     public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception {
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true);
     }
 
+    @Test
     @TestMetadata("annotationInInterface.kt")
     public void testAnnotationInInterface() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationInInterface.kt");
     }
 
+    @Test
     @TestMetadata("annotationOnTypeUseInTypeAlias.kt")
     public void testAnnotationOnTypeUseInTypeAlias() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationOnTypeUseInTypeAlias.kt");
     }
 
+    @Test
     @TestMetadata("annotationsOnTypeAliases.kt")
     public void testAnnotationsOnTypeAliases() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationsOnTypeAliases.kt");
     }
 
+    @Test
     @TestMetadata("callDeserializedPropertyOnInlineClassType.kt")
     public void testCallDeserializedPropertyOnInlineClassType() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassType.kt");
     }
 
+    @Test
     @TestMetadata("callDeserializedPropertyOnInlineClassTypeOldMangling.kt")
     public void testCallDeserializedPropertyOnInlineClassTypeOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassTypeOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("callsToMultifileClassFromOtherPackage.kt")
     public void testCallsToMultifileClassFromOtherPackage() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/callsToMultifileClassFromOtherPackage.kt");
     }
 
+    @Test
     @TestMetadata("clashingFakeOverrideSignatures.kt")
     public void testClashingFakeOverrideSignatures() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt");
     }
 
+    @Test
     @TestMetadata("classInObject.kt")
     public void testClassInObject() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/classInObject.kt");
     }
 
+    @Test
     @TestMetadata("companionObjectInEnum.kt")
     public void testCompanionObjectInEnum() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/companionObjectInEnum.kt");
     }
 
+    @Test
     @TestMetadata("companionObjectMember.kt")
     public void testCompanionObjectMember() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/companionObjectMember.kt");
     }
 
+    @Test
     @TestMetadata("constPropertyReferenceFromMultifileClass.kt")
     public void testConstPropertyReferenceFromMultifileClass() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/constPropertyReferenceFromMultifileClass.kt");
     }
 
+    @Test
     @TestMetadata("constructorVararg.kt")
     public void testConstructorVararg() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/constructorVararg.kt");
     }
 
+    @Test
     @TestMetadata("constructorWithInlineClassParametersInBinaryDependencies.kt")
     public void testConstructorWithInlineClassParametersInBinaryDependencies() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependencies.kt");
     }
 
+    @Test
     @TestMetadata("constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt")
     public void testConstructorWithInlineClassParametersInBinaryDependenciesOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("copySamOnInline.kt")
     public void testCopySamOnInline() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/copySamOnInline.kt");
     }
 
+    @Test
     @TestMetadata("copySamOnInline2.kt")
     public void testCopySamOnInline2() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/copySamOnInline2.kt");
     }
 
+    @Test
     @TestMetadata("coroutinesBinary.kt")
     public void testCoroutinesBinary() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/coroutinesBinary.kt");
     }
 
+    @Test
     @TestMetadata("defaultConstructor.kt")
     public void testDefaultConstructor() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultConstructor.kt");
     }
 
+    @Test
     @TestMetadata("defaultLambdaRegeneration.kt")
     public void testDefaultLambdaRegeneration() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultLambdaRegeneration.kt");
     }
 
+    @Test
     @TestMetadata("defaultLambdaRegeneration2.kt")
     public void testDefaultLambdaRegeneration2() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultLambdaRegeneration2.kt");
     }
 
+    @Test
     @TestMetadata("defaultWithInlineClassAndReceivers.kt")
     public void testDefaultWithInlineClassAndReceivers() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceivers.kt");
     }
 
+    @Test
     @TestMetadata("defaultWithInlineClassAndReceiversOldMangling.kt")
     public void testDefaultWithInlineClassAndReceiversOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceiversOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("delegatedDefault.kt")
     public void testDelegatedDefault() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/delegatedDefault.kt");
     }
 
+    @Test
     @TestMetadata("delegationAndAnnotations.kt")
     public void testDelegationAndAnnotations() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/delegationAndAnnotations.kt");
     }
 
+    @Test
     @TestMetadata("doublyNestedClass.kt")
     public void testDoublyNestedClass() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/doublyNestedClass.kt");
     }
 
+    @Test
     @TestMetadata("enum.kt")
     public void testEnum() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/enum.kt");
     }
 
+    @Test
     @TestMetadata("expectClassActualTypeAlias.kt")
     public void testExpectClassActualTypeAlias() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/expectClassActualTypeAlias.kt");
     }
 
+    @Test
     @TestMetadata("fakeOverridesForIntersectionTypes.kt")
     public void testFakeOverridesForIntersectionTypes() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fakeOverridesForIntersectionTypes.kt");
     }
 
+    @Test
     @TestMetadata("importCompanion.kt")
     public void testImportCompanion() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/importCompanion.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassFakeOverrideMangling.kt")
     public void testInlineClassFakeOverrideMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassFakeOverrideMangling.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassFakeOverrideManglingOldMangling.kt")
     public void testInlineClassFakeOverrideManglingOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassFakeOverrideManglingOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassFromBinaryDependencies.kt")
     public void testInlineClassFromBinaryDependencies() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassFromBinaryDependencies.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassFromBinaryDependenciesOldMangling.kt")
     public void testInlineClassFromBinaryDependenciesOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassFromBinaryDependenciesOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassInlineFunctionCall.kt")
     public void testInlineClassInlineFunctionCall() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassInlineFunctionCall.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassInlineFunctionCallOldMangling.kt")
     public void testInlineClassInlineFunctionCallOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassInlineFunctionCallOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassInlineProperty.kt")
     public void testInlineClassInlineProperty() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassInlineProperty.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassInlinePropertyOldMangling.kt")
     public void testInlineClassInlinePropertyOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassInlinePropertyOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassesOldMangling.kt")
     public void testInlineClassesOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("inlinedConstants.kt")
     public void testInlinedConstants() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlinedConstants.kt");
     }
 
+    @Test
     @TestMetadata("innerClassConstructor.kt")
     public void testInnerClassConstructor() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/innerClassConstructor.kt");
     }
 
+    @Test
     @TestMetadata("interfaceDelegationAndBridgesProcessing.kt")
     public void testInterfaceDelegationAndBridgesProcessing() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/interfaceDelegationAndBridgesProcessing.kt");
     }
 
+    @Test
     @TestMetadata("internalSetterOverridden.kt")
     public void testInternalSetterOverridden() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/internalSetterOverridden.kt");
     }
 
+    @Test
     @TestMetadata("internalWithDefaultArgs.kt")
     public void testInternalWithDefaultArgs() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/internalWithDefaultArgs.kt");
     }
 
+    @Test
     @TestMetadata("internalWithInlineClass.kt")
     public void testInternalWithInlineClass() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/internalWithInlineClass.kt");
     }
 
+    @Test
     @TestMetadata("internalWithOtherModuleName.kt")
     public void testInternalWithOtherModuleName() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/internalWithOtherModuleName.kt");
     }
 
+    @Test
     @TestMetadata("intersectionOverrideProperies.kt")
     public void testIntersectionOverrideProperies() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/intersectionOverrideProperies.kt");
     }
 
+    @Test
     @TestMetadata("jvmField.kt")
     public void testJvmField() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmField.kt");
     }
 
+    @Test
     @TestMetadata("jvmFieldInAnnotationCompanion.kt")
     public void testJvmFieldInAnnotationCompanion() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmFieldInAnnotationCompanion.kt");
     }
 
+    @Test
     @TestMetadata("jvmFieldInConstructor.kt")
     public void testJvmFieldInConstructor() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmFieldInConstructor.kt");
     }
 
+    @Test
     @TestMetadata("jvmFieldInInterfaceCompanion.kt")
     public void testJvmFieldInInterfaceCompanion() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmFieldInInterfaceCompanion.kt");
     }
 
+    @Test
     @TestMetadata("jvmNames.kt")
     public void testJvmNames() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmNames.kt");
     }
 
+    @Test
     @TestMetadata("jvmPackageName.kt")
     public void testJvmPackageName() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageName.kt");
     }
 
+    @Test
     @TestMetadata("jvmPackageNameInRootPackage.kt")
     public void testJvmPackageNameInRootPackage() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageNameInRootPackage.kt");
     }
 
+    @Test
     @TestMetadata("jvmPackageNameMultifileClass.kt")
     public void testJvmPackageNameMultifileClass() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageNameMultifileClass.kt");
     }
 
+    @Test
     @TestMetadata("jvmPackageNameWithJvmName.kt")
     public void testJvmPackageNameWithJvmName() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageNameWithJvmName.kt");
     }
 
+    @Test
     @TestMetadata("jvmStaticInObject.kt")
     public void testJvmStaticInObject() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmStaticInObject.kt");
     }
 
+    @Test
     @TestMetadata("jvmStaticInObjectPropertyReference.kt")
     public void testJvmStaticInObjectPropertyReference() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmStaticInObjectPropertyReference.kt");
     }
 
+    @Test
     @TestMetadata("kotlinPropertyAsAnnotationParameter.kt")
     public void testKotlinPropertyAsAnnotationParameter() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/kotlinPropertyAsAnnotationParameter.kt");
     }
 
+    @Test
     @TestMetadata("kt14012.kt")
     public void testKt14012() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/kt14012.kt");
     }
 
+    @Test
     @TestMetadata("kt14012_multi.kt")
     public void testKt14012_multi() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/kt14012_multi.kt");
     }
 
+    @Test
     @TestMetadata("kt21775.kt")
     public void testKt21775() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/kt21775.kt");
     }
 
+    @Test
     @TestMetadata("metadataForMembersInLocalClassInInitializer.kt")
     public void testMetadataForMembersInLocalClassInInitializer() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/metadataForMembersInLocalClassInInitializer.kt");
     }
 
+    @Test
     @TestMetadata("multifileClassInlineFunctionAccessingProperty.kt")
     public void testMultifileClassInlineFunctionAccessingProperty() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/multifileClassInlineFunctionAccessingProperty.kt");
     }
 
+    @Test
     @TestMetadata("multifileClassWithTypealias.kt")
     public void testMultifileClassWithTypealias() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/multifileClassWithTypealias.kt");
     }
 
+    @Test
     @TestMetadata("nestedClass.kt")
     public void testNestedClass() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedClass.kt");
     }
 
+    @Test
     @TestMetadata("nestedClassInAnnotationArgument.kt")
     public void testNestedClassInAnnotationArgument() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedClassInAnnotationArgument.kt");
     }
 
+    @Test
     @TestMetadata("nestedEnum.kt")
     public void testNestedEnum() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedEnum.kt");
     }
 
+    @Test
     @TestMetadata("nestedFunctionTypeAliasExpansion.kt")
     public void testNestedFunctionTypeAliasExpansion() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedFunctionTypeAliasExpansion.kt");
     }
 
+    @Test
     @TestMetadata("nestedObject.kt")
     public void testNestedObject() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedObject.kt");
     }
 
+    @Test
     @TestMetadata("nestedTypeAliasExpansion.kt")
     public void testNestedTypeAliasExpansion() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedTypeAliasExpansion.kt");
     }
 
+    @Test
     @TestMetadata("noExplicitOverrideForDelegatedFromSupertype.kt")
     public void testNoExplicitOverrideForDelegatedFromSupertype() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/noExplicitOverrideForDelegatedFromSupertype.kt");
     }
 
+    @Test
     @TestMetadata("optionalAnnotation.kt")
     public void testOptionalAnnotation() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/optionalAnnotation.kt");
     }
 
+    @Test
     @TestMetadata("platformTypes.kt")
     public void testPlatformTypes() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/platformTypes.kt");
     }
 
+    @Test
     @TestMetadata("privateCompanionObjectValInDifferentModule.kt")
     public void testPrivateCompanionObjectValInDifferentModule() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModule.kt");
     }
 
+    @Test
     @TestMetadata("privateCompanionObjectValInDifferentModuleOldMangling.kt")
     public void testPrivateCompanionObjectValInDifferentModuleOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModuleOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("privateTopLevelValInDifferentModule.kt")
     public void testPrivateTopLevelValInDifferentModule() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModule.kt");
     }
 
+    @Test
     @TestMetadata("privateTopLevelValInDifferentModuleOldMangling.kt")
     public void testPrivateTopLevelValInDifferentModuleOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModuleOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("propertyReference.kt")
     public void testPropertyReference() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/propertyReference.kt");
     }
 
+    @Test
     @TestMetadata("recursiveGeneric.kt")
     public void testRecursiveGeneric() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/recursiveGeneric.kt");
     }
 
+    @Test
     @TestMetadata("reflectTopLevelFunctionOtherFile.kt")
     public void testReflectTopLevelFunctionOtherFile() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/reflectTopLevelFunctionOtherFile.kt");
     }
 
+    @Test
     @TestMetadata("sealedClass.kt")
     public void testSealedClass() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/sealedClass.kt");
     }
 
+    @Test
     @TestMetadata("secondaryConstructors.kt")
     public void testSecondaryConstructors() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/secondaryConstructors.kt");
     }
 
+    @Test
     @TestMetadata("simple.kt")
     public void testSimple() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/simple.kt");
     }
 
+    @Test
     @TestMetadata("simpleValAnonymousObject.kt")
     public void testSimpleValAnonymousObject() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/simpleValAnonymousObject.kt");
     }
 
+    @Test
     @TestMetadata("specialBridgesInDependencies.kt")
     public void testSpecialBridgesInDependencies() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/specialBridgesInDependencies.kt");
     }
 
+    @Test
     @TestMetadata("starImportEnum.kt")
     public void testStarImportEnum() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/starImportEnum.kt");
     }
 
+    @Test
     @TestMetadata("suspendFunWithDefaultMangling.kt")
     public void testSuspendFunWithDefaultMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt");
     }
 
+    @Test
     @TestMetadata("suspendFunWithDefaultOldMangling.kt")
     public void testSuspendFunWithDefaultOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("targetedJvmName.kt")
     public void testTargetedJvmName() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/targetedJvmName.kt");
     }
 
+    @Test
     @TestMetadata("typeAliasesKt13181.kt")
     public void testTypeAliasesKt13181() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAliasesKt13181.kt");
     }
 
+    @Test
     @TestMetadata("unsignedTypesInAnnotations.kt")
     public void testUnsignedTypesInAnnotations() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt");
     }
 
+    @Test
     @TestMetadata("useDeserializedFunInterface.kt")
     public void testUseDeserializedFunInterface() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/useDeserializedFunInterface.kt");
     }
 
+    @Nested
     @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Fir extends AbstractJvmIrAgainstOldBoxTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath);
-        }
-
+    public class Fir extends AbstractJvmIrAgainstOldBoxTest {
+        @Test
         public void testAllFilesPresentInFir() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true);
         }
 
+        @Test
         @TestMetadata("AnonymousObjectInProperty.kt")
         public void testAnonymousObjectInProperty() throws Exception {
             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/AnonymousObjectInProperty.kt");
         }
 
+        @Test
         @TestMetadata("ExistingSymbolInFakeOverride.kt")
         public void testExistingSymbolInFakeOverride() throws Exception {
             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/ExistingSymbolInFakeOverride.kt");
         }
 
+        @Test
         @TestMetadata("IncrementalCompilerRunner.kt")
         public void testIncrementalCompilerRunner() throws Exception {
             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IncrementalCompilerRunner.kt");
         }
 
+        @Test
         @TestMetadata("IrConstAcceptMultiModule.kt")
         public void testIrConstAcceptMultiModule() throws Exception {
             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IrConstAcceptMultiModule.kt");
         }
 
+        @Test
         @TestMetadata("LibraryProperty.kt")
         public void testLibraryProperty() throws Exception {
             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/LibraryProperty.kt");
         }
     }
 
+    @Nested
     @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jvm8 extends AbstractJvmIrAgainstOldBoxTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath);
-        }
-
+    public class Jvm8 extends AbstractJvmIrAgainstOldBoxTest {
+        @Test
         public void testAllFilesPresentInJvm8() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true);
         }
 
+        @Nested
         @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults")
         @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Defaults extends AbstractJvmIrAgainstOldBoxTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath);
-            }
-
+        public class Defaults extends AbstractJvmIrAgainstOldBoxTest {
+            @Test
             public void testAllFilesPresentInDefaults() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true);
             }
 
+            @Test
             @TestMetadata("superCall.kt")
             public void testSuperCall() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt");
             }
 
+            @Test
             @TestMetadata("superCallFromInterface.kt")
             public void testSuperCallFromInterface() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt");
             }
 
+            @Test
             @TestMetadata("superCallFromInterface2.kt")
             public void testSuperCallFromInterface2() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt");
             }
 
+            @Test
             @TestMetadata("superPropAccess.kt")
             public void testSuperPropAccess() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt");
             }
 
+            @Test
             @TestMetadata("superPropAccessFromInterface.kt")
             public void testSuperPropAccessFromInterface() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt");
             }
 
+            @Test
             @TestMetadata("superPropAccessFromInterface2.kt")
             public void testSuperPropAccessFromInterface2() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt");
             }
 
+            @Nested
             @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility")
             @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class AllCompatibility extends AbstractJvmIrAgainstOldBoxTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath);
-                }
-
+            public class AllCompatibility extends AbstractJvmIrAgainstOldBoxTest {
+                @Test
                 public void testAllFilesPresentInAllCompatibility() throws Exception {
                     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true);
                 }
 
+                @Test
                 @TestMetadata("callStackTrace.kt")
                 public void testCallStackTrace() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/callStackTrace.kt");
                 }
 
+                @Test
                 @TestMetadata("superCall.kt")
                 public void testSuperCall() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/superCall.kt");
                 }
 
+                @Test
                 @TestMetadata("superCallFromInterface.kt")
                 public void testSuperCallFromInterface() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/superCallFromInterface.kt");
                 }
 
+                @Test
                 @TestMetadata("superCallFromInterface2.kt")
                 public void testSuperCallFromInterface2() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/superCallFromInterface2.kt");
                 }
 
+                @Test
                 @TestMetadata("superPropAccess.kt")
                 public void testSuperPropAccess() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/superPropAccess.kt");
                 }
 
+                @Test
                 @TestMetadata("superPropAccessFromInterface.kt")
                 public void testSuperPropAccessFromInterface() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/superPropAccessFromInterface.kt");
                 }
 
+                @Test
                 @TestMetadata("superPropAccessFromInterface2.kt")
                 public void testSuperPropAccessFromInterface2() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/superPropAccessFromInterface2.kt");
                 }
 
+                @Nested
                 @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy")
                 @TestDataPath("$PROJECT_ROOT")
-                @RunWith(JUnit3RunnerWithInners.class)
-                public static class DelegationBy extends AbstractJvmIrAgainstOldBoxTest {
-                    private void runTest(String testDataFilePath) throws Exception {
-                        KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath);
-                    }
-
+                public class DelegationBy extends AbstractJvmIrAgainstOldBoxTest {
+                    @Test
                     public void testAllFilesPresentInDelegationBy() throws Exception {
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true);
                     }
 
+                    @Test
                     @TestMetadata("simple.kt")
                     public void testSimple() throws Exception {
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy/simple.kt");
                     }
 
+                    @Test
                     @TestMetadata("simpleProperty.kt")
                     public void testSimpleProperty() throws Exception {
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy/simpleProperty.kt");
@@ -653,48 +745,52 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
                 }
             }
 
+            @Nested
             @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop")
             @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class Interop extends AbstractJvmIrAgainstOldBoxTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath);
-                }
-
+            public class Interop extends AbstractJvmIrAgainstOldBoxTest {
+                @Test
                 public void testAllFilesPresentInInterop() throws Exception {
                     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true);
                 }
 
+                @Test
                 @TestMetadata("likeMemberClash.kt")
                 public void testLikeMemberClash() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/likeMemberClash.kt");
                 }
 
+                @Test
                 @TestMetadata("likeSpecialization.kt")
                 public void testLikeSpecialization() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/likeSpecialization.kt");
                 }
 
+                @Test
                 @TestMetadata("newAndOldSchemes.kt")
                 public void testNewAndOldSchemes() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes.kt");
                 }
 
+                @Test
                 @TestMetadata("newAndOldSchemes2.kt")
                 public void testNewAndOldSchemes2() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes2.kt");
                 }
 
+                @Test
                 @TestMetadata("newAndOldSchemes2Compatibility.kt")
                 public void testNewAndOldSchemes2Compatibility() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes2Compatibility.kt");
                 }
 
+                @Test
                 @TestMetadata("newAndOldSchemes3.kt")
                 public void testNewAndOldSchemes3() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt");
                 }
 
+                @Test
                 @TestMetadata("newSchemeWithJvmDefault.kt")
                 public void testNewSchemeWithJvmDefault() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt");
@@ -702,70 +798,73 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
             }
         }
 
+        @Nested
         @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6")
         @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Jvm8against6 extends AbstractJvmIrAgainstOldBoxTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath);
-            }
-
+        public class Jvm8against6 extends AbstractJvmIrAgainstOldBoxTest {
+            @Test
             public void testAllFilesPresentInJvm8against6() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true);
             }
 
+            @Test
             @TestMetadata("jdk8Against6.kt")
             public void testJdk8Against6() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/jdk8Against6.kt");
             }
 
+            @Test
             @TestMetadata("simpleCall.kt")
             public void testSimpleCall() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCall.kt");
             }
 
+            @Test
             @TestMetadata("simpleCallWithBigHierarchy.kt")
             public void testSimpleCallWithBigHierarchy() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithBigHierarchy.kt");
             }
 
+            @Test
             @TestMetadata("simpleCallWithHierarchy.kt")
             public void testSimpleCallWithHierarchy() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithHierarchy.kt");
             }
 
+            @Test
             @TestMetadata("simpleProp.kt")
             public void testSimpleProp() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleProp.kt");
             }
 
+            @Test
             @TestMetadata("simplePropWithHierarchy.kt")
             public void testSimplePropWithHierarchy() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simplePropWithHierarchy.kt");
             }
 
+            @Nested
             @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation")
             @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class Delegation extends AbstractJvmIrAgainstOldBoxTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath);
-                }
-
+            public class Delegation extends AbstractJvmIrAgainstOldBoxTest {
+                @Test
                 public void testAllFilesPresentInDelegation() throws Exception {
                     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true);
                 }
 
+                @Test
                 @TestMetadata("diamond.kt")
                 public void testDiamond() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond.kt");
                 }
 
+                @Test
                 @TestMetadata("diamond2.kt")
                 public void testDiamond2() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond2.kt");
                 }
 
+                @Test
                 @TestMetadata("diamond3.kt")
                 public void testDiamond3() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond3.kt");
@@ -774,18 +873,16 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
         }
     }
 
+    @Nested
     @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class TypeAnnotations extends AbstractJvmIrAgainstOldBoxTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, testDataFilePath);
-        }
-
+    public class TypeAnnotations extends AbstractJvmIrAgainstOldBoxTest {
+        @Test
         public void testAllFilesPresentInTypeAnnotations() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true);
         }
 
+        @Test
         @TestMetadata("implicitReturn.kt")
         public void testImplicitReturn() throws Exception {
             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations/implicitReturn.kt");
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmOldAgainstIrBoxTestGenerated.java
similarity index 91%
rename from compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxTestGenerated.java
rename to compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmOldAgainstIrBoxTestGenerated.java
index a13e5d215e4..8cfce9ba684 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/JvmOldAgainstIrBoxTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmOldAgainstIrBoxTestGenerated.java
@@ -3,649 +3,741 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-package org.jetbrains.kotlin.codegen.ir;
+package org.jetbrains.kotlin.test.runners.codegen;
 
 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
-import org.jetbrains.kotlin.test.KotlinTestUtils;
 import org.jetbrains.kotlin.test.util.KtTestUtil;
 import org.jetbrains.kotlin.test.TargetBackend;
 import org.jetbrains.kotlin.test.TestMetadata;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.util.regex.Pattern;
 
-/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
+/** This class is generated by {@link GenerateNewCompilerTests.kt}. DO NOT MODIFY MANUALLY */
 @SuppressWarnings("all")
 @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin")
 @TestDataPath("$PROJECT_ROOT")
-@RunWith(JUnit3RunnerWithInners.class)
 public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxTest {
-    private void runTest(String testDataFilePath) throws Exception {
-        KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath);
-    }
-
+    @Test
     public void testAllFilesPresentInCompileKotlinAgainstKotlin() throws Exception {
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true);
     }
 
+    @Test
     @TestMetadata("annotationInInterface.kt")
     public void testAnnotationInInterface() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationInInterface.kt");
     }
 
+    @Test
     @TestMetadata("annotationOnTypeUseInTypeAlias.kt")
     public void testAnnotationOnTypeUseInTypeAlias() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationOnTypeUseInTypeAlias.kt");
     }
 
+    @Test
     @TestMetadata("annotationsOnTypeAliases.kt")
     public void testAnnotationsOnTypeAliases() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/annotationsOnTypeAliases.kt");
     }
 
+    @Test
     @TestMetadata("callDeserializedPropertyOnInlineClassType.kt")
     public void testCallDeserializedPropertyOnInlineClassType() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassType.kt");
     }
 
+    @Test
     @TestMetadata("callDeserializedPropertyOnInlineClassTypeOldMangling.kt")
     public void testCallDeserializedPropertyOnInlineClassTypeOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/callDeserializedPropertyOnInlineClassTypeOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("callsToMultifileClassFromOtherPackage.kt")
     public void testCallsToMultifileClassFromOtherPackage() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/callsToMultifileClassFromOtherPackage.kt");
     }
 
+    @Test
     @TestMetadata("clashingFakeOverrideSignatures.kt")
     public void testClashingFakeOverrideSignatures() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/clashingFakeOverrideSignatures.kt");
     }
 
+    @Test
     @TestMetadata("classInObject.kt")
     public void testClassInObject() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/classInObject.kt");
     }
 
+    @Test
     @TestMetadata("companionObjectInEnum.kt")
     public void testCompanionObjectInEnum() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/companionObjectInEnum.kt");
     }
 
+    @Test
     @TestMetadata("companionObjectMember.kt")
     public void testCompanionObjectMember() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/companionObjectMember.kt");
     }
 
+    @Test
     @TestMetadata("constPropertyReferenceFromMultifileClass.kt")
     public void testConstPropertyReferenceFromMultifileClass() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/constPropertyReferenceFromMultifileClass.kt");
     }
 
+    @Test
     @TestMetadata("constructorVararg.kt")
     public void testConstructorVararg() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/constructorVararg.kt");
     }
 
+    @Test
     @TestMetadata("constructorWithInlineClassParametersInBinaryDependencies.kt")
     public void testConstructorWithInlineClassParametersInBinaryDependencies() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependencies.kt");
     }
 
+    @Test
     @TestMetadata("constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt")
     public void testConstructorWithInlineClassParametersInBinaryDependenciesOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/constructorWithInlineClassParametersInBinaryDependenciesOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("copySamOnInline.kt")
     public void testCopySamOnInline() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/copySamOnInline.kt");
     }
 
+    @Test
     @TestMetadata("copySamOnInline2.kt")
     public void testCopySamOnInline2() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/copySamOnInline2.kt");
     }
 
+    @Test
     @TestMetadata("coroutinesBinary.kt")
     public void testCoroutinesBinary() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/coroutinesBinary.kt");
     }
 
+    @Test
     @TestMetadata("defaultConstructor.kt")
     public void testDefaultConstructor() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultConstructor.kt");
     }
 
+    @Test
     @TestMetadata("defaultLambdaRegeneration.kt")
     public void testDefaultLambdaRegeneration() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultLambdaRegeneration.kt");
     }
 
+    @Test
     @TestMetadata("defaultLambdaRegeneration2.kt")
     public void testDefaultLambdaRegeneration2() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultLambdaRegeneration2.kt");
     }
 
+    @Test
     @TestMetadata("defaultWithInlineClassAndReceivers.kt")
     public void testDefaultWithInlineClassAndReceivers() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceivers.kt");
     }
 
+    @Test
     @TestMetadata("defaultWithInlineClassAndReceiversOldMangling.kt")
     public void testDefaultWithInlineClassAndReceiversOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/defaultWithInlineClassAndReceiversOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("delegatedDefault.kt")
     public void testDelegatedDefault() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/delegatedDefault.kt");
     }
 
+    @Test
     @TestMetadata("delegationAndAnnotations.kt")
     public void testDelegationAndAnnotations() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/delegationAndAnnotations.kt");
     }
 
+    @Test
     @TestMetadata("doublyNestedClass.kt")
     public void testDoublyNestedClass() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/doublyNestedClass.kt");
     }
 
+    @Test
     @TestMetadata("enum.kt")
     public void testEnum() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/enum.kt");
     }
 
+    @Test
     @TestMetadata("expectClassActualTypeAlias.kt")
     public void testExpectClassActualTypeAlias() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/expectClassActualTypeAlias.kt");
     }
 
+    @Test
     @TestMetadata("fakeOverridesForIntersectionTypes.kt")
     public void testFakeOverridesForIntersectionTypes() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fakeOverridesForIntersectionTypes.kt");
     }
 
+    @Test
     @TestMetadata("importCompanion.kt")
     public void testImportCompanion() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/importCompanion.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassFakeOverrideMangling.kt")
     public void testInlineClassFakeOverrideMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassFakeOverrideMangling.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassFakeOverrideManglingOldMangling.kt")
     public void testInlineClassFakeOverrideManglingOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassFakeOverrideManglingOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassFromBinaryDependencies.kt")
     public void testInlineClassFromBinaryDependencies() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassFromBinaryDependencies.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassFromBinaryDependenciesOldMangling.kt")
     public void testInlineClassFromBinaryDependenciesOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassFromBinaryDependenciesOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassInlineFunctionCall.kt")
     public void testInlineClassInlineFunctionCall() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassInlineFunctionCall.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassInlineFunctionCallOldMangling.kt")
     public void testInlineClassInlineFunctionCallOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassInlineFunctionCallOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassInlineProperty.kt")
     public void testInlineClassInlineProperty() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassInlineProperty.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassInlinePropertyOldMangling.kt")
     public void testInlineClassInlinePropertyOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassInlinePropertyOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("inlineClassesOldMangling.kt")
     public void testInlineClassesOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlineClassesOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("inlinedConstants.kt")
     public void testInlinedConstants() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/inlinedConstants.kt");
     }
 
+    @Test
     @TestMetadata("innerClassConstructor.kt")
     public void testInnerClassConstructor() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/innerClassConstructor.kt");
     }
 
+    @Test
     @TestMetadata("interfaceDelegationAndBridgesProcessing.kt")
     public void testInterfaceDelegationAndBridgesProcessing() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/interfaceDelegationAndBridgesProcessing.kt");
     }
 
+    @Test
     @TestMetadata("internalSetterOverridden.kt")
     public void testInternalSetterOverridden() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/internalSetterOverridden.kt");
     }
 
+    @Test
     @TestMetadata("internalWithDefaultArgs.kt")
     public void testInternalWithDefaultArgs() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/internalWithDefaultArgs.kt");
     }
 
+    @Test
     @TestMetadata("internalWithInlineClass.kt")
     public void testInternalWithInlineClass() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/internalWithInlineClass.kt");
     }
 
+    @Test
     @TestMetadata("internalWithOtherModuleName.kt")
     public void testInternalWithOtherModuleName() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/internalWithOtherModuleName.kt");
     }
 
+    @Test
     @TestMetadata("intersectionOverrideProperies.kt")
     public void testIntersectionOverrideProperies() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/intersectionOverrideProperies.kt");
     }
 
+    @Test
     @TestMetadata("jvmField.kt")
     public void testJvmField() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmField.kt");
     }
 
+    @Test
     @TestMetadata("jvmFieldInAnnotationCompanion.kt")
     public void testJvmFieldInAnnotationCompanion() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmFieldInAnnotationCompanion.kt");
     }
 
+    @Test
     @TestMetadata("jvmFieldInConstructor.kt")
     public void testJvmFieldInConstructor() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmFieldInConstructor.kt");
     }
 
+    @Test
     @TestMetadata("jvmFieldInInterfaceCompanion.kt")
     public void testJvmFieldInInterfaceCompanion() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmFieldInInterfaceCompanion.kt");
     }
 
+    @Test
     @TestMetadata("jvmNames.kt")
     public void testJvmNames() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmNames.kt");
     }
 
+    @Test
     @TestMetadata("jvmPackageName.kt")
     public void testJvmPackageName() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageName.kt");
     }
 
+    @Test
     @TestMetadata("jvmPackageNameInRootPackage.kt")
     public void testJvmPackageNameInRootPackage() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageNameInRootPackage.kt");
     }
 
+    @Test
     @TestMetadata("jvmPackageNameMultifileClass.kt")
     public void testJvmPackageNameMultifileClass() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageNameMultifileClass.kt");
     }
 
+    @Test
     @TestMetadata("jvmPackageNameWithJvmName.kt")
     public void testJvmPackageNameWithJvmName() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmPackageNameWithJvmName.kt");
     }
 
+    @Test
     @TestMetadata("jvmStaticInObject.kt")
     public void testJvmStaticInObject() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmStaticInObject.kt");
     }
 
+    @Test
     @TestMetadata("jvmStaticInObjectPropertyReference.kt")
     public void testJvmStaticInObjectPropertyReference() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvmStaticInObjectPropertyReference.kt");
     }
 
+    @Test
     @TestMetadata("kotlinPropertyAsAnnotationParameter.kt")
     public void testKotlinPropertyAsAnnotationParameter() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/kotlinPropertyAsAnnotationParameter.kt");
     }
 
+    @Test
     @TestMetadata("kt14012.kt")
     public void testKt14012() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/kt14012.kt");
     }
 
+    @Test
     @TestMetadata("kt14012_multi.kt")
     public void testKt14012_multi() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/kt14012_multi.kt");
     }
 
+    @Test
     @TestMetadata("kt21775.kt")
     public void testKt21775() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/kt21775.kt");
     }
 
+    @Test
     @TestMetadata("metadataForMembersInLocalClassInInitializer.kt")
     public void testMetadataForMembersInLocalClassInInitializer() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/metadataForMembersInLocalClassInInitializer.kt");
     }
 
+    @Test
     @TestMetadata("multifileClassInlineFunctionAccessingProperty.kt")
     public void testMultifileClassInlineFunctionAccessingProperty() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/multifileClassInlineFunctionAccessingProperty.kt");
     }
 
+    @Test
     @TestMetadata("multifileClassWithTypealias.kt")
     public void testMultifileClassWithTypealias() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/multifileClassWithTypealias.kt");
     }
 
+    @Test
     @TestMetadata("nestedClass.kt")
     public void testNestedClass() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedClass.kt");
     }
 
+    @Test
     @TestMetadata("nestedClassInAnnotationArgument.kt")
     public void testNestedClassInAnnotationArgument() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedClassInAnnotationArgument.kt");
     }
 
+    @Test
     @TestMetadata("nestedEnum.kt")
     public void testNestedEnum() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedEnum.kt");
     }
 
+    @Test
     @TestMetadata("nestedFunctionTypeAliasExpansion.kt")
     public void testNestedFunctionTypeAliasExpansion() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedFunctionTypeAliasExpansion.kt");
     }
 
+    @Test
     @TestMetadata("nestedObject.kt")
     public void testNestedObject() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedObject.kt");
     }
 
+    @Test
     @TestMetadata("nestedTypeAliasExpansion.kt")
     public void testNestedTypeAliasExpansion() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/nestedTypeAliasExpansion.kt");
     }
 
+    @Test
     @TestMetadata("noExplicitOverrideForDelegatedFromSupertype.kt")
     public void testNoExplicitOverrideForDelegatedFromSupertype() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/noExplicitOverrideForDelegatedFromSupertype.kt");
     }
 
+    @Test
     @TestMetadata("optionalAnnotation.kt")
     public void testOptionalAnnotation() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/optionalAnnotation.kt");
     }
 
+    @Test
     @TestMetadata("platformTypes.kt")
     public void testPlatformTypes() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/platformTypes.kt");
     }
 
+    @Test
     @TestMetadata("privateCompanionObjectValInDifferentModule.kt")
     public void testPrivateCompanionObjectValInDifferentModule() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModule.kt");
     }
 
+    @Test
     @TestMetadata("privateCompanionObjectValInDifferentModuleOldMangling.kt")
     public void testPrivateCompanionObjectValInDifferentModuleOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/privateCompanionObjectValInDifferentModuleOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("privateTopLevelValInDifferentModule.kt")
     public void testPrivateTopLevelValInDifferentModule() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModule.kt");
     }
 
+    @Test
     @TestMetadata("privateTopLevelValInDifferentModuleOldMangling.kt")
     public void testPrivateTopLevelValInDifferentModuleOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/privateTopLevelValInDifferentModuleOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("propertyReference.kt")
     public void testPropertyReference() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/propertyReference.kt");
     }
 
+    @Test
     @TestMetadata("recursiveGeneric.kt")
     public void testRecursiveGeneric() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/recursiveGeneric.kt");
     }
 
+    @Test
     @TestMetadata("reflectTopLevelFunctionOtherFile.kt")
     public void testReflectTopLevelFunctionOtherFile() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/reflectTopLevelFunctionOtherFile.kt");
     }
 
+    @Test
     @TestMetadata("sealedClass.kt")
     public void testSealedClass() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/sealedClass.kt");
     }
 
+    @Test
     @TestMetadata("secondaryConstructors.kt")
     public void testSecondaryConstructors() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/secondaryConstructors.kt");
     }
 
+    @Test
     @TestMetadata("simple.kt")
     public void testSimple() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/simple.kt");
     }
 
+    @Test
     @TestMetadata("simpleValAnonymousObject.kt")
     public void testSimpleValAnonymousObject() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/simpleValAnonymousObject.kt");
     }
 
+    @Test
     @TestMetadata("specialBridgesInDependencies.kt")
     public void testSpecialBridgesInDependencies() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/specialBridgesInDependencies.kt");
     }
 
+    @Test
     @TestMetadata("starImportEnum.kt")
     public void testStarImportEnum() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/starImportEnum.kt");
     }
 
+    @Test
     @TestMetadata("suspendFunWithDefaultMangling.kt")
     public void testSuspendFunWithDefaultMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultMangling.kt");
     }
 
+    @Test
     @TestMetadata("suspendFunWithDefaultOldMangling.kt")
     public void testSuspendFunWithDefaultOldMangling() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/suspendFunWithDefaultOldMangling.kt");
     }
 
+    @Test
     @TestMetadata("targetedJvmName.kt")
     public void testTargetedJvmName() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/targetedJvmName.kt");
     }
 
+    @Test
     @TestMetadata("typeAliasesKt13181.kt")
     public void testTypeAliasesKt13181() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAliasesKt13181.kt");
     }
 
+    @Test
     @TestMetadata("unsignedTypesInAnnotations.kt")
     public void testUnsignedTypesInAnnotations() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/unsignedTypesInAnnotations.kt");
     }
 
+    @Test
     @TestMetadata("useDeserializedFunInterface.kt")
     public void testUseDeserializedFunInterface() throws Exception {
         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/useDeserializedFunInterface.kt");
     }
 
+    @Nested
     @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Fir extends AbstractJvmOldAgainstIrBoxTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath);
-        }
-
+    public class Fir extends AbstractJvmOldAgainstIrBoxTest {
+        @Test
         public void testAllFilesPresentInFir() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true);
         }
 
+        @Test
         @TestMetadata("AnonymousObjectInProperty.kt")
         public void testAnonymousObjectInProperty() throws Exception {
             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/AnonymousObjectInProperty.kt");
         }
 
+        @Test
         @TestMetadata("ExistingSymbolInFakeOverride.kt")
         public void testExistingSymbolInFakeOverride() throws Exception {
             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/ExistingSymbolInFakeOverride.kt");
         }
 
+        @Test
         @TestMetadata("IncrementalCompilerRunner.kt")
         public void testIncrementalCompilerRunner() throws Exception {
             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IncrementalCompilerRunner.kt");
         }
 
+        @Test
         @TestMetadata("IrConstAcceptMultiModule.kt")
         public void testIrConstAcceptMultiModule() throws Exception {
             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/IrConstAcceptMultiModule.kt");
         }
 
+        @Test
         @TestMetadata("LibraryProperty.kt")
         public void testLibraryProperty() throws Exception {
             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/fir/LibraryProperty.kt");
         }
     }
 
+    @Nested
     @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class Jvm8 extends AbstractJvmOldAgainstIrBoxTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath);
-        }
-
+    public class Jvm8 extends AbstractJvmOldAgainstIrBoxTest {
+        @Test
         public void testAllFilesPresentInJvm8() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true);
         }
 
+        @Nested
         @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults")
         @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Defaults extends AbstractJvmOldAgainstIrBoxTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath);
-            }
-
+        public class Defaults extends AbstractJvmOldAgainstIrBoxTest {
+            @Test
             public void testAllFilesPresentInDefaults() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true);
             }
 
+            @Test
             @TestMetadata("superCall.kt")
             public void testSuperCall() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt");
             }
 
+            @Test
             @TestMetadata("superCallFromInterface.kt")
             public void testSuperCallFromInterface() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt");
             }
 
+            @Test
             @TestMetadata("superCallFromInterface2.kt")
             public void testSuperCallFromInterface2() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt");
             }
 
+            @Test
             @TestMetadata("superPropAccess.kt")
             public void testSuperPropAccess() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt");
             }
 
+            @Test
             @TestMetadata("superPropAccessFromInterface.kt")
             public void testSuperPropAccessFromInterface() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt");
             }
 
+            @Test
             @TestMetadata("superPropAccessFromInterface2.kt")
             public void testSuperPropAccessFromInterface2() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt");
             }
 
+            @Nested
             @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility")
             @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class AllCompatibility extends AbstractJvmOldAgainstIrBoxTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath);
-                }
-
+            public class AllCompatibility extends AbstractJvmOldAgainstIrBoxTest {
+                @Test
                 public void testAllFilesPresentInAllCompatibility() throws Exception {
                     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true);
                 }
 
+                @Test
                 @TestMetadata("callStackTrace.kt")
                 public void testCallStackTrace() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/callStackTrace.kt");
                 }
 
+                @Test
                 @TestMetadata("superCall.kt")
                 public void testSuperCall() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/superCall.kt");
                 }
 
+                @Test
                 @TestMetadata("superCallFromInterface.kt")
                 public void testSuperCallFromInterface() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/superCallFromInterface.kt");
                 }
 
+                @Test
                 @TestMetadata("superCallFromInterface2.kt")
                 public void testSuperCallFromInterface2() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/superCallFromInterface2.kt");
                 }
 
+                @Test
                 @TestMetadata("superPropAccess.kt")
                 public void testSuperPropAccess() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/superPropAccess.kt");
                 }
 
+                @Test
                 @TestMetadata("superPropAccessFromInterface.kt")
                 public void testSuperPropAccessFromInterface() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/superPropAccessFromInterface.kt");
                 }
 
+                @Test
                 @TestMetadata("superPropAccessFromInterface2.kt")
                 public void testSuperPropAccessFromInterface2() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/superPropAccessFromInterface2.kt");
                 }
 
+                @Nested
                 @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy")
                 @TestDataPath("$PROJECT_ROOT")
-                @RunWith(JUnit3RunnerWithInners.class)
-                public static class DelegationBy extends AbstractJvmOldAgainstIrBoxTest {
-                    private void runTest(String testDataFilePath) throws Exception {
-                        KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath);
-                    }
-
+                public class DelegationBy extends AbstractJvmOldAgainstIrBoxTest {
+                    @Test
                     public void testAllFilesPresentInDelegationBy() throws Exception {
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true);
                     }
 
+                    @Test
                     @TestMetadata("simple.kt")
                     public void testSimple() throws Exception {
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy/simple.kt");
                     }
 
+                    @Test
                     @TestMetadata("simpleProperty.kt")
                     public void testSimpleProperty() throws Exception {
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy/simpleProperty.kt");
@@ -653,48 +745,52 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
                 }
             }
 
+            @Nested
             @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop")
             @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class Interop extends AbstractJvmOldAgainstIrBoxTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath);
-                }
-
+            public class Interop extends AbstractJvmOldAgainstIrBoxTest {
+                @Test
                 public void testAllFilesPresentInInterop() throws Exception {
                     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true);
                 }
 
+                @Test
                 @TestMetadata("likeMemberClash.kt")
                 public void testLikeMemberClash() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/likeMemberClash.kt");
                 }
 
+                @Test
                 @TestMetadata("likeSpecialization.kt")
                 public void testLikeSpecialization() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/likeSpecialization.kt");
                 }
 
+                @Test
                 @TestMetadata("newAndOldSchemes.kt")
                 public void testNewAndOldSchemes() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes.kt");
                 }
 
+                @Test
                 @TestMetadata("newAndOldSchemes2.kt")
                 public void testNewAndOldSchemes2() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes2.kt");
                 }
 
+                @Test
                 @TestMetadata("newAndOldSchemes2Compatibility.kt")
                 public void testNewAndOldSchemes2Compatibility() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes2Compatibility.kt");
                 }
 
+                @Test
                 @TestMetadata("newAndOldSchemes3.kt")
                 public void testNewAndOldSchemes3() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt");
                 }
 
+                @Test
                 @TestMetadata("newSchemeWithJvmDefault.kt")
                 public void testNewSchemeWithJvmDefault() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt");
@@ -702,70 +798,73 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
             }
         }
 
+        @Nested
         @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6")
         @TestDataPath("$PROJECT_ROOT")
-        @RunWith(JUnit3RunnerWithInners.class)
-        public static class Jvm8against6 extends AbstractJvmOldAgainstIrBoxTest {
-            private void runTest(String testDataFilePath) throws Exception {
-                KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath);
-            }
-
+        public class Jvm8against6 extends AbstractJvmOldAgainstIrBoxTest {
+            @Test
             public void testAllFilesPresentInJvm8against6() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true);
             }
 
+            @Test
             @TestMetadata("jdk8Against6.kt")
             public void testJdk8Against6() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/jdk8Against6.kt");
             }
 
+            @Test
             @TestMetadata("simpleCall.kt")
             public void testSimpleCall() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCall.kt");
             }
 
+            @Test
             @TestMetadata("simpleCallWithBigHierarchy.kt")
             public void testSimpleCallWithBigHierarchy() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithBigHierarchy.kt");
             }
 
+            @Test
             @TestMetadata("simpleCallWithHierarchy.kt")
             public void testSimpleCallWithHierarchy() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithHierarchy.kt");
             }
 
+            @Test
             @TestMetadata("simpleProp.kt")
             public void testSimpleProp() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleProp.kt");
             }
 
+            @Test
             @TestMetadata("simplePropWithHierarchy.kt")
             public void testSimplePropWithHierarchy() throws Exception {
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simplePropWithHierarchy.kt");
             }
 
+            @Nested
             @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation")
             @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class Delegation extends AbstractJvmOldAgainstIrBoxTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath);
-                }
-
+            public class Delegation extends AbstractJvmOldAgainstIrBoxTest {
+                @Test
                 public void testAllFilesPresentInDelegation() throws Exception {
                     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true);
                 }
 
+                @Test
                 @TestMetadata("diamond.kt")
                 public void testDiamond() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond.kt");
                 }
 
+                @Test
                 @TestMetadata("diamond2.kt")
                 public void testDiamond2() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond2.kt");
                 }
 
+                @Test
                 @TestMetadata("diamond3.kt")
                 public void testDiamond3() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond3.kt");
@@ -774,18 +873,16 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
         }
     }
 
+    @Nested
     @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations")
     @TestDataPath("$PROJECT_ROOT")
-    @RunWith(JUnit3RunnerWithInners.class)
-    public static class TypeAnnotations extends AbstractJvmOldAgainstIrBoxTest {
-        private void runTest(String testDataFilePath) throws Exception {
-            KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, testDataFilePath);
-        }
-
+    public class TypeAnnotations extends AbstractJvmOldAgainstIrBoxTest {
+        @Test
         public void testAllFilesPresentInTypeAnnotations() throws Exception {
             KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true);
         }
 
+        @Test
         @TestMetadata("implicitReturn.kt")
         public void testImplicitReturn() throws Exception {
             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/typeAnnotations/implicitReturn.kt");
diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstKotlinWithDifferentBackendsTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstKotlinWithDifferentBackendsTest.kt
new file mode 100644
index 00000000000..cef5e3616e3
--- /dev/null
+++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/codegen/AbstractCompileKotlinAgainstKotlinWithDifferentBackendsTest.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.test.runners.codegen
+
+import org.jetbrains.kotlin.test.TargetBackend
+import org.jetbrains.kotlin.test.TestInfrastructureInternals
+import org.jetbrains.kotlin.test.backend.BlackBoxCodegenSuppressor
+import org.jetbrains.kotlin.test.backend.classic.ClassicJvmBackendFacade
+import org.jetbrains.kotlin.test.backend.handlers.*
+import org.jetbrains.kotlin.test.backend.ir.JvmIrBackendFacade
+import org.jetbrains.kotlin.test.bind
+import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
+import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.IGNORE_BACKEND_MULTI_MODULE
+import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2ClassicBackendConverter
+import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontend2IrConverter
+import org.jetbrains.kotlin.test.frontend.classic.ClassicFrontendFacade
+import org.jetbrains.kotlin.test.model.FrontendKinds
+import org.jetbrains.kotlin.test.runners.AbstractKotlinCompilerWithTargetBackendTest
+import org.jetbrains.kotlin.test.runners.codegen.commonConfigurationForCodegenTest
+import org.jetbrains.kotlin.test.services.ModuleTransformerForSwitchingBackend
+
+@OptIn(TestInfrastructureInternals::class)
+abstract class AbstractJvmIrAgainstOldBoxTestBase(targetBackend: TargetBackend) : AbstractKotlinCompilerWithTargetBackendTest(
+    targetBackend
+) {
+    abstract val backendForLib: TargetBackend
+    abstract val backendForMain: TargetBackend
+
+    override fun TestConfigurationBuilder.configuration() {
+        commonConfigurationForCodegenTest(
+            FrontendKinds.ClassicFrontend,
+            ::ClassicFrontendFacade,
+            ::ClassicFrontend2ClassicBackendConverter,
+            ::ClassicJvmBackendFacade
+        )
+
+        commonHandlersForCodegenTest()
+
+        useFrontend2BackendConverters(::ClassicFrontend2IrConverter)
+        useBackendFacades(::JvmIrBackendFacade)
+
+        useModuleStructureTransformers(
+            ModuleTransformerForSwitchingBackend(backendForLib, backendForMain)
+        )
+
+        useAfterAnalysisCheckers(::BlackBoxCodegenSuppressor.bind(IGNORE_BACKEND_MULTI_MODULE))
+    }
+}
+
+
+open class AbstractJvmIrAgainstOldBoxTest : AbstractJvmIrAgainstOldBoxTestBase(TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD) {
+    override val backendForLib: TargetBackend
+        get() = TargetBackend.JVM
+    override val backendForMain: TargetBackend
+        get() = TargetBackend.JVM_IR
+}
+
+open class AbstractJvmOldAgainstIrBoxTest : AbstractJvmIrAgainstOldBoxTestBase(TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR) {
+    override val backendForLib: TargetBackend
+        get() = TargetBackend.JVM_IR
+    override val backendForMain: TargetBackend
+        get() = TargetBackend.JVM
+}
diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstKotlinTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstKotlinTest.kt
deleted file mode 100644
index ea018748120..00000000000
--- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstKotlinTest.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.codegen.ir
-
-import org.jetbrains.kotlin.codegen.AbstractCompileKotlinAgainstKotlinTest
-import org.jetbrains.kotlin.test.TargetBackend
-
-abstract class AbstractIrCompileKotlinAgainstKotlinTest : AbstractCompileKotlinAgainstKotlinTest() {
-    override val backend: TargetBackend get() = TargetBackend.JVM_IR
-}
-
-abstract class AbstractJvmIrAgainstOldBoxTest : AbstractIrCompileKotlinAgainstKotlinTest() {
-    override val backend: TargetBackend get() = TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD
-
-    override fun getBackendA(): TargetBackend = TargetBackend.JVM
-    override fun getBackendB(): TargetBackend = TargetBackend.JVM_IR
-}
-
-abstract class AbstractJvmOldAgainstIrBoxTest : AbstractIrCompileKotlinAgainstKotlinTest() {
-    override val backend: TargetBackend get() = TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR
-
-    override fun getBackendA(): TargetBackend = TargetBackend.JVM_IR
-    override fun getBackendB(): TargetBackend = TargetBackend.JVM
-}
diff --git a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
index 358fa93640d..c3fd1fe5fa2 100644
--- a/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
+++ b/compiler/tests-for-compiler-generator/tests/org/jetbrains/kotlin/test/generators/GenerateJUnit3CompilerTests.kt
@@ -400,16 +400,6 @@ fun generateJUnit3CompilerTests(args: Array<String>) {
                 )
             }
 
-            testClass<AbstractJvmIrAgainstOldBoxTest> {
-                model("codegen/box/compileKotlinAgainstKotlin", targetBackend = TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD)
-            }
-            testClass<AbstractJvmOldAgainstIrBoxTest> {
-                model(
-                    "codegen/box/compileKotlinAgainstKotlin",
-                    targetBackend = TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR
-                )
-            }
-
             testClass<AbstractIrBytecodeListingTest> {
                 model("codegen/bytecodeListing", targetBackend = TargetBackend.JVM_IR)
             }
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 8fc6d8eb260..4200022ab42 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
@@ -68,6 +68,14 @@ fun generateJUnit5CompilerTests(args: Array<String>) {
                 model("codegen/box", excludeDirs = listOf("oldLanguageVersions"))
             }
 
+            testClass<AbstractJvmIrAgainstOldBoxTest> {
+                model("codegen/box/compileKotlinAgainstKotlin")
+            }
+
+            testClass<AbstractJvmOldAgainstIrBoxTest> {
+                model("codegen/box/compileKotlinAgainstKotlin")
+            }
+
             testClass<AbstractIrTextTest> {
                 model("ir/irText")
             }