Regenerate tests

2015-04-10 02:38:23 +03:00
parent 69e7a25b08
commit 94df191f86
145 changed files with 0 additions and 2025 deletions
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.asJava;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,10 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/asJava/lightClasses")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        KotlinLightClassTestGenerated.Delegation.class,
-        KotlinLightClassTestGenerated.NullabilityAnnotations.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class KotlinLightClassTestGenerated extends AbstractKotlinLightClassTest {
    public void testAllFilesPresentInLightClasses() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.cfg;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,19 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/cfg")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        ControlFlowTestGenerated.Arrays.class,
-        ControlFlowTestGenerated.Basic.class,
-        ControlFlowTestGenerated.Bugs.class,
-        ControlFlowTestGenerated.ControlStructures.class,
-        ControlFlowTestGenerated.Conventions.class,
-        ControlFlowTestGenerated.DeadCode.class,
-        ControlFlowTestGenerated.Declarations.class,
-        ControlFlowTestGenerated.Expressions.class,
-        ControlFlowTestGenerated.Functions.class,
-        ControlFlowTestGenerated.SecondaryConstructors.class,
-        ControlFlowTestGenerated.TailCalls.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class ControlFlowTestGenerated extends AbstractControlFlowTest {
    public void testAllFilesPresentInCfg() throws Exception {
@@ -303,14 +289,6 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest {

    @TestMetadata("compiler/testData/cfg/declarations")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Declarations.ClassesAndObjects.class,
-            Declarations.FunctionLiterals.class,
-            Declarations.Functions.class,
-            Declarations.Local.class,
-            Declarations.MultiDeclaration.class,
-            Declarations.Properties.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Declarations extends AbstractControlFlowTest {
        public void testAllFilesPresentInDeclarations() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.cfg;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,11 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/cfg-variables")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        DataFlowTestGenerated.Basic.class,
-        DataFlowTestGenerated.Bugs.class,
-        DataFlowTestGenerated.LexicalScopes.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class DataFlowTestGenerated extends AbstractDataFlowTest {
    public void testAllFilesPresentInCfg_variables() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.cfg;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,27 +27,10 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        PseudoValueTestGenerated.Cfg.class,
-        PseudoValueTestGenerated.Cfg_variables.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class PseudoValueTestGenerated extends AbstractPseudoValueTest {
    @TestMetadata("compiler/testData/cfg")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Cfg.Arrays.class,
-            Cfg.Basic.class,
-            Cfg.Bugs.class,
-            Cfg.ControlStructures.class,
-            Cfg.Conventions.class,
-            Cfg.DeadCode.class,
-            Cfg.Declarations.class,
-            Cfg.Expressions.class,
-            Cfg.Functions.class,
-            Cfg.SecondaryConstructors.class,
-            Cfg.TailCalls.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Cfg extends AbstractPseudoValueTest {
        public void testAllFilesPresentInCfg() throws Exception {
@@ -309,14 +291,6 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {

        @TestMetadata("compiler/testData/cfg/declarations")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Declarations.ClassesAndObjects.class,
-                Declarations.FunctionLiterals.class,
-                Declarations.Functions.class,
-                Declarations.Local.class,
-                Declarations.MultiDeclaration.class,
-                Declarations.Properties.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Declarations extends AbstractPseudoValueTest {
            public void testAllFilesPresentInDeclarations() throws Exception {
@@ -711,11 +685,6 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest {

    @TestMetadata("compiler/testData/cfg-variables")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Cfg_variables.Basic.class,
-            Cfg_variables.Bugs.class,
-            Cfg_variables.LexicalScopes.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Cfg_variables extends AbstractPseudoValueTest {
        public void testAllFilesPresentInCfg_variables() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.checkers;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,80 +27,10 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        JetDiagnosticsTestGenerated.Tests.class,
-        JetDiagnosticsTestGenerated.Script.class,
-        JetDiagnosticsTestGenerated.Diagnostics.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
    @TestMetadata("compiler/testData/diagnostics/tests")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Tests.Annotations.class,
-            Tests.BackingField.class,
-            Tests.Cast.class,
-            Tests.CheckArguments.class,
-            Tests.ClassObjects.class,
-            Tests.ControlFlowAnalysis.class,
-            Tests.ControlStructures.class,
-            Tests.CyclicHierarchy.class,
-            Tests.DataClasses.class,
-            Tests.DataFlow.class,
-            Tests.DataFlowInfoTraversal.class,
-            Tests.DeclarationChecks.class,
-            Tests.DelegatedProperty.class,
-            Tests.Delegation.class,
-            Tests.Deparenthesize.class,
-            Tests.DuplicateJvmSignature.class,
-            Tests.DynamicTypes.class,
-            Tests.Enum.class,
-            Tests.Evaluate.class,
-            Tests.Extensions.class,
-            Tests.FunctionAsExpression.class,
-            Tests.FunctionLiterals.class,
-            Tests.Generics.class,
-            Tests.Imports.class,
-            Tests.IncompleteCode.class,
-            Tests.Inference.class,
-            Tests.Infos.class,
-            Tests.Inline.class,
-            Tests.Inner.class,
-            Tests.J_k.class,
-            Tests.Jdk_annotations.class,
-            Tests.Labels.class,
-            Tests.Library.class,
-            Tests.Modifiers.class,
-            Tests.Multimodule.class,
-            Tests.NamedArguments.class,
-            Tests.NullabilityAndSmartCasts.class,
-            Tests.NullableTypes.class,
-            Tests.Numbers.class,
-            Tests.Objects.class,
-            Tests.OperatorsOverloading.class,
-            Tests.Overload.class,
-            Tests.Override.class,
-            Tests.PlatformTypes.class,
-            Tests.Recovery.class,
-            Tests.Redeclarations.class,
-            Tests.Regressions.class,
-            Tests.Resolve.class,
-            Tests.Scopes.class,
-            Tests.SecondaryConstructors.class,
-            Tests.SenselessComparison.class,
-            Tests.Shadowing.class,
-            Tests.SmartCasts.class,
-            Tests.Substitutions.class,
-            Tests.Subtyping.class,
-            Tests.Suppress.class,
-            Tests.ThisAndSuper.class,
-            Tests.TraitWithRequired.class,
-            Tests.Typedefs.class,
-            Tests.Unit.class,
-            Tests.Varargs.class,
-            Tests.Variance.class,
-            Tests.When.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Tests extends AbstractJetDiagnosticsTest {
        @TestMetadata("Abstract.kt")
@@ -650,9 +579,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/annotations")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Annotations.AnnotationParameterMustBeConstant.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Annotations extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInAnnotations() throws Exception {
@@ -1046,10 +972,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/cast")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Cast.Bare.class,
-                Cast.NeverSucceeds.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Cast extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInCast() throws Exception {
@@ -1629,10 +1551,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/controlFlowAnalysis")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                ControlFlowAnalysis.DeadCode.class,
-                ControlFlowAnalysis.DefiniteReturn.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class ControlFlowAnalysis extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInControlFlowAnalysis() throws Exception {
@@ -2449,10 +2367,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/dataFlow")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                DataFlow.Assignment.class,
-                DataFlow.Local.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class DataFlow extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInDataFlow() throws Exception {
@@ -2606,9 +2520,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/dataFlowInfoTraversal")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                DataFlowInfoTraversal.Smartcasts.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class DataFlowInfoTraversal extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInDataFlowInfoTraversal() throws Exception {
@@ -2951,9 +2862,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/declarationChecks")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                DeclarationChecks.MultiDeclarations.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class DeclarationChecks extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInDeclarationChecks() throws Exception {
@@ -3176,9 +3084,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/delegatedProperty")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                DelegatedProperty.Inference.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class DelegatedProperty extends AbstractJetDiagnosticsTest {
            @TestMetadata("absentErrorAboutInitializer.kt")
@@ -3593,15 +3498,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/duplicateJvmSignature")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                DuplicateJvmSignature.AccidentalOverrides.class,
-                DuplicateJvmSignature.Bridges.class,
-                DuplicateJvmSignature.Erasure.class,
-                DuplicateJvmSignature.FunctionAndProperty.class,
-                DuplicateJvmSignature.SpecialNames.class,
-                DuplicateJvmSignature.Synthesized.class,
-                DuplicateJvmSignature.TraitImpl.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class DuplicateJvmSignature extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInDuplicateJvmSignature() throws Exception {
@@ -4127,9 +4023,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/enum")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Enum.Inner.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Enum extends AbstractJetDiagnosticsTest {
            @TestMetadata("AbstractEnum.kt")
@@ -4733,9 +4626,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/functionLiterals")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                FunctionLiterals.Return.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class FunctionLiterals extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInFunctionLiterals() throws Exception {
@@ -5024,11 +4914,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/generics")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Generics.StarProjections.class,
-                Generics.TpAsReified.class,
-                Generics.VarProjection.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Generics extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInGenerics() throws Exception {
@@ -5440,9 +5325,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/incompleteCode")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                IncompleteCode.DiagnosticWithSyntaxError.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class IncompleteCode extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInIncompleteCode() throws Exception {
@@ -5647,15 +5529,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/inference")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Inference.CapturedTypes.class,
-                Inference.Constraints.class,
-                Inference.NestedCalls.class,
-                Inference.Regressions.class,
-                Inference.ReportingImprovements.class,
-                Inference.Substitutions.class,
-                Inference.UpperBounds.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Inference extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInInference() throws Exception {
@@ -6475,13 +6348,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/inline")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Inline.BinaryExpressions.class,
-                Inline.NonLocalReturns.class,
-                Inline.NonPublicMember.class,
-                Inline.Regressions.class,
-                Inline.UnaryExpressions.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Inline extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInInline() throws Exception {
@@ -6908,9 +6774,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/inner")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Inner.QualifiedExpression.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Inner extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInInner() throws Exception {
@@ -7424,9 +7287,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/jdk-annotations")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Jdk_annotations.Sql.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Jdk_annotations extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInJdk_annotations() throws Exception {
@@ -7604,11 +7464,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/multimodule")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Multimodule.DuplicateClass.class,
-                Multimodule.DuplicateMethod.class,
-                Multimodule.DuplicateSuper.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Multimodule extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInMultimodule() throws Exception {
@@ -8488,9 +8343,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/override")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Override.ParameterNames.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Override extends AbstractJetDiagnosticsTest {
            @TestMetadata("AbstractFunImplemented.kt")
@@ -8851,12 +8703,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/platformTypes")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                PlatformTypes.CommonSupertype.class,
-                PlatformTypes.Intersection.class,
-                PlatformTypes.MethodCall.class,
-                PlatformTypes.NullabilityWarnings.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class PlatformTypes extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInPlatformTypes() throws Exception {
@@ -10087,11 +9933,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/resolve")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Resolve.Invoke.class,
-                Resolve.NestedCalls.class,
-                Resolve.SpecialConstructions.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Resolve extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInResolve() throws Exception {
@@ -10160,9 +10001,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

            @TestMetadata("compiler/testData/diagnostics/tests/resolve/invoke")
            @TestDataPath("$PROJECT_ROOT")
-            @InnerTestClasses({
-                    Invoke.Errors.class,
-            })
            @RunWith(JUnit3RunnerWithInners.class)
            public static class Invoke extends AbstractJetDiagnosticsTest {
                public void testAllFilesPresentInInvoke() throws Exception {
@@ -10593,9 +10431,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/secondaryConstructors")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                SecondaryConstructors.HeaderCallChecker.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class SecondaryConstructors extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInSecondaryConstructors() throws Exception {
@@ -11040,11 +10875,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/smartCasts")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                SmartCasts.Inference.class,
-                SmartCasts.Safecalls.class,
-                SmartCasts.Varnotnull.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class SmartCasts extends AbstractJetDiagnosticsTest {
            @TestMetadata("afterBinaryExpr.kt")
@@ -11555,11 +11385,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/suppress")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Suppress.AllWarnings.class,
-                Suppress.ManyWarnings.class,
-                Suppress.OneWarning.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Suppress extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInSuppress() throws Exception {
@@ -12043,9 +11868,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/diagnostics/tests/variance")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Variance.PrivateToThis.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Variance extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInVariance() throws Exception {
@@ -12269,10 +12091,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

    @TestMetadata("compiler/testData/codegen/box/diagnostics")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Diagnostics.Functions.class,
-            Diagnostics.Vararg.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Diagnostics extends AbstractJetDiagnosticsTest {
        public void testAllFilesPresentInDiagnostics() throws Exception {
@@ -12281,11 +12099,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

        @TestMetadata("compiler/testData/codegen/box/diagnostics/functions")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Functions.Inference.class,
-                Functions.Invoke.class,
-                Functions.TailRecursion.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Functions extends AbstractJetDiagnosticsTest {
            public void testAllFilesPresentInFunctions() throws Exception {
@@ -12309,9 +12122,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {

            @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke")
            @TestDataPath("$PROJECT_ROOT")
-            @InnerTestClasses({
-                    Invoke.OnObjects.class,
-            })
            @RunWith(JUnit3RunnerWithInners.class)
            public static class Invoke extends AbstractJetDiagnosticsTest {
                public void testAllFilesPresentInInvoke() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.checkers;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,9 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/diagnostics/testsWithJsStdLibAndBackendCompilation")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        JetDiagnosticsTestWithJsStdLibAndBackendCompilationGenerated.Inline.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JetDiagnosticsTestWithJsStdLibAndBackendCompilationGenerated extends AbstractJetDiagnosticsTestWithJsStdLibAndBackendCompilation {
    public void testAllFilesPresentInTestsWithJsStdLibAndBackendCompilation() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.checkers;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,12 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        JetDiagnosticsTestWithJsStdLibGenerated.DynamicTypes.class,
-        JetDiagnosticsTestWithJsStdLibGenerated.JsCode.class,
-        JetDiagnosticsTestWithJsStdLibGenerated.Native.class,
-        JetDiagnosticsTestWithJsStdLibGenerated.UnsupportedFeatures.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JetDiagnosticsTestWithJsStdLibGenerated extends AbstractJetDiagnosticsTestWithJsStdLib {
    public void testAllFilesPresentInTestsWithJsStdLib() throws Exception {
@@ -272,13 +265,6 @@ public class JetDiagnosticsTestWithJsStdLibGenerated extends AbstractJetDiagnost

    @TestMetadata("compiler/testData/diagnostics/testsWithJsStdLib/native")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Native.NativeGetter.class,
-            Native.NativeInvoke.class,
-            Native.NativeSetter.class,
-            Native.OptionlBody.class,
-            Native.UnusedParam.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Native extends AbstractJetDiagnosticsTestWithJsStdLib {
        public void testAllFilesPresentInNative() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.checkers;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,19 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/diagnostics/testsWithStdLib")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        JetDiagnosticsTestWithStdLibGenerated.Annotations.class,
-        JetDiagnosticsTestWithStdLibGenerated.CallableReference.class,
-        JetDiagnosticsTestWithStdLibGenerated.ClassLiteral.class,
-        JetDiagnosticsTestWithStdLibGenerated.DuplicateJvmSignature.class,
-        JetDiagnosticsTestWithStdLibGenerated.FunctionLiterals.class,
-        JetDiagnosticsTestWithStdLibGenerated.Inference.class,
-        JetDiagnosticsTestWithStdLibGenerated.KotlinSignature.class,
-        JetDiagnosticsTestWithStdLibGenerated.Native.class,
-        JetDiagnosticsTestWithStdLibGenerated.Reified.class,
-        JetDiagnosticsTestWithStdLibGenerated.Resolve.class,
-        JetDiagnosticsTestWithStdLibGenerated.Varargs.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnosticsTestWithStdLib {
    public void testAllFilesPresentInTestsWithStdLib() throws Exception {
@@ -51,15 +37,6 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic

    @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Annotations.AnnotationApplicability.class,
-            Annotations.AnnotationParameterMustBeConstant.class,
-            Annotations.AnnotationParameters.class,
-            Annotations.AnnotationWithVarargParameter.class,
-            Annotations.JvmOverloads.class,
-            Annotations.PlatformStatic.class,
-            Annotations.ProhibitPositionedArgument.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Annotations extends AbstractJetDiagnosticsTestWithStdLib {
        public void testAllFilesPresentInAnnotations() throws Exception {
@@ -306,10 +283,6 @@ public class JetDiagnosticsTestWithStdLibGenerated extends AbstractJetDiagnostic

    @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/callableReference")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            CallableReference.Function.class,
-            CallableReference.Property.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class CallableReference extends AbstractJetDiagnosticsTestWithStdLib {
        public void testAllFilesPresentInCallableReference() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.cli;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,10 +27,6 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        KotlincExecutableTestGenerated.Jvm.class,
-        KotlincExecutableTestGenerated.Js.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class KotlincExecutableTestGenerated extends AbstractKotlincExecutableTest {
    @TestMetadata("compiler/testData/cli/jvm")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.codegen;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,24 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/bytecodeText")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        BytecodeTextTestGenerated.BoxingOptimization.class,
-        BytecodeTextTestGenerated.Conditions.class,
-        BytecodeTextTestGenerated.Constants.class,
-        BytecodeTextTestGenerated.DeadCodeElimination.class,
-        BytecodeTextTestGenerated.DirectInvoke.class,
-        BytecodeTextTestGenerated.ForLoop.class,
-        BytecodeTextTestGenerated.Inline.class,
-        BytecodeTextTestGenerated.LazyCodegen.class,
-        BytecodeTextTestGenerated.LineNumbers.class,
-        BytecodeTextTestGenerated.Statements.class,
-        BytecodeTextTestGenerated.StaticFields.class,
-        BytecodeTextTestGenerated.StoreStackBeforeInline.class,
-        BytecodeTextTestGenerated.StringOperations.class,
-        BytecodeTextTestGenerated.When.class,
-        BytecodeTextTestGenerated.WhenEnumOptimization.class,
-        BytecodeTextTestGenerated.WhenStringOptimization.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
    @TestMetadata("accessorForProtected.kt")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.codegen;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.codegen;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,10 +27,6 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        LineNumberTestGenerated.LineNumber.class,
-        LineNumberTestGenerated.Custom.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class LineNumberTestGenerated extends AbstractLineNumberTest {
    @TestMetadata("compiler/testData/lineNumber")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.codegen;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.codegen;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.codegen.defaultConstructor;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.codegen.flags;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,13 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/writeFlags")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        WriteFlagsTestGenerated.Class.class,
-        WriteFlagsTestGenerated.DelegatedProperty.class,
-        WriteFlagsTestGenerated.Function.class,
-        WriteFlagsTestGenerated.InnerClass.class,
-        WriteFlagsTestGenerated.Property.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
    public void testAllFilesPresentInWriteFlags() throws Exception {
@@ -45,11 +37,6 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {

    @TestMetadata("compiler/testData/writeFlags/class")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Class.AccessFlags.class,
-            Class.DeprecatedFlag.class,
-            Class.Visibility.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Class extends AbstractWriteFlagsTest {
        public void testAllFilesPresentInClass() throws Exception {
@@ -136,11 +123,6 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {

        @TestMetadata("compiler/testData/writeFlags/class/visibility")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Visibility.Internal.class,
-                Visibility.Private.class,
-                Visibility.Public.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Visibility extends AbstractWriteFlagsTest {
            public void testAllFilesPresentInVisibility() throws Exception {
@@ -322,9 +304,6 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {

    @TestMetadata("compiler/testData/writeFlags/delegatedProperty")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            DelegatedProperty.Visibility.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class DelegatedProperty extends AbstractWriteFlagsTest {
        public void testAllFilesPresentInDelegatedProperty() throws Exception {
@@ -349,11 +328,6 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {

    @TestMetadata("compiler/testData/writeFlags/function")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Function.ClassObjectPrivate.class,
-            Function.Constructors.class,
-            Function.DeprecatedFlag.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Function extends AbstractWriteFlagsTest {
        public void testAllFilesPresentInFunction() throws Exception {
@@ -504,9 +478,6 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {

    @TestMetadata("compiler/testData/writeFlags/innerClass")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            InnerClass.Visibility.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class InnerClass extends AbstractWriteFlagsTest {
        public void testAllFilesPresentInInnerClass() throws Exception {
@@ -561,11 +532,6 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {

    @TestMetadata("compiler/testData/writeFlags/property")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Property.ClassObject.class,
-            Property.DeprecatedFlag.class,
-            Property.Visibility.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Property extends AbstractWriteFlagsTest {
        public void testAllFilesPresentInProperty() throws Exception {
@@ -574,11 +540,6 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {

        @TestMetadata("compiler/testData/writeFlags/property/classObject")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                ClassObject.Class.class,
-                ClassObject.Rename.class,
-                ClassObject.Trait.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class ClassObject extends AbstractWriteFlagsTest {
            public void testAllFilesPresentInClassObject() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.codegen.generated;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,22 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/boxAgainstJava")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        BlackBoxAgainstJavaCodegenTestGenerated.Annotations.class,
-        BlackBoxAgainstJavaCodegenTestGenerated.CallableReference.class,
-        BlackBoxAgainstJavaCodegenTestGenerated.Constructor.class,
-        BlackBoxAgainstJavaCodegenTestGenerated.Delegation.class,
-        BlackBoxAgainstJavaCodegenTestGenerated.Enum.class,
-        BlackBoxAgainstJavaCodegenTestGenerated.Functions.class,
-        BlackBoxAgainstJavaCodegenTestGenerated.InnerClass.class,
-        BlackBoxAgainstJavaCodegenTestGenerated.NotNullAssertions.class,
-        BlackBoxAgainstJavaCodegenTestGenerated.PlatformTypes.class,
-        BlackBoxAgainstJavaCodegenTestGenerated.Property.class,
-        BlackBoxAgainstJavaCodegenTestGenerated.Reflection.class,
-        BlackBoxAgainstJavaCodegenTestGenerated.Sam.class,
-        BlackBoxAgainstJavaCodegenTestGenerated.StaticFun.class,
-        BlackBoxAgainstJavaCodegenTestGenerated.Visibility.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
    public void testAllFilesPresentInBoxAgainstJava() throws Exception {
@@ -348,11 +331,6 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod

    @TestMetadata("compiler/testData/codegen/boxAgainstJava/reflection")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Reflection.ClassLiterals.class,
-            Reflection.Mapping.class,
-            Reflection.Properties.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Reflection extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInReflection() throws Exception {
@@ -413,9 +391,6 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod

    @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Sam.Adapters.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Sam extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInSam() throws Exception {
@@ -436,9 +411,6 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod

        @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Adapters.Operators.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Adapters extends AbstractBlackBoxCodegenTest {
            public void testAllFilesPresentInAdapters() throws Exception {
@@ -701,11 +673,6 @@ public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCod

    @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Visibility.Package.class,
-            Visibility.ProtectedAndPackage.class,
-            Visibility.ProtectedStatic.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Visibility extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInVisibility() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.codegen.generated;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,60 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/box")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        BlackBoxCodegenTestGenerated.Arrays.class,
-        BlackBoxCodegenTestGenerated.BinaryOp.class,
-        BlackBoxCodegenTestGenerated.Bridges.class,
-        BlackBoxCodegenTestGenerated.BuiltinStubMethods.class,
-        BlackBoxCodegenTestGenerated.Casts.class,
-        BlackBoxCodegenTestGenerated.Classes.class,
-        BlackBoxCodegenTestGenerated.Closures.class,
-        BlackBoxCodegenTestGenerated.Constants.class,
-        BlackBoxCodegenTestGenerated.ControlStructures.class,
-        BlackBoxCodegenTestGenerated.DefaultArguments.class,
-        BlackBoxCodegenTestGenerated.DelegatedProperty.class,
-        BlackBoxCodegenTestGenerated.Diagnostics.class,
-        BlackBoxCodegenTestGenerated.Elvis.class,
-        BlackBoxCodegenTestGenerated.Enum.class,
-        BlackBoxCodegenTestGenerated.ExclExcl.class,
-        BlackBoxCodegenTestGenerated.ExtensionFunctions.class,
-        BlackBoxCodegenTestGenerated.ExtensionProperties.class,
-        BlackBoxCodegenTestGenerated.FakeOverride.class,
-        BlackBoxCodegenTestGenerated.FieldRename.class,
-        BlackBoxCodegenTestGenerated.Finally.class,
-        BlackBoxCodegenTestGenerated.Functions.class,
-        BlackBoxCodegenTestGenerated.InnerNested.class,
-        BlackBoxCodegenTestGenerated.Instructions.class,
-        BlackBoxCodegenTestGenerated.Intrinsics.class,
-        BlackBoxCodegenTestGenerated.JavaInterop.class,
-        BlackBoxCodegenTestGenerated.Labels.class,
-        BlackBoxCodegenTestGenerated.LocalClasses.class,
-        BlackBoxCodegenTestGenerated.MultiDecl.class,
-        BlackBoxCodegenTestGenerated.ObjectIntrinsics.class,
-        BlackBoxCodegenTestGenerated.Objects.class,
-        BlackBoxCodegenTestGenerated.OperatorConventions.class,
-        BlackBoxCodegenTestGenerated.Package.class,
-        BlackBoxCodegenTestGenerated.PlatformTypes.class,
-        BlackBoxCodegenTestGenerated.PrimitiveTypes.class,
-        BlackBoxCodegenTestGenerated.Properties.class,
-        BlackBoxCodegenTestGenerated.Reflection.class,
-        BlackBoxCodegenTestGenerated.Regressions.class,
-        BlackBoxCodegenTestGenerated.SafeCall.class,
-        BlackBoxCodegenTestGenerated.SamConstructors.class,
-        BlackBoxCodegenTestGenerated.SecondaryConstructors.class,
-        BlackBoxCodegenTestGenerated.StaticFields.class,
-        BlackBoxCodegenTestGenerated.Strings.class,
-        BlackBoxCodegenTestGenerated.Super.class,
-        BlackBoxCodegenTestGenerated.SuperConstructorCall.class,
-        BlackBoxCodegenTestGenerated.ToArray.class,
-        BlackBoxCodegenTestGenerated.Traits.class,
-        BlackBoxCodegenTestGenerated.TypeInfo.class,
-        BlackBoxCodegenTestGenerated.TypeMapping.class,
-        BlackBoxCodegenTestGenerated.UnaryOp.class,
-        BlackBoxCodegenTestGenerated.Unit.class,
-        BlackBoxCodegenTestGenerated.Vararg.class,
-        BlackBoxCodegenTestGenerated.When.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
    public void testAllFilesPresentInBox() throws Exception {
@@ -356,9 +301,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

    @TestMetadata("compiler/testData/codegen/box/bridges")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Bridges.SubstitutionInSuperClass.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Bridges extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInBridges() throws Exception {
@@ -701,9 +643,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

    @TestMetadata("compiler/testData/codegen/box/builtinStubMethods")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            BuiltinStubMethods.ExtendJavaCollections.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class BuiltinStubMethods extends AbstractBlackBoxCodegenTest {
        @TestMetadata("abstractMember.kt")
@@ -1592,10 +1531,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

    @TestMetadata("compiler/testData/codegen/box/closures")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Closures.CaptureOuterProperty.class,
-            Closures.ClosureInsideClosure.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Closures extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInClosures() throws Exception {
@@ -2241,10 +2176,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

    @TestMetadata("compiler/testData/codegen/box/defaultArguments")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            DefaultArguments.Constructor.class,
-            DefaultArguments.Function.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class DefaultArguments extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInDefaultArguments() throws Exception {
@@ -2470,9 +2401,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

    @TestMetadata("compiler/testData/codegen/box/delegatedProperty")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            DelegatedProperty.PropertyDelegatedMethod.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class DelegatedProperty extends AbstractBlackBoxCodegenTest {
        @TestMetadata("accessTopLevelDelegatedPropertyInClinit.kt")
@@ -2755,10 +2683,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

    @TestMetadata("compiler/testData/codegen/box/diagnostics")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Diagnostics.Functions.class,
-            Diagnostics.Vararg.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Diagnostics extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInDiagnostics() throws Exception {
@@ -2767,11 +2691,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

        @TestMetadata("compiler/testData/codegen/box/diagnostics/functions")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Functions.Inference.class,
-                Functions.Invoke.class,
-                Functions.TailRecursion.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Functions extends AbstractBlackBoxCodegenTest {
            public void testAllFilesPresentInFunctions() throws Exception {
@@ -2795,9 +2714,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

            @TestMetadata("compiler/testData/codegen/box/diagnostics/functions/invoke")
            @TestDataPath("$PROJECT_ROOT")
-            @InnerTestClasses({
-                    Invoke.OnObjects.class,
-            })
            @RunWith(JUnit3RunnerWithInners.class)
            public static class Invoke extends AbstractBlackBoxCodegenTest {
                public void testAllFilesPresentInInvoke() throws Exception {
@@ -3640,10 +3556,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

    @TestMetadata("compiler/testData/codegen/box/functions")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Functions.Invoke.class,
-            Functions.LocalFunctions.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Functions extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInFunctions() throws Exception {
@@ -4196,9 +4108,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

    @TestMetadata("compiler/testData/codegen/box/instructions")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Instructions.Swap.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Instructions extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInInstructions() throws Exception {
@@ -4286,10 +4195,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

    @TestMetadata("compiler/testData/codegen/box/javaInterop")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            JavaInterop.NotNullAssertions.class,
-            JavaInterop.ObjectMethods.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class JavaInterop extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInJavaInterop() throws Exception {
@@ -4539,10 +4444,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

    @TestMetadata("compiler/testData/codegen/box/multiDecl")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            MultiDecl.ForIterator.class,
-            MultiDecl.ForRange.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class MultiDecl extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInMultiDecl() throws Exception {
@@ -4617,9 +4518,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

        @TestMetadata("compiler/testData/codegen/box/multiDecl/forIterator")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                ForIterator.LongIterator.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class ForIterator extends AbstractBlackBoxCodegenTest {
            public void testAllFilesPresentInForIterator() throws Exception {
@@ -4692,12 +4590,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

        @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                ForRange.ExplicitRangeTo.class,
-                ForRange.ExplicitRangeToWithDot.class,
-                ForRange.Int.class,
-                ForRange.Long.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class ForRange extends AbstractBlackBoxCodegenTest {
            public void testAllFilesPresentInForRange() throws Exception {
@@ -4736,10 +4628,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

            @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeTo")
            @TestDataPath("$PROJECT_ROOT")
-            @InnerTestClasses({
-                    ExplicitRangeTo.Int.class,
-                    ExplicitRangeTo.Long.class,
-            })
            @RunWith(JUnit3RunnerWithInners.class)
            public static class ExplicitRangeTo extends AbstractBlackBoxCodegenTest {
                public void testAllFilesPresentInExplicitRangeTo() throws Exception {
@@ -4845,10 +4733,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

            @TestMetadata("compiler/testData/codegen/box/multiDecl/forRange/explicitRangeToWithDot")
            @TestDataPath("$PROJECT_ROOT")
-            @InnerTestClasses({
-                    ExplicitRangeToWithDot.Int.class,
-                    ExplicitRangeToWithDot.Long.class,
-            })
            @RunWith(JUnit3RunnerWithInners.class)
            public static class ExplicitRangeToWithDot extends AbstractBlackBoxCodegenTest {
                public void testAllFilesPresentInExplicitRangeToWithDot() throws Exception {
@@ -5274,9 +5158,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

    @TestMetadata("compiler/testData/codegen/box/operatorConventions")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            OperatorConventions.CompareTo.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class OperatorConventions extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInOperatorConventions() throws Exception {
@@ -5442,9 +5323,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

    @TestMetadata("compiler/testData/codegen/box/platformTypes")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            PlatformTypes.Primitives.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class PlatformTypes extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInPlatformTypes() throws Exception {
@@ -6855,9 +6733,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {

    @TestMetadata("compiler/testData/codegen/box/traits")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Traits.WithRequired.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Traits extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInTraits() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.codegen.generated;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,24 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/boxInline")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        BlackBoxInlineCodegenTestGenerated.AnonymousObject.class,
-        BlackBoxInlineCodegenTestGenerated.Builders.class,
-        BlackBoxInlineCodegenTestGenerated.Capture.class,
-        BlackBoxInlineCodegenTestGenerated.Complex.class,
-        BlackBoxInlineCodegenTestGenerated.DefaultValues.class,
-        BlackBoxInlineCodegenTestGenerated.LambdaClassClash.class,
-        BlackBoxInlineCodegenTestGenerated.LambdaTransformation.class,
-        BlackBoxInlineCodegenTestGenerated.LocalFunInLambda.class,
-        BlackBoxInlineCodegenTestGenerated.NoInline.class,
-        BlackBoxInlineCodegenTestGenerated.NonLocalReturns.class,
-        BlackBoxInlineCodegenTestGenerated.Reified.class,
-        BlackBoxInlineCodegenTestGenerated.Simple.class,
-        BlackBoxInlineCodegenTestGenerated.Smap.class,
-        BlackBoxInlineCodegenTestGenerated.Special.class,
-        BlackBoxInlineCodegenTestGenerated.Trait.class,
-        BlackBoxInlineCodegenTestGenerated.TryCatchFinally.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCodegenTest {
    public void testAllFilesPresentInBoxInline() throws Exception {
@@ -359,10 +340,6 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo

    @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            NonLocalReturns.Deparenthesize.class,
-            NonLocalReturns.TryFinally.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class NonLocalReturns extends AbstractBlackBoxInlineCodegenTest {
        public void testAllFilesPresentInNonLocalReturns() throws Exception {
@@ -434,11 +411,6 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo

        @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                TryFinally.CallSite.class,
-                TryFinally.DeclSite.class,
-                TryFinally.ExceptionTable.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class TryFinally extends AbstractBlackBoxInlineCodegenTest {
            public void testAllFilesPresentInTryFinally() throws Exception {
@@ -752,10 +724,6 @@ public class BlackBoxInlineCodegenTestGenerated extends AbstractBlackBoxInlineCo

    @TestMetadata("compiler/testData/codegen/boxInline/smap")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Smap.Anonymous.class,
-            Smap.Resolve.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Smap extends AbstractBlackBoxInlineCodegenTest {
        public void testAllFilesPresentInSmap() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.codegen.generated;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.codegen.generated;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,15 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/boxWithJava")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        BlackBoxWithJavaCodegenTestGenerated.BuiltinStubMethods.class,
-        BlackBoxWithJavaCodegenTestGenerated.JvmOverloads.class,
-        BlackBoxWithJavaCodegenTestGenerated.NotNullAssertions.class,
-        BlackBoxWithJavaCodegenTestGenerated.PlatformStatic.class,
-        BlackBoxWithJavaCodegenTestGenerated.Properties.class,
-        BlackBoxWithJavaCodegenTestGenerated.Reflection.class,
-        BlackBoxWithJavaCodegenTestGenerated.SecondaryConstructors.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
    public void testAllFilesPresentInBoxWithJava() throws Exception {
@@ -71,8 +61,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege

    @TestMetadata("compiler/testData/codegen/boxWithJava/builtinStubMethods")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class BuiltinStubMethods extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInBuiltinStubMethods() throws Exception {
@@ -101,8 +89,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege

    @TestMetadata("compiler/testData/codegen/boxWithJava/jvmOverloads")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class JvmOverloads extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInJvmOverloads() throws Exception {
@@ -125,8 +111,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege

    @TestMetadata("compiler/testData/codegen/boxWithJava/notNullAssertions")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class NotNullAssertions extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInNotNullAssertions() throws Exception {
@@ -143,8 +127,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege

    @TestMetadata("compiler/testData/codegen/boxWithJava/platformStatic")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class PlatformStatic extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInPlatformStatic() throws Exception {
@@ -173,8 +155,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege

    @TestMetadata("compiler/testData/codegen/boxWithJava/properties")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Properties extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInProperties() throws Exception {
@@ -191,8 +171,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege

    @TestMetadata("compiler/testData/codegen/boxWithJava/reflection")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Reflection extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInReflection() throws Exception {
@@ -215,8 +193,6 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege

    @TestMetadata("compiler/testData/codegen/boxWithJava/secondaryConstructors")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class SecondaryConstructors extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInSecondaryConstructors() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.codegen.generated;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,42 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/boxWithStdlib")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        BlackBoxWithStdlibCodegenTestGenerated.Annotations.class,
-        BlackBoxWithStdlibCodegenTestGenerated.Arrays.class,
-        BlackBoxWithStdlibCodegenTestGenerated.BoxingOptimization.class,
-        BlackBoxWithStdlibCodegenTestGenerated.CallableReference.class,
-        BlackBoxWithStdlibCodegenTestGenerated.Casts.class,
-        BlackBoxWithStdlibCodegenTestGenerated.Classes.class,
-        BlackBoxWithStdlibCodegenTestGenerated.DataClasses.class,
-        BlackBoxWithStdlibCodegenTestGenerated.DeadCodeElimination.class,
-        BlackBoxWithStdlibCodegenTestGenerated.DefaultArguments.class,
-        BlackBoxWithStdlibCodegenTestGenerated.Enum.class,
-        BlackBoxWithStdlibCodegenTestGenerated.Evaluate.class,
-        BlackBoxWithStdlibCodegenTestGenerated.FullJdk.class,
-        BlackBoxWithStdlibCodegenTestGenerated.HashPMap.class,
-        BlackBoxWithStdlibCodegenTestGenerated.Intrinsics.class,
-        BlackBoxWithStdlibCodegenTestGenerated.JdkAnnotations.class,
-        BlackBoxWithStdlibCodegenTestGenerated.JvmOverloads.class,
-        BlackBoxWithStdlibCodegenTestGenerated.LazyCodegen.class,
-        BlackBoxWithStdlibCodegenTestGenerated.LocalFunInLambda.class,
-        BlackBoxWithStdlibCodegenTestGenerated.MultiDeclForArray.class,
-        BlackBoxWithStdlibCodegenTestGenerated.NonLocalReturns.class,
-        BlackBoxWithStdlibCodegenTestGenerated.PlatformNames.class,
-        BlackBoxWithStdlibCodegenTestGenerated.PlatformStatic.class,
-        BlackBoxWithStdlibCodegenTestGenerated.Ranges.class,
-        BlackBoxWithStdlibCodegenTestGenerated.Reflection.class,
-        BlackBoxWithStdlibCodegenTestGenerated.Regressions.class,
-        BlackBoxWithStdlibCodegenTestGenerated.Reified.class,
-        BlackBoxWithStdlibCodegenTestGenerated.StoreStackBeforeInline.class,
-        BlackBoxWithStdlibCodegenTestGenerated.Strings.class,
-        BlackBoxWithStdlibCodegenTestGenerated.Synthetic.class,
-        BlackBoxWithStdlibCodegenTestGenerated.ToArray.class,
-        BlackBoxWithStdlibCodegenTestGenerated.Vararg.class,
-        BlackBoxWithStdlibCodegenTestGenerated.When.class,
-        BlackBoxWithStdlibCodegenTestGenerated.WhenEnumOptimization.class,
-        BlackBoxWithStdlibCodegenTestGenerated.WhenStringOptimization.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
    public void testAllFilesPresentInBoxWithStdlib() throws Exception {
@@ -359,10 +322,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode

    @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            CallableReference.Function.class,
-            CallableReference.Property.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class CallableReference extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInCallableReference() throws Exception {
@@ -371,9 +330,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode

        @TestMetadata("compiler/testData/codegen/boxWithStdlib/callableReference/function")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Function.Local.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Function extends AbstractBlackBoxCodegenTest {
            @TestMetadata("abstractClassMember.kt")
@@ -924,12 +880,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode

    @TestMetadata("compiler/testData/codegen/boxWithStdlib/dataClasses")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            DataClasses.Copy.class,
-            DataClasses.Equals.class,
-            DataClasses.Hashcode.class,
-            DataClasses.Tostring.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class DataClasses extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInDataClasses() throws Exception {
@@ -1296,9 +1246,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode

    @TestMetadata("compiler/testData/codegen/boxWithStdlib/defaultArguments")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            DefaultArguments.Constructor.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class DefaultArguments extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInDefaultArguments() throws Exception {
@@ -1437,12 +1384,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode

    @TestMetadata("compiler/testData/codegen/boxWithStdlib/fullJdk")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            FullJdk.Native.class,
-            FullJdk.Regressions.class,
-            FullJdk.Smap.class,
-            FullJdk.Synchronized.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class FullJdk extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInFullJdk() throws Exception {
@@ -1896,9 +1837,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode

    @TestMetadata("compiler/testData/codegen/boxWithStdlib/lazyCodegen")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            LazyCodegen.Optimizations.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class LazyCodegen extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInLazyCodegen() throws Exception {
@@ -2058,10 +1996,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode

    @TestMetadata("compiler/testData/codegen/boxWithStdlib/multiDeclForArray")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            MultiDeclForArray.Int.class,
-            MultiDeclForArray.Long.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class MultiDeclForArray extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInMultiDeclForArray() throws Exception {
@@ -2314,10 +2248,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode

    @TestMetadata("compiler/testData/codegen/boxWithStdlib/ranges")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Ranges.Expression.class,
-            Ranges.Literal.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Ranges extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInRanges() throws Exception {
@@ -2717,14 +2647,6 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxCode

    @TestMetadata("compiler/testData/codegen/boxWithStdlib/reflection")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Reflection.ClassLiterals.class,
-            Reflection.Enclosing.class,
-            Reflection.GenericSignature.class,
-            Reflection.Mapping.class,
-            Reflection.MethodsFromAny.class,
-            Reflection.Properties.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Reflection extends AbstractBlackBoxCodegenTest {
        public void testAllFilesPresentInReflection() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.jvm.compiler;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,13 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/compileJavaAgainstKotlin")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        CompileJavaAgainstKotlinTestGenerated.Class.class,
-        CompileJavaAgainstKotlinTestGenerated.Method.class,
-        CompileJavaAgainstKotlinTestGenerated.PlatformStatic.class,
-        CompileJavaAgainstKotlinTestGenerated.Property.class,
-        CompileJavaAgainstKotlinTestGenerated.StaticFields.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAgainstKotlinTest {
    public void testAllFilesPresentInCompileJavaAgainstKotlin() throws Exception {
@@ -132,11 +124,6 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg

    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/method")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Method.PlatformName.class,
-            Method.PrimitiveOverride.class,
-            Method.Throws.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Method extends AbstractCompileJavaAgainstKotlinTest {
        @TestMetadata("AccessorGenericSignature.kt")
@@ -464,9 +451,6 @@ public class CompileJavaAgainstKotlinTestGenerated extends AbstractCompileJavaAg

    @TestMetadata("compiler/testData/compileJavaAgainstKotlin/property")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Property.PlatformName.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Property extends AbstractCompileJavaAgainstKotlinTest {
        public void testAllFilesPresentInProperty() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.jvm.compiler;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,24 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/boxInline")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        CompileKotlinAgainstInlineKotlinTestGenerated.AnonymousObject.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.Builders.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.Capture.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.Complex.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.DefaultValues.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.LambdaClassClash.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.LambdaTransformation.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.LocalFunInLambda.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.NoInline.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.NonLocalReturns.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.Reified.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.Simple.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.Smap.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.Special.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.Trait.class,
-        CompileKotlinAgainstInlineKotlinTestGenerated.TryCatchFinally.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompileKotlinAgainstInlineKotlinTest {
    public void testAllFilesPresentInBoxInline() throws Exception {
@@ -359,10 +340,6 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi

    @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            NonLocalReturns.Deparenthesize.class,
-            NonLocalReturns.TryFinally.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class NonLocalReturns extends AbstractCompileKotlinAgainstInlineKotlinTest {
        public void testAllFilesPresentInNonLocalReturns() throws Exception {
@@ -434,11 +411,6 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi

        @TestMetadata("compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                TryFinally.CallSite.class,
-                TryFinally.DeclSite.class,
-                TryFinally.ExceptionTable.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class TryFinally extends AbstractCompileKotlinAgainstInlineKotlinTest {
            public void testAllFilesPresentInTryFinally() throws Exception {
@@ -752,10 +724,6 @@ public class CompileKotlinAgainstInlineKotlinTestGenerated extends AbstractCompi

    @TestMetadata("compiler/testData/codegen/boxInline/smap")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Smap.Anonymous.class,
-            Smap.Resolve.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Smap extends AbstractCompileKotlinAgainstInlineKotlinTest {
        public void testAllFilesPresentInSmap() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.jvm.compiler;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.jvm.compiler;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,38 +27,10 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        LoadJavaTestGenerated.CompiledJava.class,
-        LoadJavaTestGenerated.CompiledJavaAndKotlin.class,
-        LoadJavaTestGenerated.CompiledJavaIncludeObjectMethods.class,
-        LoadJavaTestGenerated.CompiledKotlin.class,
-        LoadJavaTestGenerated.CompiledKotlinWithStdlib.class,
-        LoadJavaTestGenerated.JavaAgainstKotlin.class,
-        LoadJavaTestGenerated.KotlinAgainstCompiledJavaWithKotlin.class,
-        LoadJavaTestGenerated.SourceJava.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class LoadJavaTestGenerated extends AbstractLoadJavaTest {
    @TestMetadata("compiler/testData/loadJava/compiledJava")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            CompiledJava.Annotations.class,
-            CompiledJava.Constructor.class,
-            CompiledJava.Enum.class,
-            CompiledJava.JavaBean.class,
-            CompiledJava.KotlinSignature.class,
-            CompiledJava.Library.class,
-            CompiledJava.Modality.class,
-            CompiledJava.Mutability.class,
-            CompiledJava.NotNull.class,
-            CompiledJava.ProtectedPackage.class,
-            CompiledJava.ProtectedStatic.class,
-            CompiledJava.Rendering.class,
-            CompiledJava.Sam.class,
-            CompiledJava.SignaturePropagation.class,
-            CompiledJava.Static.class,
-            CompiledJava.Vararg.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class CompiledJava extends AbstractLoadJavaTest {
        public void testAllFilesPresentInCompiledJava() throws Exception {
@@ -566,10 +537,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

        @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                KotlinSignature.Error.class,
-                KotlinSignature.Propagation.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class KotlinSignature extends AbstractLoadJavaTest {
            @TestMetadata("AllBoundsInWhen.java")
@@ -845,11 +812,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

            @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature/propagation")
            @TestDataPath("$PROJECT_ROOT")
-            @InnerTestClasses({
-                    Propagation.Parameter.class,
-                    Propagation.Return.class,
-                    Propagation.TypeParameter.class,
-            })
            @RunWith(JUnit3RunnerWithInners.class)
            public static class Propagation extends AbstractLoadJavaTest {
                public void testAllFilesPresentInPropagation() throws Exception {
@@ -1478,9 +1440,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

        @TestMetadata("compiler/testData/loadJava/compiledJava/sam")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Sam.Adapters.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Sam extends AbstractLoadJavaTest {
            public void testAllFilesPresentInSam() throws Exception {
@@ -1567,9 +1526,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

            @TestMetadata("compiler/testData/loadJava/compiledJava/sam/adapters")
            @TestDataPath("$PROJECT_ROOT")
-            @InnerTestClasses({
-                    Adapters.Inheritance.class,
-            })
            @RunWith(JUnit3RunnerWithInners.class)
            public static class Adapters extends AbstractLoadJavaTest {
                public void testAllFilesPresentInAdapters() throws Exception {
@@ -1857,8 +1813,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

    @TestMetadata("compiler/testData/loadJava/compiledJavaAndKotlin")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class CompiledJavaAndKotlin extends AbstractLoadJavaTest {
        public void testAllFilesPresentInCompiledJavaAndKotlin() throws Exception {
@@ -1902,24 +1856,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

    @TestMetadata("compiler/testData/loadJava/compiledKotlin")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            CompiledKotlin.Annotations.class,
-            CompiledKotlin.Class.class,
-            CompiledKotlin.ClassFun.class,
-            CompiledKotlin.ClassObject.class,
-            CompiledKotlin.Constructor.class,
-            CompiledKotlin.DataClass.class,
-            CompiledKotlin.Enum.class,
-            CompiledKotlin.FromLoadJava.class,
-            CompiledKotlin.Fun.class,
-            CompiledKotlin.Inline.class,
-            CompiledKotlin.MemberOrder.class,
-            CompiledKotlin.Nested.class,
-            CompiledKotlin.PlatformTypes.class,
-            CompiledKotlin.Prop.class,
-            CompiledKotlin.Type.class,
-            CompiledKotlin.Visibility.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class CompiledKotlin extends AbstractLoadJavaTest {
        public void testAllFilesPresentInCompiledKotlin() throws Exception {
@@ -1928,13 +1864,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

        @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Annotations.ClassMembers.class,
-                Annotations.Classes.class,
-                Annotations.PackageMembers.class,
-                Annotations.Parameters.class,
-                Annotations.PropertiesWithoutBackingFields.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Annotations extends AbstractLoadJavaTest {
            public void testAllFilesPresentInAnnotations() throws Exception {
@@ -2319,9 +2248,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

        @TestMetadata("compiler/testData/loadJava/compiledKotlin/class")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Class.JavaBean.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Class extends AbstractLoadJavaTest {
            public void testAllFilesPresentInClass() throws Exception {
@@ -2712,9 +2638,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

        @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Constructor.Vararg.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Constructor extends AbstractLoadJavaTest {
            public void testAllFilesPresentInConstructor() throws Exception {
@@ -2943,12 +2866,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

        @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                FromLoadJava.KotlinSignature.class,
-                FromLoadJava.Library.class,
-                FromLoadJava.Modality.class,
-                FromLoadJava.NotNull.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class FromLoadJava extends AbstractLoadJavaTest {
            public void testAllFilesPresentInFromLoadJava() throws Exception {
@@ -3161,10 +3078,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

            @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature")
            @TestDataPath("$PROJECT_ROOT")
-            @InnerTestClasses({
-                    KotlinSignature.Error.class,
-                    KotlinSignature.Propagation.class,
-            })
            @RunWith(JUnit3RunnerWithInners.class)
            public static class KotlinSignature extends AbstractLoadJavaTest {
                @TestMetadata("AllBoundsInWhen.kt")
@@ -3440,11 +3353,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

                @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation")
                @TestDataPath("$PROJECT_ROOT")
-                @InnerTestClasses({
-                        Propagation.Parameter.class,
-                        Propagation.Return.class,
-                        Propagation.TypeParameter.class,
-                })
                @RunWith(JUnit3RunnerWithInners.class)
                public static class Propagation extends AbstractLoadJavaTest {
                    public void testAllFilesPresentInPropagation() throws Exception {
@@ -3984,12 +3892,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

        @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Fun.GenericWithTypeVariables.class,
-                Fun.GenericWithoutTypeVariables.class,
-                Fun.NonGeneric.class,
-                Fun.Vararg.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Fun extends AbstractLoadJavaTest {
            public void testAllFilesPresentInFun() throws Exception {
@@ -4407,9 +4309,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

        @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Prop.DefaultAccessors.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Prop extends AbstractLoadJavaTest {
            public void testAllFilesPresentInProp() throws Exception {
@@ -4963,10 +4862,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

    @TestMetadata("compiler/testData/loadJava/compiledKotlinWithStdlib")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            CompiledKotlinWithStdlib.Mutability.class,
-            CompiledKotlinWithStdlib.PlatformNames.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class CompiledKotlinWithStdlib extends AbstractLoadJavaTest {
        public void testAllFilesPresentInCompiledKotlinWithStdlib() throws Exception {
@@ -5024,11 +4919,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

    @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            JavaAgainstKotlin.SamAdapters.class,
-            JavaAgainstKotlin.SignaturePropagation.class,
-            JavaAgainstKotlin.Visibility.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class JavaAgainstKotlin extends AbstractLoadJavaTest {
        public void testAllFilesPresentInJavaAgainstKotlin() throws Exception {
@@ -5037,8 +4927,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

        @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/samAdapters")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class SamAdapters extends AbstractLoadJavaTest {
            public void testAllFilesPresentInSamAdapters() throws Exception {
@@ -5079,8 +4967,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

        @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class SignaturePropagation extends AbstractLoadJavaTest {
            public void testAllFilesPresentInSignaturePropagation() throws Exception {
@@ -5121,8 +5007,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest {

        @TestMetadata("compiler/testData/loadJava/javaAgainstKotlin/visibility")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Visibility extends AbstractLoadJavaTest {
            public void testAllFilesPresentInVisibility() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.jvm.compiler;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,11 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/writeSignature")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        WriteSignatureTestGenerated.Constructor.class,
-        WriteSignatureTestGenerated.DeclarationSiteVariance.class,
-        WriteSignatureTestGenerated.Nothing.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class WriteSignatureTestGenerated extends AbstractWriteSignatureTest {
    public void testAllFilesPresentInWriteSignature() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.jvm.runtime;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,32 +27,10 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        JvmRuntimeDescriptorLoaderTestGenerated.CompiledKotlin.class,
-        JvmRuntimeDescriptorLoaderTestGenerated.CompiledJava.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeDescriptorLoaderTest {
    @TestMetadata("compiler/testData/loadJava/compiledKotlin")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            CompiledKotlin.Annotations.class,
-            CompiledKotlin.Class.class,
-            CompiledKotlin.ClassFun.class,
-            CompiledKotlin.ClassObject.class,
-            CompiledKotlin.Constructor.class,
-            CompiledKotlin.DataClass.class,
-            CompiledKotlin.Enum.class,
-            CompiledKotlin.FromLoadJava.class,
-            CompiledKotlin.Fun.class,
-            CompiledKotlin.Inline.class,
-            CompiledKotlin.MemberOrder.class,
-            CompiledKotlin.Nested.class,
-            CompiledKotlin.PlatformTypes.class,
-            CompiledKotlin.Prop.class,
-            CompiledKotlin.Type.class,
-            CompiledKotlin.Visibility.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class CompiledKotlin extends AbstractJvmRuntimeDescriptorLoaderTest {
        public void testAllFilesPresentInCompiledKotlin() throws Exception {
@@ -62,13 +39,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD

        @TestMetadata("compiler/testData/loadJava/compiledKotlin/annotations")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Annotations.ClassMembers.class,
-                Annotations.Classes.class,
-                Annotations.PackageMembers.class,
-                Annotations.Parameters.class,
-                Annotations.PropertiesWithoutBackingFields.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Annotations extends AbstractJvmRuntimeDescriptorLoaderTest {
            public void testAllFilesPresentInAnnotations() throws Exception {
@@ -453,9 +423,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD

        @TestMetadata("compiler/testData/loadJava/compiledKotlin/class")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Class.JavaBean.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Class extends AbstractJvmRuntimeDescriptorLoaderTest {
            public void testAllFilesPresentInClass() throws Exception {
@@ -846,9 +813,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD

        @TestMetadata("compiler/testData/loadJava/compiledKotlin/constructor")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Constructor.Vararg.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Constructor extends AbstractJvmRuntimeDescriptorLoaderTest {
            public void testAllFilesPresentInConstructor() throws Exception {
@@ -1077,12 +1041,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD

        @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                FromLoadJava.KotlinSignature.class,
-                FromLoadJava.Library.class,
-                FromLoadJava.Modality.class,
-                FromLoadJava.NotNull.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class FromLoadJava extends AbstractJvmRuntimeDescriptorLoaderTest {
            public void testAllFilesPresentInFromLoadJava() throws Exception {
@@ -1295,10 +1253,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD

            @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature")
            @TestDataPath("$PROJECT_ROOT")
-            @InnerTestClasses({
-                    KotlinSignature.Error.class,
-                    KotlinSignature.Propagation.class,
-            })
            @RunWith(JUnit3RunnerWithInners.class)
            public static class KotlinSignature extends AbstractJvmRuntimeDescriptorLoaderTest {
                @TestMetadata("AllBoundsInWhen.kt")
@@ -1574,11 +1528,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD

                @TestMetadata("compiler/testData/loadJava/compiledKotlin/fromLoadJava/kotlinSignature/propagation")
                @TestDataPath("$PROJECT_ROOT")
-                @InnerTestClasses({
-                        Propagation.Parameter.class,
-                        Propagation.Return.class,
-                        Propagation.TypeParameter.class,
-                })
                @RunWith(JUnit3RunnerWithInners.class)
                public static class Propagation extends AbstractJvmRuntimeDescriptorLoaderTest {
                    public void testAllFilesPresentInPropagation() throws Exception {
@@ -2118,12 +2067,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD

        @TestMetadata("compiler/testData/loadJava/compiledKotlin/fun")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Fun.GenericWithTypeVariables.class,
-                Fun.GenericWithoutTypeVariables.class,
-                Fun.NonGeneric.class,
-                Fun.Vararg.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Fun extends AbstractJvmRuntimeDescriptorLoaderTest {
            public void testAllFilesPresentInFun() throws Exception {
@@ -2541,9 +2484,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD

        @TestMetadata("compiler/testData/loadJava/compiledKotlin/prop")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Prop.DefaultAccessors.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Prop extends AbstractJvmRuntimeDescriptorLoaderTest {
            public void testAllFilesPresentInProp() throws Exception {
@@ -3097,23 +3037,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD

    @TestMetadata("compiler/testData/loadJava/compiledJava")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            CompiledJava.Annotations.class,
-            CompiledJava.Constructor.class,
-            CompiledJava.Enum.class,
-            CompiledJava.JavaBean.class,
-            CompiledJava.KotlinSignature.class,
-            CompiledJava.Library.class,
-            CompiledJava.Modality.class,
-            CompiledJava.Mutability.class,
-            CompiledJava.NotNull.class,
-            CompiledJava.ProtectedPackage.class,
-            CompiledJava.ProtectedStatic.class,
-            CompiledJava.Rendering.class,
-            CompiledJava.SignaturePropagation.class,
-            CompiledJava.Static.class,
-            CompiledJava.Vararg.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class CompiledJava extends AbstractJvmRuntimeDescriptorLoaderTest {
        public void testAllFilesPresentInCompiledJava() throws Exception {
@@ -3620,9 +3543,6 @@ public class JvmRuntimeDescriptorLoaderTestGenerated extends AbstractJvmRuntimeD

        @TestMetadata("compiler/testData/loadJava/compiledJava/kotlinSignature")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                KotlinSignature.Error.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class KotlinSignature extends AbstractJvmRuntimeDescriptorLoaderTest {
            @TestMetadata("AllBoundsInWhen.java")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.modules.xml;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.parsing;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,29 +27,10 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        JetParsingTestGenerated.Psi.class,
-        JetParsingTestGenerated.Expression.class,
-        JetParsingTestGenerated.Block.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JetParsingTestGenerated extends AbstractJetParsingTest {
    @TestMetadata("compiler/testData/psi")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Psi.Annotation.class,
-            Psi.Examples.class,
-            Psi.FunctionReceivers.class,
-            Psi.GreatSyntacticShift.class,
-            Psi.Kdoc.class,
-            Psi.Packages.class,
-            Psi.PlatformTypesRecovery.class,
-            Psi.PropertyDelegate.class,
-            Psi.Recovery.class,
-            Psi.Script.class,
-            Psi.SecondaryConstructors.class,
-            Psi.StringTemplates.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Psi extends AbstractJetParsingTest {
        @TestMetadata("AbsentInnerType.kt")
@@ -635,9 +615,6 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {

        @TestMetadata("compiler/testData/psi/annotation")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Annotation.OnFile.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Annotation extends AbstractJetParsingTest {
            public void testAllFilesPresentInAnnotation() throws Exception {
@@ -740,14 +717,6 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {

        @TestMetadata("compiler/testData/psi/examples")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Examples.Array.class,
-                Examples.Collections.class,
-                Examples.Io.class,
-                Examples.Map.class,
-                Examples.Priorityqueues.class,
-                Examples.Util.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Examples extends AbstractJetParsingTest {
            public void testAllFilesPresentInExamples() throws Exception {
@@ -1447,11 +1416,6 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {

        @TestMetadata("compiler/testData/psi/recovery")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Recovery.Objects.class,
-                Recovery.QualifiedExpression.class,
-                Recovery.UnnamedParameter.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Recovery extends AbstractJetParsingTest {
            @TestMetadata("AbsentLeftHandSide.kt")
@@ -1664,10 +1628,6 @@ public class JetParsingTestGenerated extends AbstractJetParsingTest {

            @TestMetadata("compiler/testData/psi/recovery/objects")
            @TestDataPath("$PROJECT_ROOT")
-            @InnerTestClasses({
-                    Objects.Declarations.class,
-                    Objects.Expressions.class,
-            })
            @RunWith(JUnit3RunnerWithInners.class)
            public static class Objects extends AbstractJetParsingTest {
                public void testAllFilesPresentInObjects() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.renderer;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.repl;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,14 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/repl")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        ReplInterpreterTestGenerated.Classes.class,
-        ReplInterpreterTestGenerated.Multiline.class,
-        ReplInterpreterTestGenerated.Objects.class,
-        ReplInterpreterTestGenerated.PrimitiveTypes.class,
-        ReplInterpreterTestGenerated.Reflection.class,
-        ReplInterpreterTestGenerated.Regressions.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class ReplInterpreterTestGenerated extends AbstractReplInterpreterTest {
    public void testAllFilesPresentInRepl() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.resolve;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,14 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/resolve")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        ResolveTestGenerated.CandidatesPriority.class,
-        ResolveTestGenerated.DelegatedProperty.class,
-        ResolveTestGenerated.Imports.class,
-        ResolveTestGenerated.Labels.class,
-        ResolveTestGenerated.Regressions.class,
-        ResolveTestGenerated.Varargs.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class ResolveTestGenerated extends AbstractResolveTest {
    public void testAllFilesPresentInResolve() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.resolve.annotation;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,9 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/resolveAnnotations/parameters")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        AnnotationParameterTestGenerated.Expressions.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class AnnotationParameterTestGenerated extends AbstractAnnotationParameterTest {
    public void testAllFilesPresentInParameters() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.resolve.calls;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,18 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/resolvedCalls")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        ResolvedCallsTestGenerated.Arguments.class,
-        ResolvedCallsTestGenerated.DifferentCallElements.class,
-        ResolvedCallsTestGenerated.Dynamic.class,
-        ResolvedCallsTestGenerated.FunctionTypes.class,
-        ResolvedCallsTestGenerated.Invoke.class,
-        ResolvedCallsTestGenerated.ObjectsAndClassObjects.class,
-        ResolvedCallsTestGenerated.RealExamples.class,
-        ResolvedCallsTestGenerated.Resolve.class,
-        ResolvedCallsTestGenerated.SecondaryConstructors.class,
-        ResolvedCallsTestGenerated.ThisOrSuper.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {
    public void testAllFilesPresentInResolvedCalls() throws Exception {
@@ -98,14 +85,6 @@ public class ResolvedCallsTestGenerated extends AbstractResolvedCallsTest {

    @TestMetadata("compiler/testData/resolvedCalls/arguments")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Arguments.FunctionLiterals.class,
-            Arguments.GenericCalls.class,
-            Arguments.NamedArguments.class,
-            Arguments.OneArgument.class,
-            Arguments.RealExamples.class,
-            Arguments.SeveralCandidates.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Arguments extends AbstractResolvedCallsTest {
        public void testAllFilesPresentInArguments() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.resolve.calls;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.resolve.constants.evaluate;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,11 +27,6 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        EvaluateExpressionTestGenerated.Constant.class,
-        EvaluateExpressionTestGenerated.IsPure.class,
-        EvaluateExpressionTestGenerated.UsesVariableAsConstant.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class EvaluateExpressionTestGenerated extends AbstractEvaluateExpressionTest {
    @TestMetadata("compiler/testData/evaluate/constant")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.resolve.constraintSystem;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,13 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/constraintSystem")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        ConstraintSystemTestGenerated.CheckStatus.class,
-        ConstraintSystemTestGenerated.ComputeValues.class,
-        ConstraintSystemTestGenerated.IntegerValueTypes.class,
-        ConstraintSystemTestGenerated.SeveralVariables.class,
-        ConstraintSystemTestGenerated.Variance.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class ConstraintSystemTestGenerated extends AbstractConstraintSystemTest {
    public void testAllFilesPresentInConstraintSystem() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.serialization;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.types;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,10 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("compiler/testData/type/binding")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        JetTypeBindingTestGenerated.Explicit.class,
-        JetTypeBindingTestGenerated.Implicit.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JetTypeBindingTestGenerated extends AbstractJetTypeBindingTest {
    public void testAllFilesPresentInBinding() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.addImport;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.checkers;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.checkers;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,14 +27,6 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        JetPsiCheckerTestGenerated.Checker.class,
-        JetPsiCheckerTestGenerated.Regression.class,
-        JetPsiCheckerTestGenerated.Recovery.class,
-        JetPsiCheckerTestGenerated.Rendering.class,
-        JetPsiCheckerTestGenerated.DuplicateJvmSignature.class,
-        JetPsiCheckerTestGenerated.Infos.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {
    @TestMetadata("idea/testData/checker")
@@ -574,11 +565,6 @@ public class JetPsiCheckerTestGenerated extends AbstractJetPsiCheckerTest {

    @TestMetadata("idea/testData/checker/duplicateJvmSignature")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            DuplicateJvmSignature.Fields.class,
-            DuplicateJvmSignature.FunctionAndProperty.class,
-            DuplicateJvmSignature.TraitImpl.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class DuplicateJvmSignature extends AbstractJetPsiCheckerTest {
        public void testAllFilesPresentInDuplicateJvmSignature() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,8 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("idea/testData/completion/injava")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class CompiledKotlinInJavaCompletionTestGenerated extends AbstractCompiledKotlinInJavaCompletionTest {
    public void testAllFilesPresentInInjava() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,21 +27,10 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        JSBasicCompletionTestGenerated.Common.class,
-        JSBasicCompletionTestGenerated.Js.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JSBasicCompletionTestGenerated extends AbstractJSBasicCompletionTest {
    @TestMetadata("idea/testData/completion/basic/common")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Common.Annotations.class,
-            Common.Extensions.class,
-            Common.NamedParameters.class,
-            Common.TypeArgsOrNot.class,
-            Common.Visibility.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Common extends AbstractJSBasicCompletionTest {
        @TestMetadata("AfterFloatOnNewLine.kt")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,21 +27,10 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        JvmBasicCompletionTestGenerated.Common.class,
-        JvmBasicCompletionTestGenerated.Java.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JvmBasicCompletionTestGenerated extends AbstractJvmBasicCompletionTest {
    @TestMetadata("idea/testData/completion/basic/common")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Common.Annotations.class,
-            Common.Extensions.class,
-            Common.NamedParameters.class,
-            Common.TypeArgsOrNot.class,
-            Common.Visibility.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Common extends AbstractJvmBasicCompletionTest {
        @TestMetadata("AfterFloatOnNewLine.kt")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,24 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("idea/testData/completion/smart")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        JvmSmartCompletionTestGenerated.AfterAs.class,
-        JvmSmartCompletionTestGenerated.AnonymousObject.class,
-        JvmSmartCompletionTestGenerated.Constructor.class,
-        JvmSmartCompletionTestGenerated.ForLoopRange.class,
-        JvmSmartCompletionTestGenerated.FunctionLiterals.class,
-        JvmSmartCompletionTestGenerated.FunctionReference.class,
-        JvmSmartCompletionTestGenerated.Generics.class,
-        JvmSmartCompletionTestGenerated.HeuristicSignatures.class,
-        JvmSmartCompletionTestGenerated.IfValue.class,
-        JvmSmartCompletionTestGenerated.InElvisOperator.class,
-        JvmSmartCompletionTestGenerated.InOperator.class,
-        JvmSmartCompletionTestGenerated.Inheritors.class,
-        JvmSmartCompletionTestGenerated.MultipleArgsItem.class,
-        JvmSmartCompletionTestGenerated.SmartCasts.class,
-        JvmSmartCompletionTestGenerated.This.class,
-        JvmSmartCompletionTestGenerated.WhenEntry.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JvmSmartCompletionTestGenerated extends AbstractJvmSmartCompletionTest {
    @TestMetadata("AfterExclSign.kt")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,8 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("idea/testData/completion/injava")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class KotlinSourceInJavaCompletionTestGenerated extends AbstractKotlinSourceInJavaCompletionTest {
    public void testAllFilesPresentInInjava() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion.handlers;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,9 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("idea/testData/completion/handlers/basic")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        BasicCompletionHandlerTestGenerated.StringTemplate.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class BasicCompletionHandlerTestGenerated extends AbstractBasicCompletionHandlerTest {
    public void testAllFilesPresentInBasic() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion.handlers;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion.handlers;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion.handlers;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion.weighers;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.completion.weighers;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.findUsages;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,30 +27,10 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        JetFindUsagesTestGenerated.Kotlin.class,
-        JetFindUsagesTestGenerated.Java.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {
    @TestMetadata("idea/testData/findUsages/kotlin")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Kotlin.Conventions.class,
-            Kotlin.DefaultObject.class,
-            Kotlin.FindClassUsages.class,
-            Kotlin.FindFunctionUsages.class,
-            Kotlin.FindObjectUsages.class,
-            Kotlin.FindPackageUsages.class,
-            Kotlin.FindParameterUsages.class,
-            Kotlin.FindPropertyUsages.class,
-            Kotlin.FindSecondaryConstructorUsages.class,
-            Kotlin.FindTypeParameterUsages.class,
-            Kotlin.FindWithFilteringImports.class,
-            Kotlin.FindWithStructuralGrouping.class,
-            Kotlin.Library.class,
-            Kotlin.UnresolvedAnnotation.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Kotlin extends AbstractJetFindUsagesTest {
        public void testAllFilesPresentInKotlin() throws Exception {
@@ -1027,12 +1006,6 @@ public class JetFindUsagesTestGenerated extends AbstractJetFindUsagesTest {

    @TestMetadata("idea/testData/findUsages/java")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Java.FindConstructorUsages.class,
-            Java.FindJavaClassUsages.class,
-            Java.FindJavaFieldUsages.class,
-            Java.FindJavaMethodUsages.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Java extends AbstractJetFindUsagesTest {
        public void testAllFilesPresentInJava() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.formatter;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,18 +27,10 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        JetFormatterTestGenerated.Formatter.class,
-        JetFormatterTestGenerated.FormatterInverted.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
    @TestMetadata("idea/testData/formatter")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Formatter.ModifierList.class,
-            Formatter.ParameterList.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Formatter extends AbstractJetFormatterTest {
        public void testAllFilesPresentInFormatter() throws Exception {
@@ -721,8 +712,6 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest {

    @TestMetadata("idea/testData/formatter")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class FormatterInverted extends AbstractJetFormatterTest {
        public void testAllFilesPresentInFormatterInverted() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.formatter;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,17 +27,10 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        JetTypingIndentationTestBaseGenerated.DirectSettings.class,
-        JetTypingIndentationTestBaseGenerated.InvertedSettings.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingIndentationTestBase {
    @TestMetadata("idea/testData/indentationOnNewline")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            DirectSettings.Script.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class DirectSettings extends AbstractJetTypingIndentationTestBase {
        @TestMetadata("AfterCatch.after.kt")
@@ -339,8 +331,6 @@ public class JetTypingIndentationTestBaseGenerated extends AbstractJetTypingInde

    @TestMetadata("idea/testData/indentationOnNewline")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class InvertedSettings extends AbstractJetTypingIndentationTestBase {
        public void testAllFilesPresentInInvertedSettings() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.codeInsight;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,10 +27,6 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        InsertImportOnPasteTestGenerated.Copy.class,
-        InsertImportOnPasteTestGenerated.Cut.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class InsertImportOnPasteTestGenerated extends AbstractInsertImportOnPasteTest {
    @TestMetadata("idea/testData/copyPaste/imports")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.codeInsight;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,10 +27,6 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        JetInspectionTestGenerated.Intentions.class,
-        JetInspectionTestGenerated.Inspections.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JetInspectionTestGenerated extends AbstractJetInspectionTest {
    @TestMetadata("idea/testData/intentions")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.codeInsight;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,10 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("idea/testData/codeInsight/lineMarker")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        LineMarkersTestGenerated.OverrideImplement.class,
-        LineMarkersTestGenerated.RecursiveCall.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class LineMarkersTestGenerated extends AbstractLineMarkersTest {
    public void testAllFilesPresentInLineMarker() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.codeInsight;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.codeInsight.moveUpDown;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,25 +27,10 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        CodeMoverTestGenerated.ClassBodyDeclarations.class,
-        CodeMoverTestGenerated.ClosingBraces.class,
-        CodeMoverTestGenerated.Expressions.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class CodeMoverTestGenerated extends AbstractCodeMoverTest {
    @TestMetadata("idea/testData/codeInsight/moveUpDown/classBodyDeclarations")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            ClassBodyDeclarations.Accessors.class,
-            ClassBodyDeclarations.Class.class,
-            ClassBodyDeclarations.ClassInitializer.class,
-            ClassBodyDeclarations.Enums.class,
-            ClassBodyDeclarations.Function.class,
-            ClassBodyDeclarations.FunctionAnchors.class,
-            ClassBodyDeclarations.Property.class,
-            ClassBodyDeclarations.PropertyAnchors.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class ClassBodyDeclarations extends AbstractCodeMoverTest {
        public void testAllFilesPresentInClassBodyDeclarations() throws Exception {
@@ -626,14 +610,6 @@ public class CodeMoverTestGenerated extends AbstractCodeMoverTest {

    @TestMetadata("idea/testData/codeInsight/moveUpDown/closingBraces")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            ClosingBraces.For.class,
-            ClosingBraces.Function.class,
-            ClosingBraces.If.class,
-            ClosingBraces.Nested.class,
-            ClosingBraces.When.class,
-            ClosingBraces.While.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class ClosingBraces extends AbstractCodeMoverTest {
        public void testAllFilesPresentInClosingBraces() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.codeInsight.surroundWith;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,25 +27,10 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        SurroundWithTestGenerated.If.class,
-        SurroundWithTestGenerated.IfElse.class,
-        SurroundWithTestGenerated.Not.class,
-        SurroundWithTestGenerated.Parentheses.class,
-        SurroundWithTestGenerated.StringTemplate.class,
-        SurroundWithTestGenerated.When.class,
-        SurroundWithTestGenerated.TryCatch.class,
-        SurroundWithTestGenerated.TryCatchFinally.class,
-        SurroundWithTestGenerated.TryFinally.class,
-        SurroundWithTestGenerated.FunctionLiteral.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class SurroundWithTestGenerated extends AbstractSurroundWithTest {
    @TestMetadata("idea/testData/codeInsight/surroundWith/if")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            If.MoveDeclarationsOut.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class If extends AbstractSurroundWithTest {
        public void testAllFilesPresentInIf() throws Exception {
@@ -85,14 +69,6 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {

        @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                MoveDeclarationsOut.Class.class,
-                MoveDeclarationsOut.Function.class,
-                MoveDeclarationsOut.Object.class,
-                MoveDeclarationsOut.Order.class,
-                MoveDeclarationsOut.Val.class,
-                MoveDeclarationsOut.Var.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class MoveDeclarationsOut extends AbstractSurroundWithTest {
            public void testAllFilesPresentInMoveDeclarationsOut() throws Exception {
@@ -230,9 +206,6 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {

            @TestMetadata("idea/testData/codeInsight/surroundWith/if/moveDeclarationsOut/var")
            @TestDataPath("$PROJECT_ROOT")
-            @InnerTestClasses({
-                    Var.DefaultValue.class,
-            })
            @RunWith(JUnit3RunnerWithInners.class)
            public static class Var extends AbstractSurroundWithTest {
                public void testAllFilesPresentInVar() throws Exception {
@@ -391,9 +364,6 @@ public class SurroundWithTestGenerated extends AbstractSurroundWithTest {

    @TestMetadata("idea/testData/codeInsight/surroundWith/parentheses")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Parentheses.NotApplicable.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Parentheses extends AbstractSurroundWithTest {
        public void testAllFilesPresentInParentheses() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.codeInsight.unwrap;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,19 +27,6 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        UnwrapRemoveTestGenerated.RemoveExpression.class,
-        UnwrapRemoveTestGenerated.UnwrapThen.class,
-        UnwrapRemoveTestGenerated.UnwrapElse.class,
-        UnwrapRemoveTestGenerated.RemoveElse.class,
-        UnwrapRemoveTestGenerated.UnwrapLoop.class,
-        UnwrapRemoveTestGenerated.UnwrapTry.class,
-        UnwrapRemoveTestGenerated.UnwrapCatch.class,
-        UnwrapRemoveTestGenerated.RemoveCatch.class,
-        UnwrapRemoveTestGenerated.UnwrapFinally.class,
-        UnwrapRemoveTestGenerated.RemoveFinally.class,
-        UnwrapRemoveTestGenerated.UnwrapLambda.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class UnwrapRemoveTestGenerated extends AbstractUnwrapRemoveTest {
    @TestMetadata("idea/testData/codeInsight/unwrapAndRemove/removeExpression")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.configuration;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,19 +27,10 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        ConfigureProjectByChangingFileTestGenerated.Android_gradle.class,
-        ConfigureProjectByChangingFileTestGenerated.Gradle.class,
-        ConfigureProjectByChangingFileTestGenerated.Maven.class,
-        ConfigureProjectByChangingFileTestGenerated.Js_maven.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class ConfigureProjectByChangingFileTestGenerated extends AbstractConfigureProjectByChangingFileTest {
    @TestMetadata("idea/testData/configuration/android-gradle")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Android_gradle.GradleExamples.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Android_gradle extends AbstractConfigureProjectByChangingFileTest {
        public void testAllFilesPresentInAndroid_gradle() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.conversion.copy;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.coverage;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.debugger;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,10 +27,6 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        JetPositionManagerTestGenerated.SingleFile.class,
-        JetPositionManagerTestGenerated.MultiFile.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JetPositionManagerTestGenerated extends AbstractJetPositionManagerTest {
    @TestMetadata("idea/testData/debugger/positionManager")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.debugger;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,12 +27,6 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        KotlinSteppingTestGenerated.StepInto.class,
-        KotlinSteppingTestGenerated.SmartStepInto.class,
-        KotlinSteppingTestGenerated.StepIntoOnly.class,
-        KotlinSteppingTestGenerated.Filters.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class KotlinSteppingTestGenerated extends AbstractKotlinSteppingTest {
    @TestMetadata("idea/testData/debugger/tinyApp/src/stepInto/stepIntoAndSmartStepInto")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.debugger;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.debugger.evaluate;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.debugger.evaluate;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,9 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("idea/testData/completion/basic/codeFragments")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        CodeFragmentCompletionTestGenerated.RuntimeType.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class CodeFragmentCompletionTestGenerated extends AbstractCodeFragmentCompletionTest {
    public void testAllFilesPresentInCodeFragments() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.debugger.evaluate;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,10 +27,6 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        CodeFragmentHighlightingTestGenerated.CodeFragments.class,
-        CodeFragmentHighlightingTestGenerated.Imports.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class CodeFragmentHighlightingTestGenerated extends AbstractCodeFragmentHighlightingTest {
    @TestMetadata("idea/testData/checker/codeFragments")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.debugger.evaluate;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,21 +27,10 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        KotlinEvaluateExpressionTestGenerated.SingleBreakpoint.class,
-        KotlinEvaluateExpressionTestGenerated.MultipleBreakpoints.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluateExpressionTest {
    @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/singleBreakpoint")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            SingleBreakpoint.CompilingEvaluator.class,
-            SingleBreakpoint.ExtraVariables.class,
-            SingleBreakpoint.Frame.class,
-            SingleBreakpoint.Lambdas.class,
-            SingleBreakpoint.Renderer.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class SingleBreakpoint extends AbstractKotlinEvaluateExpressionTest {
        @TestMetadata("abstractFunCall.kt")
@@ -565,9 +553,6 @@ public class KotlinEvaluateExpressionTestGenerated extends AbstractKotlinEvaluat

    @TestMetadata("idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            MultipleBreakpoints.Library.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class MultipleBreakpoints extends AbstractKotlinEvaluateExpressionTest {
        public void testAllFilesPresentInMultipleBreakpoints() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.debugger.evaluate;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,10 +27,6 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        SelectExpressionForDebuggerTestGenerated.SelectExpression.class,
-        SelectExpressionForDebuggerTestGenerated.DisallowMethodCalls.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class SelectExpressionForDebuggerTestGenerated extends AbstractSelectExpressionForDebuggerTest {
    @TestMetadata("idea/testData/debugger/selectExpression")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.decompiler.navigation;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,10 +27,6 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        NavigateToLibrarySourceTestGenerated.Usercode.class,
-        NavigateToLibrarySourceTestGenerated.UsercodeWithJSModule.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class NavigateToLibrarySourceTestGenerated extends AbstractNavigateToLibrarySourceTest {
    @TestMetadata("idea/testData/decompiler/navigation/usercode")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.decompiler.stubBuilder;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.decompiler.textBuilder;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,8 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("idea/testData/decompiler/decompiledText")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class DecompiledTextTestGenerated extends AbstractDecompiledTextTest {
    public void testAllFilesPresentInDecompiledText() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.editor.quickDoc;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.folding;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,10 +27,6 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        KotlinFoldingTestGenerated.NoCollapse.class,
-        KotlinFoldingTestGenerated.CheckCollapse.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class KotlinFoldingTestGenerated extends AbstractKotlinFoldingTest {
    @TestMetadata("idea/testData/folding/noCollapse")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.hierarchy;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -28,14 +27,6 @@ import java.util.regex.Pattern;

 /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
-@InnerTestClasses({
-        HierarchyTestGenerated.Type.class,
-        HierarchyTestGenerated.Super.class,
-        HierarchyTestGenerated.Sub.class,
-        HierarchyTestGenerated.Callers.class,
-        HierarchyTestGenerated.Callees.class,
-        HierarchyTestGenerated.Overrides.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class HierarchyTestGenerated extends AbstractHierarchyTest {
    @TestMetadata("idea/testData/hierarchy/class/type")
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.highlighter;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.highlighter;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.highlighter;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.highlighter;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,9 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("idea/testData/highlighter")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        HighlightingTestGenerated.Deprecated.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class HighlightingTestGenerated extends AbstractHighlightingTest {
    public void testAllFilesPresentInHighlighter() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.imports;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,9 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("idea/testData/editor/optimizeImports")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        OptimizeImportsTestGenerated.AllUnderImports.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class OptimizeImportsTestGenerated extends AbstractOptimizeImportsTest {
    public void testAllFilesPresentInOptimizeImports() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.intentions;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,50 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("idea/testData/intentions")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        IntentionTestGenerated.AddBraces.class,
-        IntentionTestGenerated.AttributeCallReplacements.class,
-        IntentionTestGenerated.Branched.class,
-        IntentionTestGenerated.ConvertAssertToIf.class,
-        IntentionTestGenerated.ConvertFunctionToProperty.class,
-        IntentionTestGenerated.ConvertIfToAssert.class,
-        IntentionTestGenerated.ConvertNegatedBooleanSequence.class,
-        IntentionTestGenerated.ConvertNegatedExpressionWithDemorgansLaw.class,
-        IntentionTestGenerated.ConvertParameterToReceiver.class,
-        IntentionTestGenerated.ConvertPropertyToFunction.class,
-        IntentionTestGenerated.ConvertReceiverToParameter.class,
-        IntentionTestGenerated.ConvertToBlockBody.class,
-        IntentionTestGenerated.ConvertToConcatenatedStringIntention.class,
-        IntentionTestGenerated.ConvertToExpressionBody.class,
-        IntentionTestGenerated.ConvertToForEachFunctionCall.class,
-        IntentionTestGenerated.ConvertToForEachLoop.class,
-        IntentionTestGenerated.ConvertToStringTemplateIntention.class,
-        IntentionTestGenerated.Declarations.class,
-        IntentionTestGenerated.InsertCurlyBracesToTemplate.class,
-        IntentionTestGenerated.InsertExplicitTypeArguments.class,
-        IntentionTestGenerated.InvertIfCondition.class,
-        IntentionTestGenerated.MakeTypeExplicitInLambda.class,
-        IntentionTestGenerated.MakeTypeImplicitInLambda.class,
-        IntentionTestGenerated.MoveLambdaInsideParentheses.class,
-        IntentionTestGenerated.MoveLambdaOutsideParentheses.class,
-        IntentionTestGenerated.OperatorToFunction.class,
-        IntentionTestGenerated.ReconstructedType.class,
-        IntentionTestGenerated.RemoveBraces.class,
-        IntentionTestGenerated.RemoveCurlyBracesFromTemplate.class,
-        IntentionTestGenerated.RemoveExplicitTypeArguments.class,
-        IntentionTestGenerated.RemoveUnnecessaryParentheses.class,
-        IntentionTestGenerated.ReplaceExplicitFunctionLiteralParamWithIt.class,
-        IntentionTestGenerated.ReplaceItWithExplicitFunctionLiteralParam.class,
-        IntentionTestGenerated.ReplaceWithDotQualifiedMethodCall.class,
-        IntentionTestGenerated.ReplaceWithInfixFunctionCall.class,
-        IntentionTestGenerated.ReplaceWithOperatorAssign.class,
-        IntentionTestGenerated.ReplaceWithTraditionalAssignment.class,
-        IntentionTestGenerated.SimplifyBooleanWithConstants.class,
-        IntentionTestGenerated.SimplifyNegatedBinaryExpressionIntention.class,
-        IntentionTestGenerated.SpecifyType.class,
-        IntentionTestGenerated.SplitIf.class,
-        IntentionTestGenerated.SwapBinaryExpression.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class IntentionTestGenerated extends AbstractIntentionTest {
    public void testAllFilesPresentInIntentions() throws Exception {
@@ -139,13 +94,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {

    @TestMetadata("idea/testData/intentions/attributeCallReplacements")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            AttributeCallReplacements.ReplaceBinaryInfixIntention.class,
-            AttributeCallReplacements.ReplaceContainsIntention.class,
-            AttributeCallReplacements.ReplaceGetIntention.class,
-            AttributeCallReplacements.ReplaceInvokeIntention.class,
-            AttributeCallReplacements.ReplaceUnaryPrefixIntention.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class AttributeCallReplacements extends AbstractIntentionTest {
        public void testAllFilesPresentInAttributeCallReplacements() throws Exception {
@@ -382,8 +330,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {

        @TestMetadata("idea/testData/intentions/attributeCallReplacements/replaceGetIntention")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class ReplaceGetIntention extends AbstractIntentionTest {
            @TestMetadata("acceptableVararg.kt")
@@ -647,18 +593,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {

    @TestMetadata("idea/testData/intentions/branched")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Branched.DoubleBangToIfThen.class,
-            Branched.ElvisToIfThen.class,
-            Branched.Folding.class,
-            Branched.IfThenToDoubleBang.class,
-            Branched.IfThenToElvis.class,
-            Branched.IfThenToSafeAccess.class,
-            Branched.IfWhen.class,
-            Branched.SafeAccessToIfThen.class,
-            Branched.Unfolding.class,
-            Branched.When.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Branched extends AbstractIntentionTest {
        public void testAllFilesPresentInBranched() throws Exception {
@@ -823,13 +757,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {

        @TestMetadata("idea/testData/intentions/branched/folding")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Folding.IfToAssignment.class,
-                Folding.IfToReturn.class,
-                Folding.IfToReturnAsymmetrically.class,
-                Folding.WhenToAssignment.class,
-                Folding.WhenToReturn.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Folding extends AbstractIntentionTest {
            public void testAllFilesPresentInFolding() throws Exception {
@@ -1241,8 +1168,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {

        @TestMetadata("idea/testData/intentions/branched/ifThenToElvis")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class IfThenToElvis extends AbstractIntentionTest {
            public void testAllFilesPresentInIfThenToElvis() throws Exception {
@@ -1445,8 +1370,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {

        @TestMetadata("idea/testData/intentions/branched/ifThenToSafeAccess")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class IfThenToSafeAccess extends AbstractIntentionTest {
            public void testAllFilesPresentInIfThenToSafeAccess() throws Exception {
@@ -1661,10 +1584,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {

        @TestMetadata("idea/testData/intentions/branched/ifWhen")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                IfWhen.IfToWhen.class,
-                IfWhen.WhenToIf.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class IfWhen extends AbstractIntentionTest {
            public void testAllFilesPresentInIfWhen() throws Exception {
@@ -1959,14 +1878,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {

        @TestMetadata("idea/testData/intentions/branched/unfolding")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                Unfolding.AssignmentToIf.class,
-                Unfolding.AssignmentToWhen.class,
-                Unfolding.PropertyToIf.class,
-                Unfolding.PropertyToWhen.class,
-                Unfolding.ReturnToIf.class,
-                Unfolding.ReturnToWhen.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class Unfolding extends AbstractIntentionTest {
            public void testAllFilesPresentInUnfolding() throws Exception {
@@ -2228,12 +2139,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {

        @TestMetadata("idea/testData/intentions/branched/when")
        @TestDataPath("$PROJECT_ROOT")
-        @InnerTestClasses({
-                When.EliminateSubject.class,
-                When.Flatten.class,
-                When.IntroduceSubject.class,
-                When.Merge.class,
-        })
        @RunWith(JUnit3RunnerWithInners.class)
        public static class When extends AbstractIntentionTest {
            public void testAllFilesPresentInWhen() throws Exception {
@@ -3864,10 +3769,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {

    @TestMetadata("idea/testData/intentions/declarations")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-            Declarations.ConvertMemberToExtension.class,
-            Declarations.Split.class,
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class Declarations extends AbstractIntentionTest {
        public void testAllFilesPresentInDeclarations() throws Exception {
@@ -5134,8 +5035,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {

    @TestMetadata("idea/testData/intentions/removeExplicitTypeArguments")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class RemoveExplicitTypeArguments extends AbstractIntentionTest {
        public void testAllFilesPresentInRemoveExplicitTypeArguments() throws Exception {
@@ -5836,8 +5735,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest {

    @TestMetadata("idea/testData/intentions/simplifyNegatedBinaryExpressionIntention")
    @TestDataPath("$PROJECT_ROOT")
-    @InnerTestClasses({
-    })
    @RunWith(JUnit3RunnerWithInners.class)
    public static class SimplifyNegatedBinaryExpressionIntention extends AbstractIntentionTest {
        public void testAllFilesPresentInSimplifyNegatedBinaryExpressionIntention() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.intentions.declarations;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -30,11 +29,6 @@ import java.util.regex.Pattern;
@SuppressWarnings("all")
@TestMetadata("idea/testData/joinLines")
@TestDataPath("$PROJECT_ROOT")
-@InnerTestClasses({
-        JoinLinesTestGenerated.DeclarationAndAssignment.class,
-        JoinLinesTestGenerated.NestedIfs.class,
-        JoinLinesTestGenerated.RemoveBraces.class,
-})
@RunWith(JUnit3RunnerWithInners.class)
 public class JoinLinesTestGenerated extends AbstractJoinLinesTest {
    public void testAllFilesPresentInJoinLines() throws Exception {
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.kdoc;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.completion.AbstractJvmBasicCompletionTest;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.kdoc;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.kdoc;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.idea.resolve.AbstractReferenceResolveTest;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.navigation;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
@@ -17,7 +17,6 @@
 package org.jetbrains.kotlin.idea.navigation;

 import com.intellij.testFramework.TestDataPath;
-import org.jetbrains.kotlin.test.InnerTestClasses;
 import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
 import org.jetbrains.kotlin.test.JetTestUtils;
 import org.jetbrains.kotlin.test.TestMetadata;
--- a/Show More
+++ b/Show More