diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java
index 559e7a3e8ad..108b1fb45f9 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated.java
@@ -24,24 +24,12 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
     }
 
-    @Test
-    @TestMetadata("indirectInlineCycle.kt")
-    public void testIndirectInlineCycle() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.kt");
-    }
-
     @Test
     @TestMetadata("indirectInlineCycle_ir.kt")
     public void testIndirectInlineCycle_ir() throws Exception {
         runTest("compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle_ir.kt");
     }
 
-    @Test
-    @TestMetadata("inlineCycle.kt")
-    public void testInlineCycle() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.kt");
-    }
-
     @Test
     @TestMetadata("inlineCycle_ir.kt")
     public void testInlineCycle_ir() throws Exception {
@@ -60,12 +48,6 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
         runTest("compiler/testData/diagnostics/testsWithJvmBackend/kt57104_2.kt");
     }
 
-    @Test
-    @TestMetadata("multipleBigArityFunsImplemented.kt")
-    public void testMultipleBigArityFunsImplemented() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt");
-    }
-
     @Test
     @TestMetadata("multipleBigArityFunsImplemented_ir.kt")
     public void testMultipleBigArityFunsImplemented_ir() throws Exception {
@@ -84,12 +66,6 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
         runTest("compiler/testData/diagnostics/testsWithJvmBackend/propertyInlineCycle.kt");
     }
 
-    @Test
-    @TestMetadata("suspendInlineCycle.kt")
-    public void testSuspendInlineCycle() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.kt");
-    }
-
     @Test
     @TestMetadata("suspendInlineCycle_ir.kt")
     public void testSuspendInlineCycle_ir() throws Exception {
@@ -168,24 +144,12 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_ir.kt");
             }
 
-            @Test
-            @TestMetadata("defaultFunction_old.kt")
-            public void testDefaultFunction_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_old.kt");
-            }
-
             @Test
             @TestMetadata("delegatedFunctionOverriddenByProperty_ir.kt")
             public void testDelegatedFunctionOverriddenByProperty_ir() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_ir.kt");
             }
 
-            @Test
-            @TestMetadata("delegatedFunctionOverriddenByProperty_old.kt")
-            public void testDelegatedFunctionOverriddenByProperty_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_old.kt");
-            }
-
             @Test
             @TestMetadata("genericClassFunction.kt")
             public void testGenericClassFunction() throws Exception {
@@ -216,12 +180,6 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_ir.kt");
             }
 
-            @Test
-            @TestMetadata("traitFunctionOverriddenByProperty_old.kt")
-            public void testTraitFunctionOverriddenByProperty_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_old.kt");
-            }
-
             @Test
             @TestMetadata("traitPropertyOverriddenByFunctionNoImpl.kt")
             public void testTraitPropertyOverriddenByFunctionNoImpl() throws Exception {
@@ -233,12 +191,6 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             public void testTraitPropertyOverriddenByFunction_ir() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_ir.kt");
             }
-
-            @Test
-            @TestMetadata("traitPropertyOverriddenByFunction_old.kt")
-            public void testTraitPropertyOverriddenByFunction_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_old.kt");
-            }
         }
 
         @Nested
@@ -256,35 +208,17 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_ir.kt");
             }
 
-            @Test
-            @TestMetadata("class_old.kt")
-            public void testClass_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_old.kt");
-            }
-
             @Test
             @TestMetadata("fakeOverrideTrait_ir.kt")
             public void testFakeOverrideTrait_ir() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_ir.kt");
             }
 
-            @Test
-            @TestMetadata("fakeOverrideTrait_old.kt")
-            public void testFakeOverrideTrait_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_old.kt");
-            }
-
             @Test
             @TestMetadata("trait_ir.kt")
             public void testTrait_ir() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_ir.kt");
             }
-
-            @Test
-            @TestMetadata("trait_old.kt")
-            public void testTrait_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_old.kt");
-            }
         }
 
         @Nested
@@ -302,12 +236,6 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_ir.kt");
             }
 
-            @Test
-            @TestMetadata("clashFromInterfaceAndSuperClass_old.kt")
-            public void testClashFromInterfaceAndSuperClass_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_old.kt");
-            }
-
             @Test
             @TestMetadata("collections.kt")
             public void testCollections() throws Exception {
@@ -350,12 +278,6 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_ir.kt");
             }
 
-            @Test
-            @TestMetadata("inheritFromTwoTraits_old.kt")
-            public void testInheritFromTwoTraits_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_old.kt");
-            }
-
             @Test
             @TestMetadata("kotlinAndJavaCollections.kt")
             public void testKotlinAndJavaCollections() throws Exception {
@@ -374,24 +296,12 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_ir.kt");
             }
 
-            @Test
-            @TestMetadata("superTraitAndDelegationToTraitImpl_old.kt")
-            public void testSuperTraitAndDelegationToTraitImpl_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_old.kt");
-            }
-
             @Test
             @TestMetadata("twoTraitsAndOwnFunction_ir.kt")
             public void testTwoTraitsAndOwnFunction_ir() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_ir.kt");
             }
 
-            @Test
-            @TestMetadata("twoTraitsAndOwnFunction_old.kt")
-            public void testTwoTraitsAndOwnFunction_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_old.kt");
-            }
-
             @Test
             @TestMetadata("typeMappedToJava.kt")
             public void testTypeMappedToJava() throws Exception {
@@ -443,12 +353,6 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             public void testWaitNotifyGetClass_ir() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_ir.kt");
             }
-
-            @Test
-            @TestMetadata("waitNotifyGetClass_old.kt")
-            public void testWaitNotifyGetClass_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_old.kt");
-            }
         }
 
         @Nested
@@ -567,12 +471,6 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
             public void testTrait_ir() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_ir.kt");
             }
-
-            @Test
-            @TestMetadata("trait_old.kt")
-            public void testTrait_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_old.kt");
-            }
         }
 
         @Nested
@@ -612,24 +510,12 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_ir.kt");
             }
 
-            @Test
-            @TestMetadata("classObjectCopiedFieldObject_old.kt")
-            public void testClassObjectCopiedFieldObject_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_old.kt");
-            }
-
             @Test
             @TestMetadata("classObject_ir.kt")
             public void testClassObject_ir() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_ir.kt");
             }
 
-            @Test
-            @TestMetadata("classObject_old.kt")
-            public void testClassObject_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_old.kt");
-            }
-
             @Test
             @TestMetadata("dataClassCopy.kt")
             public void testDataClassCopy() throws Exception {
@@ -642,24 +528,12 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_ir.kt");
             }
 
-            @Test
-            @TestMetadata("defaults_old.kt")
-            public void testDefaults_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_old.kt");
-            }
-
             @Test
             @TestMetadata("delegationBy_ir.kt")
             public void testDelegationBy_ir() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_ir.kt");
             }
 
-            @Test
-            @TestMetadata("delegationBy_old.kt")
-            public void testDelegationBy_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_old.kt");
-            }
-
             @Test
             @TestMetadata("enum.kt")
             public void testEnum() throws Exception {
@@ -672,35 +546,17 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_ir.kt");
             }
 
-            @Test
-            @TestMetadata("innerClassField_old.kt")
-            public void testInnerClassField_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_old.kt");
-            }
-
             @Test
             @TestMetadata("instance_ir.kt")
             public void testInstance_ir() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_ir.kt");
             }
 
-            @Test
-            @TestMetadata("instance_old.kt")
-            public void testInstance_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_old.kt");
-            }
-
             @Test
             @TestMetadata("propertyMetadataCache_ir.kt")
             public void testPropertyMetadataCache_ir() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_ir.kt");
             }
-
-            @Test
-            @TestMetadata("propertyMetadataCache_old.kt")
-            public void testPropertyMetadataCache_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_old.kt");
-            }
         }
 
         @Nested
@@ -780,12 +636,6 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_ir.kt");
             }
 
-            @Test
-            @TestMetadata("defaultVsNonDefault_old.kt")
-            public void testDefaultVsNonDefault_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_old.kt");
-            }
-
             @Test
             @TestMetadata("kt43611.kt")
             public void testKt43611() throws Exception {
@@ -798,47 +648,23 @@ public class FirPsiOldDiagnosticsTestWithJvmIrBackendGenerated extends AbstractF
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_ir.kt");
             }
 
-            @Test
-            @TestMetadata("oneTrait_old.kt")
-            public void testOneTrait_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_old.kt");
-            }
-
             @Test
             @TestMetadata("traitFunctionOverriddenByPropertyInTrait_ir.kt")
             public void testTraitFunctionOverriddenByPropertyInTrait_ir() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_ir.kt");
             }
 
-            @Test
-            @TestMetadata("traitFunctionOverriddenByPropertyInTrait_old.kt")
-            public void testTraitFunctionOverriddenByPropertyInTrait_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_old.kt");
-            }
-
             @Test
             @TestMetadata("traitPropertyOverriddenByFunctionInTrait_ir.kt")
             public void testTraitPropertyOverriddenByFunctionInTrait_ir() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_ir.kt");
             }
 
-            @Test
-            @TestMetadata("traitPropertyOverriddenByFunctionInTrait_old.kt")
-            public void testTraitPropertyOverriddenByFunctionInTrait_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_old.kt");
-            }
-
             @Test
             @TestMetadata("twoTraits_ir.kt")
             public void testTwoTraits_ir() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_ir.kt");
             }
-
-            @Test
-            @TestMetadata("twoTraits_old.kt")
-            public void testTwoTraits_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_old.kt");
-            }
         }
 
         @Nested
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_old.kt
deleted file mode 100644
index ffb2e2ba8db..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_old.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-open class Base {
-    open fun `foo$default`(d: Derived, i: Int, mask: Int, mh: Any) {}
-}
-
-class Derived : Base() {
-    <!ACCIDENTAL_OVERRIDE!>fun foo(i: Int = 0)<!> {}
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_old.txt
deleted file mode 100644
index 9d23e55ff9f..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_old.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-package
-
-public open class Base {
-    public constructor Base()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun `foo$default`(/*0*/ d: Derived, /*1*/ i: kotlin.Int, /*2*/ mask: kotlin.Int, /*3*/ mh: kotlin.Any): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class Derived : Base {
-    public constructor Derived()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ i: kotlin.Int = ...): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun `foo$default`(/*0*/ d: Derived, /*1*/ i: kotlin.Int, /*2*/ mask: kotlin.Int, /*3*/ mh: kotlin.Any): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_old.kt
deleted file mode 100644
index 9dda26df578..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_old.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-interface B {
-    fun getX() = 1
-}
-
-interface D {
-    val x: Int
-}
-
-class <!CONFLICTING_INHERITED_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>C(d: D)<!> : D by d, B
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_old.txt
deleted file mode 100644
index f3586d9c184..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_old.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-package
-
-public interface B {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun getX(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class C : D, B {
-    public constructor C(/*0*/ d: D)
-    public open override /*1*/ /*delegation*/ val x: kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun getX(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface D {
-    public abstract val x: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_old.kt
deleted file mode 100644
index 2aac8e35434..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_old.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-interface T {
-    fun getX() = 1
-}
-
-class <!CONFLICTING_JVM_DECLARATIONS!>C<!> : T {
-    val x: Int
-        <!ACCIDENTAL_OVERRIDE, CONFLICTING_JVM_DECLARATIONS!>get()<!> = 1
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_old.txt
deleted file mode 100644
index 536c273b003..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_old.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-package
-
-public final class C : T {
-    public constructor C()
-    public final val x: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun getX(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface T {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun getX(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_old.kt
deleted file mode 100644
index 9f9a1a495a7..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_old.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-interface T {
-    val x: Int
-        get() = 1
-}
-
-class <!CONFLICTING_JVM_DECLARATIONS!>C<!> : T {
-    <!ACCIDENTAL_OVERRIDE, CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_old.txt
deleted file mode 100644
index 508433fca43..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_old.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-package
-
-public final class C : T {
-    public constructor C()
-    public open override /*1*/ /*fake_override*/ val x: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun getX(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface T {
-    public open val x: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_old.kt
deleted file mode 100644
index f490756cf9d..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_old.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_OLD
-
-open class B<T> {
-    open fun foo(t: T) {}
-}
-
-class <!CONFLICTING_JVM_DECLARATIONS!>C<!> : B<String>() {
-    override fun foo(t: String) {}
-
-    <!CONFLICTING_JVM_DECLARATIONS!>fun foo(o: Any)<!> {}
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_old.txt
deleted file mode 100644
index bad111f7b69..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_old.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-package
-
-public open class B</*0*/ T> {
-    public constructor B</*0*/ T>()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ t: T): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class C : B<kotlin.String> {
-    public constructor C()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ o: kotlin.Any): kotlin.Unit
-    public open override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_old.kt
deleted file mode 100644
index 20a0d73be16..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_old.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_OLD
-
-interface B<T> {
-    fun foo(t: T) {}
-}
-
-class <!CONFLICTING_JVM_DECLARATIONS!>C<!> : B<String> {
-    <!ACCIDENTAL_OVERRIDE, CONFLICTING_JVM_DECLARATIONS!>fun foo(o: Any)<!> {}
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_old.txt
deleted file mode 100644
index cf6f2700ff9..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_old.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-package
-
-public interface B</*0*/ T> {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ t: T): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class C : B<kotlin.String> {
-    public constructor C()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ o: kotlin.Any): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_old.kt
deleted file mode 100644
index f26ec7712e7..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_old.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_OLD
-
-interface B<T> {
-    fun foo(t: T) {}
-}
-
-class <!CONFLICTING_JVM_DECLARATIONS!>C<!> : B<String> {
-    override fun foo(t: String) {}
-
-    <!CONFLICTING_JVM_DECLARATIONS!>fun foo(o: Any)<!> {}
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_old.txt
deleted file mode 100644
index 7ce46d1e02a..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_old.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-package
-
-public interface B</*0*/ T> {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ t: T): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class C : B<kotlin.String> {
-    public constructor C()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ o: kotlin.Any): kotlin.Unit
-    public open override /*1*/ fun foo(/*0*/ t: kotlin.String): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_old.kt
deleted file mode 100644
index 8a477c3c9b9..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_old.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_OLD
-
-public open class A<T> {
-    fun foo(x: T) = "O"
-    fun foo(x: A<T>) = "K"
-}
-
-interface C<E> {
-    fun foo(x: E): String
-    fun foo(x: A<E>): String
-}
-
-interface D {
-    fun foo(x: A<String>): String
-}
-
-class <!CONFLICTING_INHERITED_JVM_DECLARATIONS!>B1<!> : A<A<String>>(), D
-
-interface <!CONFLICTING_INHERITED_JVM_DECLARATIONS, CONFLICTING_INHERITED_JVM_DECLARATIONS!>B2<!> : C<A<String>>, D
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_old.txt
deleted file mode 100644
index 64017b281bd..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_old.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-package
-
-public open class A</*0*/ T> {
-    public constructor A</*0*/ T>()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(/*0*/ x: A<T>): kotlin.String
-    public final fun foo(/*0*/ x: T): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class B1 : A<A<kotlin.String>>, D {
-    public constructor B1()
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final override /*1*/ /*fake_override*/ fun foo(/*0*/ x: A<A<kotlin.String>>): kotlin.String
-    public final override /*2*/ /*fake_override*/ fun foo(/*0*/ x: A<kotlin.String>): kotlin.String
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface B2 : C<A<kotlin.String>>, D {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun foo(/*0*/ x: A<A<kotlin.String>>): kotlin.String
-    public abstract override /*2*/ /*fake_override*/ fun foo(/*0*/ x: A<kotlin.String>): kotlin.String
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface C</*0*/ E> {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ x: A<E>): kotlin.String
-    public abstract fun foo(/*0*/ x: E): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface D {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ x: A<kotlin.String>): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_old.kt
deleted file mode 100644
index ebdbd3699e0..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_old.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_OLD
-
-interface Foo<T> {
-    fun foo(l: List<T>) {}
-}
-
-interface Bar<T> {
-    fun foo(l: List<T>) {}
-}
-
-class <!CONFLICTING_INHERITED_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>Baz()<!>: Foo<String>, Bar<Int> {
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_old.txt
deleted file mode 100644
index 3ce36d5b257..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_old.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-package
-
-public interface Bar</*0*/ T> {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
-    public constructor Baz()
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface Foo</*0*/ T> {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_old.kt
deleted file mode 100644
index c8efa5e00ce..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_old.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_OLD
-
-interface A<T> {
-    fun foo(l: List<T>)
-}
-
-interface B {
-    fun foo(l: List<Int>) {}
-}
-
-class <!CONFLICTING_INHERITED_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>C(f: A<String>)<!>: A<String> by f, B
-
-<!DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE!>class D<!>(f: A<Int>): A<Int> by f, B
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_old.txt
deleted file mode 100644
index b4d51300d53..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_old.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-package
-
-public interface A</*0*/ T> {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface B {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class C : A<kotlin.String>, B {
-    public constructor C(/*0*/ f: A<kotlin.String>)
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
-    public open override /*1*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class D : A<kotlin.Int>, B {
-    public constructor D(/*0*/ f: A<kotlin.Int>)
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*delegation*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_old.kt
deleted file mode 100644
index 00590a8e6e3..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_old.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_OLD
-
-interface Foo<T> {
-    fun foo(l: List<T>) {}
-}
-
-interface Bar<T> {
-    fun foo(l: List<T>) {}
-}
-
-class <!CONFLICTING_JVM_DECLARATIONS!>Baz()<!>: Foo<String>, Bar<Int> {
-    <!ACCIDENTAL_OVERRIDE, CONFLICTING_JVM_DECLARATIONS!>fun foo(l: List<Long>)<!> {}
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_old.txt
deleted file mode 100644
index aa6a96f3df2..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_old.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-package
-
-public interface Bar</*0*/ T> {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class Baz : Foo<kotlin.String>, Bar<kotlin.Int> {
-    public constructor Baz()
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.Int>): kotlin.Unit
-    public final fun foo(/*0*/ l: kotlin.collections.List<kotlin.Long>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun foo(/*0*/ l: kotlin.collections.List<kotlin.String>): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface Foo</*0*/ T> {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun foo(/*0*/ l: kotlin.collections.List<T>): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_old.kt
deleted file mode 100644
index b6d79878e10..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_old.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_OLD
-
-// KT-7174 Report error on members with the same signature as non-overridable methods from mapped Java types (like Object.wait/notify)
-
-class A {
-    <!CONFLICTING_INHERITED_JVM_DECLARATIONS!>fun notify()<!> {}
-    <!CONFLICTING_INHERITED_JVM_DECLARATIONS!>fun notifyAll()<!> {}
-    <!CONFLICTING_INHERITED_JVM_DECLARATIONS!>fun wait()<!> {}
-    <!CONFLICTING_INHERITED_JVM_DECLARATIONS!>fun wait(l: Long)<!> {}
-    <!CONFLICTING_INHERITED_JVM_DECLARATIONS!>fun wait(l: Long, i: Int)<!> {}
-    <!CONFLICTING_INHERITED_JVM_DECLARATIONS!>fun getClass(): Class<Any><!> = null!!
-}
-
-<!CONFLICTING_INHERITED_JVM_DECLARATIONS!>fun notify()<!> {}
-<!CONFLICTING_INHERITED_JVM_DECLARATIONS!>fun notifyAll()<!> {}
-<!CONFLICTING_INHERITED_JVM_DECLARATIONS!>fun wait()<!> {}
-<!CONFLICTING_INHERITED_JVM_DECLARATIONS!>fun wait(l: Long)<!> {}
-<!CONFLICTING_INHERITED_JVM_DECLARATIONS!>fun wait(l: Long, i: Int)<!> {}
-<!CONFLICTING_INHERITED_JVM_DECLARATIONS!>fun getClass(): Class<Any><!> = null!!
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_old.txt
deleted file mode 100644
index 411fa6c2287..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_old.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-package
-
-public fun getClass(): java.lang.Class<kotlin.Any>
-public fun notify(): kotlin.Unit
-public fun notifyAll(): kotlin.Unit
-public fun wait(): kotlin.Unit
-public fun wait(/*0*/ l: kotlin.Long): kotlin.Unit
-public fun wait(/*0*/ l: kotlin.Long, /*1*/ i: kotlin.Int): kotlin.Unit
-
-public final class A {
-    public constructor A()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun getClass(): java.lang.Class<kotlin.Any>
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public final fun notify(): kotlin.Unit
-    public final fun notifyAll(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    public final fun wait(): kotlin.Unit
-    public final fun wait(/*0*/ l: kotlin.Long): kotlin.Unit
-    public final fun wait(/*0*/ l: kotlin.Long, /*1*/ i: kotlin.Int): kotlin.Unit
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_old.kt
deleted file mode 100644
index e80914d241f..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_old.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-
-interface T {
-    val x: Int
-        <!CONFLICTING_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>get()<!> = 1
-    <!CONFLICTING_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_old.txt
deleted file mode 100644
index da24c65ca68..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_old.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-package
-
-public interface T {
-    public open val x: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun getX(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_old.kt
deleted file mode 100644
index dd357d81f23..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_old.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-
-class B {
-    companion <!CONFLICTING_JVM_DECLARATIONS!>object <!REDECLARATION!>A<!><!> {
-    }
-
-    <!CONFLICTING_JVM_DECLARATIONS!>val <!REDECLARATION!>A<!>: A<!> = B.A
-}
-
-class C {
-    companion <!CONFLICTING_JVM_DECLARATIONS!>object A<!> {
-        <!CONFLICTING_JVM_DECLARATIONS!>val A: A<!> = C.A
-    }
-}
-
-class D {
-    companion <!CONFLICTING_JVM_DECLARATIONS!>object A<!> {
-        <!CONFLICTING_JVM_DECLARATIONS!>lateinit var A: A<!>
-    }
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_old.txt
deleted file mode 100644
index 9af29dae667..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_old.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-package
-
-public final class B {
-    public constructor B()
-    public final val A: B.A
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public companion object A {
-        private constructor A()
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-}
-
-public final class C {
-    public constructor C()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public companion object A {
-        private constructor A()
-        public final val A: C.A
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-}
-
-public final class D {
-    public constructor D()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public companion object A {
-        private constructor A()
-        public final lateinit var A: D.A
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_old.kt
deleted file mode 100644
index 27663261e4d..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_old.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-
-class C {
-    companion <!CONFLICTING_JVM_DECLARATIONS, REDECLARATION!>object<!> {}
-
-    <!CONFLICTING_JVM_DECLARATIONS!>val <!REDECLARATION!>Companion<!><!> = C
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_old.txt
deleted file mode 100644
index 4130443ba43..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_old.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-package
-
-public final class C {
-    public constructor C()
-    public final val Companion: C.Companion
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public companion object Companion {
-        private constructor Companion()
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_old.kt
deleted file mode 100644
index cbbb3c27826..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_old.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-class C {
-    <!CONFLICTING_JVM_DECLARATIONS!>fun `a$default`(c: C, x: Int, m: Int, mh: Any)<!> {}
-    <!CONFLICTING_JVM_DECLARATIONS!>fun a(x: Int = 1)<!> {}
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_old.txt
deleted file mode 100644
index ede39d8e205..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_old.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-package
-
-public final class C {
-    public constructor C()
-    public final fun a(/*0*/ x: kotlin.Int = ...): kotlin.Unit
-    public final fun `a$default`(/*0*/ c: C, /*1*/ x: kotlin.Int, /*2*/ m: kotlin.Int, /*3*/ mh: kotlin.Any): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_old.kt
deleted file mode 100644
index c10c5b7084f..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_old.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-
-interface Foo
-
-class <!CONFLICTING_JVM_DECLARATIONS!>Bar(f: Foo)<!> : Foo by f {
-    // Backing field is renamed to `$$delegate_0$1` in JVM_IR
-    <!CONFLICTING_JVM_DECLARATIONS!>val `$$delegate_0`: Foo?<!> = null
-}
-
-class <!CONFLICTING_JVM_DECLARATIONS!>Bar2(f: Foo)<!> :
-    // Backing field for delegate is renamed to `$$delegate_0$1` in JVM_IR
-    Foo by f {
-
-    <!CONFLICTING_JVM_DECLARATIONS!>lateinit var `$$delegate_0`: Foo<!>
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_old.txt
deleted file mode 100644
index 705450f5cd2..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_old.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-package
-
-public final class Bar : Foo {
-    public constructor Bar(/*0*/ f: Foo)
-    public final val `$$delegate_0`: Foo? = null
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class Bar2 : Foo {
-    public constructor Bar2(/*0*/ f: Foo)
-    public final lateinit var `$$delegate_0`: Foo
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface Foo {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_old.kt
deleted file mode 100644
index 4d2398c3399..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_old.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-// TARGET_BACKEND: JVM_OLD
-
-class C {
-    inner class <!CONFLICTING_JVM_DECLARATIONS!>D<!> {
-        <!CONFLICTING_JVM_DECLARATIONS!>val `this$0`: C?<!> = null
-    }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_old.txt
deleted file mode 100644
index 9174fe5c34d..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_old.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-package
-
-public final class C {
-    public constructor C()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public final inner class D {
-        public constructor D()
-        public final val `this$0`: C? = null
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_old.kt
deleted file mode 100644
index a50e23605ae..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_old.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-
-<!CONFLICTING_JVM_DECLARATIONS!>object O<!> {
-    <!CONFLICTING_JVM_DECLARATIONS!>val INSTANCE: O<!> = null!!
-}
-
-<!CONFLICTING_JVM_DECLARATIONS!>object O2<!> {
-    <!CONFLICTING_JVM_DECLARATIONS!>lateinit var INSTANCE: O2<!>
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_old.txt
deleted file mode 100644
index dafc43fc17c..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_old.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-package
-
-public object O {
-    private constructor O()
-    public final val INSTANCE: O
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public object O2 {
-    private constructor O2()
-    public final lateinit var INSTANCE: O2
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_old.kt
deleted file mode 100644
index 34f83824e42..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_old.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-<!CONFLICTING_JVM_DECLARATIONS!>package test
-// TARGET_BACKEND: JVM_OLD
-
-import kotlin.reflect.KProperty
-
-operator fun Any.getValue(x: Any?, y: Any): Any = null!!
-
-class <!CONFLICTING_JVM_DECLARATIONS!>C<!> {
-    val x by 1
-    <!CONFLICTING_JVM_DECLARATIONS!>val `$$delegatedProperties`: Array<KProperty<*>><!> = null!!
-}
-
-class <!CONFLICTING_JVM_DECLARATIONS!>C2<!> {
-    val x by 1
-    <!CONFLICTING_JVM_DECLARATIONS!>lateinit var `$$delegatedProperties`: Array<KProperty<*>><!>
-}
-
-val x by 1
-<!CONFLICTING_JVM_DECLARATIONS!>lateinit var `$$delegatedProperties`: Array<KProperty<*>><!><!>
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_old.txt
deleted file mode 100644
index 4030ac0fd54..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_old.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-package
-
-package test {
-    public lateinit var `$$delegatedProperties`: kotlin.Array<kotlin.reflect.KProperty<*>>
-    public val x: kotlin.Any
-    public operator fun kotlin.Any.getValue(/*0*/ x: kotlin.Any?, /*1*/ y: kotlin.Any): kotlin.Any
-
-    public final class C {
-        public constructor C()
-        public final val `$$delegatedProperties`: kotlin.Array<kotlin.reflect.KProperty<*>>
-        public final val x: kotlin.Any
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-
-    public final class C2 {
-        public constructor C2()
-        public final lateinit var `$$delegatedProperties`: kotlin.Array<kotlin.reflect.KProperty<*>>
-        public final val x: kotlin.Any
-        public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-        public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-        public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-    }
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_old.kt
deleted file mode 100644
index 80f0bbfd7d3..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_old.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-interface Base1 {
-    fun getX(): Int
-}
-
-interface Base2 {
-    val x: Int
-        get() = 1
-}
-
-interface <!CONFLICTING_INHERITED_JVM_DECLARATIONS, CONFLICTING_INHERITED_JVM_DECLARATIONS!>Test<!> : Base1, Base2
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_old.txt
deleted file mode 100644
index f78f8cdf9d9..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_old.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-package
-
-public interface Base1 {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun getX(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface Base2 {
-    public open val x: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface Test : Base1, Base2 {
-    public open override /*1*/ /*fake_override*/ val x: kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract override /*1*/ /*fake_override*/ fun getX(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_old.kt
deleted file mode 100644
index fce315d04d1..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_old.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-
-interface T {
-    fun getX() = 1
-}
-
-class <!CONFLICTING_JVM_DECLARATIONS!>C<!> : T {
-    <!ACCIDENTAL_OVERRIDE, CONFLICTING_JVM_DECLARATIONS!>val x<!> = 1
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_old.txt
deleted file mode 100644
index c951f60228a..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_old.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-package
-
-public final class C : T {
-    public constructor C()
-    public final val x: kotlin.Int = 1
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun getX(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface T {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun getX(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_old.kt
deleted file mode 100644
index 0e8d2b4af42..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_old.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-
-interface T {
-    fun getX() = 1
-}
-
-interface <!CONFLICTING_JVM_DECLARATIONS!>C<!> : T {
-    val x: Int
-        <!ACCIDENTAL_OVERRIDE, ACCIDENTAL_OVERRIDE, CONFLICTING_JVM_DECLARATIONS!>get()<!> = 1
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_old.txt
deleted file mode 100644
index 64bdfcc5f3c..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_old.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-package
-
-public interface C : T {
-    public open val x: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun getX(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface T {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun getX(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_old.kt
deleted file mode 100644
index cdf03e0019a..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_old.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-
-interface T {
-    val x: Int
-        get() = 1
-}
-
-interface <!CONFLICTING_JVM_DECLARATIONS!>C<!> : T {
-    <!ACCIDENTAL_OVERRIDE, ACCIDENTAL_OVERRIDE, CONFLICTING_JVM_DECLARATIONS!>fun getX()<!> = 1
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_old.txt
deleted file mode 100644
index ca3ff66ebb5..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_old.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-package
-
-public interface C : T {
-    public open override /*1*/ /*fake_override*/ val x: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun getX(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface T {
-    public open val x: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_old.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_old.kt
deleted file mode 100644
index 6ca89142712..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_old.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-
-interface T1 {
-    fun getX() = 1
-}
-
-interface T2 {
-    val x: Int
-        get() = 1
-}
-
-class <!CONFLICTING_INHERITED_JVM_DECLARATIONS, CONFLICTING_JVM_DECLARATIONS!>C<!> : T1, T2 {
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_old.txt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_old.txt
deleted file mode 100644
index ba1c334d65d..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_old.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-package
-
-public final class C : T1, T2 {
-    public constructor C()
-    public open override /*1*/ /*fake_override*/ val x: kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun getX(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface T1 {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun getX(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface T2 {
-    public open val x: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.diag.txt b/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.diag.txt
deleted file mode 100644
index 28c698fcda8..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.diag.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-/indirectInlineCycle.kt:8:24: error: the 'inlineFun2' invocation is a part of inline cycle
-        fun method() { inlineFun2(p) }
-                       ^
-/indirectInlineCycle.kt:13:5: error: the 'inlineFun1' invocation is a part of inline cycle
-    inlineFun1(p)
-    ^
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.kt b/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.kt
deleted file mode 100644
index b8301ceb79f..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// !RENDER_DIAGNOSTICS_FULL_TEXT
-// TARGET_BACKEND: JVM_OLD
-inline fun inlineFun1(crossinline p: () -> Unit) {
-    object {
-        fun method() { <!INLINE_CALL_CYCLE, INLINE_CALL_CYCLE!>inlineFun2(p)<!> }
-    }
-}
-
-inline fun inlineFun2(crossinline p: () -> Unit) {
-    <!INLINE_CALL_CYCLE, INLINE_CALL_CYCLE!>inlineFun1(p)<!>
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.txt b/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.txt
deleted file mode 100644
index 7ffee00a6e3..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-package
-
-public inline fun inlineFun1(/*0*/ crossinline p: () -> kotlin.Unit): kotlin.Unit
-public inline fun inlineFun2(/*0*/ crossinline p: () -> kotlin.Unit): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.diag.txt b/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.diag.txt
deleted file mode 100644
index d91dde86ce7..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.diag.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-/inlineCycle.kt:8:5: error: the 'inlineFun2' invocation is a part of inline cycle
-    inlineFun2(p)
-    ^
-/inlineCycle.kt:13:5: error: the 'inlineFun1' invocation is a part of inline cycle
-    inlineFun1(p)
-    ^
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.kt b/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.kt
deleted file mode 100644
index f3608f2c132..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// !RENDER_DIAGNOSTICS_FULL_TEXT
-// TARGET_BACKEND: JVM_OLD
-inline fun inlineFun1(p: () -> Unit) {
-    p()
-    <!INLINE_CALL_CYCLE, INLINE_CALL_CYCLE!>inlineFun2(p)<!>
-}
-
-inline fun inlineFun2(p: () -> Unit) {
-    p()
-    <!INLINE_CALL_CYCLE, INLINE_CALL_CYCLE!>inlineFun1(p)<!>
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.txt b/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.txt
deleted file mode 100644
index 66a2506dc5e..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-package
-
-public inline fun inlineFun1(/*0*/ p: () -> kotlin.Unit): kotlin.Unit
-public inline fun inlineFun2(/*0*/ p: () -> kotlin.Unit): kotlin.Unit
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt b/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt
deleted file mode 100644
index 953510b6bc4..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// TARGET_BACKEND: JVM_OLD
-class <!CONFLICTING_JVM_DECLARATIONS!>Fun<!> :
-        (Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int,
-         Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int) -> Int,
-        (Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int,
-         Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int, Int) -> Int
-{
-    override fun invoke(
-        p00: Int, p01: Int, p02: Int, p03: Int, p04: Int, p05: Int, p06: Int, p07: Int, p08: Int, p09: Int,
-        p10: Int, p11: Int, p12: Int, p13: Int, p14: Int, p15: Int, p16: Int, p17: Int, p18: Int, p19: Int,
-        p20: Int, p21: Int, p22: Int, p23: Int, p24: Int, p25: Int, p26: Int, p27: Int, p28: Int, p29: Int
-    ): Int = 330
-
-    override fun invoke(
-        p00: Int, p01: Int, p02: Int, p03: Int, p04: Int, p05: Int, p06: Int, p07: Int, p08: Int, p09: Int,
-        p10: Int, p11: Int, p12: Int, p13: Int, p14: Int, p15: Int, p16: Int, p17: Int, p18: Int, p19: Int,
-        p20: Int, p21: Int, p22: Int, p23: Int, p24: Int, p25: Int, p26: Int, p27: Int, p28: Int, p29: Int,
-        p30: Int, p31: Int, p32: Int
-    ): Int = 333
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.txt b/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.txt
deleted file mode 100644
index 6d94b0386fb..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-package
-
-public final class Fun : (kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int) -> kotlin.Int, (kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int, kotlin.Int) -> kotlin.Int {
-    public constructor Fun()
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ fun invoke(/*0*/ p00: kotlin.Int, /*1*/ p01: kotlin.Int, /*2*/ p02: kotlin.Int, /*3*/ p03: kotlin.Int, /*4*/ p04: kotlin.Int, /*5*/ p05: kotlin.Int, /*6*/ p06: kotlin.Int, /*7*/ p07: kotlin.Int, /*8*/ p08: kotlin.Int, /*9*/ p09: kotlin.Int, /*10*/ p10: kotlin.Int, /*11*/ p11: kotlin.Int, /*12*/ p12: kotlin.Int, /*13*/ p13: kotlin.Int, /*14*/ p14: kotlin.Int, /*15*/ p15: kotlin.Int, /*16*/ p16: kotlin.Int, /*17*/ p17: kotlin.Int, /*18*/ p18: kotlin.Int, /*19*/ p19: kotlin.Int, /*20*/ p20: kotlin.Int, /*21*/ p21: kotlin.Int, /*22*/ p22: kotlin.Int, /*23*/ p23: kotlin.Int, /*24*/ p24: kotlin.Int, /*25*/ p25: kotlin.Int, /*26*/ p26: kotlin.Int, /*27*/ p27: kotlin.Int, /*28*/ p28: kotlin.Int, /*29*/ p29: kotlin.Int): kotlin.Int
-    public open override /*1*/ fun invoke(/*0*/ p00: kotlin.Int, /*1*/ p01: kotlin.Int, /*2*/ p02: kotlin.Int, /*3*/ p03: kotlin.Int, /*4*/ p04: kotlin.Int, /*5*/ p05: kotlin.Int, /*6*/ p06: kotlin.Int, /*7*/ p07: kotlin.Int, /*8*/ p08: kotlin.Int, /*9*/ p09: kotlin.Int, /*10*/ p10: kotlin.Int, /*11*/ p11: kotlin.Int, /*12*/ p12: kotlin.Int, /*13*/ p13: kotlin.Int, /*14*/ p14: kotlin.Int, /*15*/ p15: kotlin.Int, /*16*/ p16: kotlin.Int, /*17*/ p17: kotlin.Int, /*18*/ p18: kotlin.Int, /*19*/ p19: kotlin.Int, /*20*/ p20: kotlin.Int, /*21*/ p21: kotlin.Int, /*22*/ p22: kotlin.Int, /*23*/ p23: kotlin.Int, /*24*/ p24: kotlin.Int, /*25*/ p25: kotlin.Int, /*26*/ p26: kotlin.Int, /*27*/ p27: kotlin.Int, /*28*/ p28: kotlin.Int, /*29*/ p29: kotlin.Int, /*30*/ p30: kotlin.Int, /*31*/ p31: kotlin.Int, /*32*/ p32: kotlin.Int): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.diag.txt b/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.diag.txt
deleted file mode 100644
index ae85fb093cb..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.diag.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-/suspendInlineCycle.kt:8:5: error: the 'inlineFun2' invocation is a part of inline cycle
-    inlineFun2(p)
-    ^
-/suspendInlineCycle.kt:13:5: error: the 'inlineFun1' invocation is a part of inline cycle
-    inlineFun1(p)
-    ^
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.kt b/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.kt
deleted file mode 100644
index 399ec143b5f..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// !RENDER_DIAGNOSTICS_FULL_TEXT
-// TARGET_BACKEND: JVM_OLD
-suspend inline fun inlineFun1(p: () -> Unit) {
-    p()
-    <!INLINE_CALL_CYCLE, INLINE_CALL_CYCLE!>inlineFun2(p)<!>
-}
-
-suspend inline fun inlineFun2(p: () -> Unit) {
-    p()
-    <!INLINE_CALL_CYCLE, INLINE_CALL_CYCLE!>inlineFun1(p)<!>
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.txt b/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.txt
deleted file mode 100644
index bc22b1eda1a..00000000000
--- a/compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-package
-
-public suspend inline fun inlineFun1(/*0*/ p: () -> kotlin.Unit): kotlin.Unit
-public suspend inline fun inlineFun2(/*0*/ p: () -> kotlin.Unit): kotlin.Unit
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithOldJvmBackendGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithOldJvmBackendGenerated.java
index 7bb216e6f05..51378061e9c 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithOldJvmBackendGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithOldJvmBackendGenerated.java
@@ -25,18 +25,6 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_OLD, true);
     }
 
-    @Test
-    @TestMetadata("indirectInlineCycle.kt")
-    public void testIndirectInlineCycle() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/indirectInlineCycle.kt");
-    }
-
-    @Test
-    @TestMetadata("inlineCycle.kt")
-    public void testInlineCycle() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/inlineCycle.kt");
-    }
-
     @Test
     @TestMetadata("kt57104.kt")
     public void testKt57104() throws Exception {
@@ -49,12 +37,6 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
         runTest("compiler/testData/diagnostics/testsWithJvmBackend/kt57104_2.kt");
     }
 
-    @Test
-    @TestMetadata("multipleBigArityFunsImplemented.kt")
-    public void testMultipleBigArityFunsImplemented() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/multipleBigArityFunsImplemented.kt");
-    }
-
     @Test
     @TestMetadata("noWarningInLV1_5.kt")
     public void testNoWarningInLV1_5() throws Exception {
@@ -67,12 +49,6 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
         runTest("compiler/testData/diagnostics/testsWithJvmBackend/propertyInlineCycle.kt");
     }
 
-    @Test
-    @TestMetadata("suspendInlineCycle.kt")
-    public void testSuspendInlineCycle() throws Exception {
-        runTest("compiler/testData/diagnostics/testsWithJvmBackend/suspendInlineCycle.kt");
-    }
-
     @Nested
     @TestMetadata("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature")
     @TestDataPath("$PROJECT_ROOT")
@@ -139,18 +115,6 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.kt");
             }
 
-            @Test
-            @TestMetadata("defaultFunction_old.kt")
-            public void testDefaultFunction_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/defaultFunction_old.kt");
-            }
-
-            @Test
-            @TestMetadata("delegatedFunctionOverriddenByProperty_old.kt")
-            public void testDelegatedFunctionOverriddenByProperty_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty_old.kt");
-            }
-
             @Test
             @TestMetadata("genericClassFunction.kt")
             public void testGenericClassFunction() throws Exception {
@@ -169,23 +133,11 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByPropertyNoImpl.kt");
             }
 
-            @Test
-            @TestMetadata("traitFunctionOverriddenByProperty_old.kt")
-            public void testTraitFunctionOverriddenByProperty_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitFunctionOverriddenByProperty_old.kt");
-            }
-
             @Test
             @TestMetadata("traitPropertyOverriddenByFunctionNoImpl.kt")
             public void testTraitPropertyOverriddenByFunctionNoImpl() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunctionNoImpl.kt");
             }
-
-            @Test
-            @TestMetadata("traitPropertyOverriddenByFunction_old.kt")
-            public void testTraitPropertyOverriddenByFunction_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/accidentalOverrides/traitPropertyOverriddenByFunction_old.kt");
-            }
         }
 
         @Nested
@@ -196,24 +148,6 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
             public void testAllFilesPresentInBridges() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_OLD, true);
             }
-
-            @Test
-            @TestMetadata("class_old.kt")
-            public void testClass_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/class_old.kt");
-            }
-
-            @Test
-            @TestMetadata("fakeOverrideTrait_old.kt")
-            public void testFakeOverrideTrait_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/fakeOverrideTrait_old.kt");
-            }
-
-            @Test
-            @TestMetadata("trait_old.kt")
-            public void testTrait_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/bridges/trait_old.kt");
-            }
         }
 
         @Nested
@@ -225,12 +159,6 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_OLD, true);
             }
 
-            @Test
-            @TestMetadata("clashFromInterfaceAndSuperClass_old.kt")
-            public void testClashFromInterfaceAndSuperClass_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/clashFromInterfaceAndSuperClass_old.kt");
-            }
-
             @Test
             @TestMetadata("collections.kt")
             public void testCollections() throws Exception {
@@ -267,12 +195,6 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/genericType.kt");
             }
 
-            @Test
-            @TestMetadata("inheritFromTwoTraits_old.kt")
-            public void testInheritFromTwoTraits_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/inheritFromTwoTraits_old.kt");
-            }
-
             @Test
             @TestMetadata("kotlinAndJavaCollections.kt")
             public void testKotlinAndJavaCollections() throws Exception {
@@ -285,18 +207,6 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/nullableType.kt");
             }
 
-            @Test
-            @TestMetadata("superTraitAndDelegationToTraitImpl_old.kt")
-            public void testSuperTraitAndDelegationToTraitImpl_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/superTraitAndDelegationToTraitImpl_old.kt");
-            }
-
-            @Test
-            @TestMetadata("twoTraitsAndOwnFunction_old.kt")
-            public void testTwoTraitsAndOwnFunction_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/erasure/twoTraitsAndOwnFunction_old.kt");
-            }
-
             @Test
             @TestMetadata("typeMappedToJava.kt")
             public void testTypeMappedToJava() throws Exception {
@@ -342,12 +252,6 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
             public void testEnumMembers() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/enumMembers.kt");
             }
-
-            @Test
-            @TestMetadata("waitNotifyGetClass_old.kt")
-            public void testWaitNotifyGetClass_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/finalMembersFromBuiltIns/waitNotifyGetClass_old.kt");
-            }
         }
 
         @Nested
@@ -460,12 +364,6 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
             public void testTopLevelGetter() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/topLevelGetter.kt");
             }
-
-            @Test
-            @TestMetadata("trait_old.kt")
-            public void testTrait_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/functionAndProperty/trait_old.kt");
-            }
         }
 
         @Nested
@@ -493,59 +391,17 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedField.kt");
             }
 
-            @Test
-            @TestMetadata("classObjectCopiedFieldObject_old.kt")
-            public void testClassObjectCopiedFieldObject_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject_old.kt");
-            }
-
-            @Test
-            @TestMetadata("classObject_old.kt")
-            public void testClassObject_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/classObject_old.kt");
-            }
-
             @Test
             @TestMetadata("dataClassCopy.kt")
             public void testDataClassCopy() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/dataClassCopy.kt");
             }
 
-            @Test
-            @TestMetadata("defaults_old.kt")
-            public void testDefaults_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/defaults_old.kt");
-            }
-
-            @Test
-            @TestMetadata("delegationBy_old.kt")
-            public void testDelegationBy_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/delegationBy_old.kt");
-            }
-
             @Test
             @TestMetadata("enum.kt")
             public void testEnum() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/enum.kt");
             }
-
-            @Test
-            @TestMetadata("innerClassField_old.kt")
-            public void testInnerClassField_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/innerClassField_old.kt");
-            }
-
-            @Test
-            @TestMetadata("instance_old.kt")
-            public void testInstance_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/instance_old.kt");
-            }
-
-            @Test
-            @TestMetadata("propertyMetadataCache_old.kt")
-            public void testPropertyMetadataCache_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/specialNames/propertyMetadataCache_old.kt");
-            }
         }
 
         @Nested
@@ -619,41 +475,11 @@ public class DiagnosticsTestWithOldJvmBackendGenerated extends AbstractDiagnosti
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_OLD, true);
             }
 
-            @Test
-            @TestMetadata("defaultVsNonDefault_old.kt")
-            public void testDefaultVsNonDefault_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/defaultVsNonDefault_old.kt");
-            }
-
             @Test
             @TestMetadata("kt43611.kt")
             public void testKt43611() throws Exception {
                 runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/kt43611.kt");
             }
-
-            @Test
-            @TestMetadata("oneTrait_old.kt")
-            public void testOneTrait_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/oneTrait_old.kt");
-            }
-
-            @Test
-            @TestMetadata("traitFunctionOverriddenByPropertyInTrait_old.kt")
-            public void testTraitFunctionOverriddenByPropertyInTrait_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitFunctionOverriddenByPropertyInTrait_old.kt");
-            }
-
-            @Test
-            @TestMetadata("traitPropertyOverriddenByFunctionInTrait_old.kt")
-            public void testTraitPropertyOverriddenByFunctionInTrait_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/traitPropertyOverriddenByFunctionInTrait_old.kt");
-            }
-
-            @Test
-            @TestMetadata("twoTraits_old.kt")
-            public void testTwoTraits_old() throws Exception {
-                runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/traitImpl/twoTraits_old.kt");
-            }
         }
 
         @Nested