diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
index ead1ba62346..fe570d644dd 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
@@ -36147,24 +36147,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt");
                 }
 
-                @Test
-                @TestMetadata("javaOverride.kt")
-                public void testJavaOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("javaOverrideAll.kt")
-                public void testJavaOverrideAll() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverrideAll.kt");
-                }
-
-                @Test
-                @TestMetadata("jvmDefaultInInheritance.kt")
-                public void testJvmDefaultInInheritance() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.kt");
-                }
-
                 @Test
                 @TestMetadata("jvmDefaults.kt")
                 public void testJvmDefaults() throws Exception {
@@ -36177,72 +36159,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt");
                 }
 
-                @Test
-                @TestMetadata("noJvmDefaultFlag.kt")
-                public void testNoJvmDefaultFlag() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt");
-                }
-
-                @Test
-                @TestMetadata("notInterface.kt")
-                public void testNotInterface() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt");
-                }
-
-                @Test
-                @TestMetadata("propertyAccessor.kt")
-                public void testPropertyAccessor() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleOverride.kt")
-                public void testSimpleOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("simplePropertyOverride.kt")
-                public void testSimplePropertyOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("superCall.kt")
-                public void testSuperCall() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity.kt")
-                public void testSuperCallAmbiguity() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity2.kt")
-                public void testSuperCallAmbiguity2() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity2.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity3.kt")
-                public void testSuperCallAmbiguity3() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity3.kt");
-                }
-
-                @Test
-                @TestMetadata("target6.kt")
-                public void testTarget6() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt");
-                }
-
-                @Test
-                @TestMetadata("target8.kt")
-                public void testTarget8() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt");
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/allCompatibility")
                 @TestDataPath("$PROJECT_ROOT")
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
index 540812b3150..3bc12f94298 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
@@ -36147,24 +36147,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt");
                 }
 
-                @Test
-                @TestMetadata("javaOverride.kt")
-                public void testJavaOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("javaOverrideAll.kt")
-                public void testJavaOverrideAll() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverrideAll.kt");
-                }
-
-                @Test
-                @TestMetadata("jvmDefaultInInheritance.kt")
-                public void testJvmDefaultInInheritance() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.kt");
-                }
-
                 @Test
                 @TestMetadata("jvmDefaults.kt")
                 public void testJvmDefaults() throws Exception {
@@ -36177,72 +36159,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt");
                 }
 
-                @Test
-                @TestMetadata("noJvmDefaultFlag.kt")
-                public void testNoJvmDefaultFlag() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt");
-                }
-
-                @Test
-                @TestMetadata("notInterface.kt")
-                public void testNotInterface() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt");
-                }
-
-                @Test
-                @TestMetadata("propertyAccessor.kt")
-                public void testPropertyAccessor() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleOverride.kt")
-                public void testSimpleOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("simplePropertyOverride.kt")
-                public void testSimplePropertyOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("superCall.kt")
-                public void testSuperCall() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity.kt")
-                public void testSuperCallAmbiguity() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity2.kt")
-                public void testSuperCallAmbiguity2() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity2.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity3.kt")
-                public void testSuperCallAmbiguity3() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity3.kt");
-                }
-
-                @Test
-                @TestMetadata("target6.kt")
-                public void testTarget6() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt");
-                }
-
-                @Test
-                @TestMetadata("target8.kt")
-                public void testTarget8() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt");
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/allCompatibility")
                 @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
index 9a589beb746..2603bf8b17c 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
@@ -36147,24 +36147,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt");
                 }
 
-                @Test
-                @TestMetadata("javaOverride.kt")
-                public void testJavaOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("javaOverrideAll.kt")
-                public void testJavaOverrideAll() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverrideAll.kt");
-                }
-
-                @Test
-                @TestMetadata("jvmDefaultInInheritance.kt")
-                public void testJvmDefaultInInheritance() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.kt");
-                }
-
                 @Test
                 @TestMetadata("jvmDefaults.kt")
                 public void testJvmDefaults() throws Exception {
@@ -36177,72 +36159,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt");
                 }
 
-                @Test
-                @TestMetadata("noJvmDefaultFlag.kt")
-                public void testNoJvmDefaultFlag() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt");
-                }
-
-                @Test
-                @TestMetadata("notInterface.kt")
-                public void testNotInterface() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt");
-                }
-
-                @Test
-                @TestMetadata("propertyAccessor.kt")
-                public void testPropertyAccessor() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleOverride.kt")
-                public void testSimpleOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("simplePropertyOverride.kt")
-                public void testSimplePropertyOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("superCall.kt")
-                public void testSuperCall() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity.kt")
-                public void testSuperCallAmbiguity() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity2.kt")
-                public void testSuperCallAmbiguity2() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity2.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity3.kt")
-                public void testSuperCallAmbiguity3() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity3.kt");
-                }
-
-                @Test
-                @TestMetadata("target6.kt")
-                public void testTarget6() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt");
-                }
-
-                @Test
-                @TestMetadata("target8.kt")
-                public void testTarget8() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt");
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/allCompatibility")
                 @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
index 03ff0bdedcd..e89497a4147 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
@@ -36243,24 +36243,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt");
                 }
 
-                @Test
-                @TestMetadata("javaOverride.kt")
-                public void testJavaOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("javaOverrideAll.kt")
-                public void testJavaOverrideAll() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverrideAll.kt");
-                }
-
-                @Test
-                @TestMetadata("jvmDefaultInInheritance.kt")
-                public void testJvmDefaultInInheritance() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.kt");
-                }
-
                 @Test
                 @TestMetadata("jvmDefaults.kt")
                 public void testJvmDefaults() throws Exception {
@@ -36273,72 +36255,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt");
                 }
 
-                @Test
-                @TestMetadata("noJvmDefaultFlag.kt")
-                public void testNoJvmDefaultFlag() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt");
-                }
-
-                @Test
-                @TestMetadata("notInterface.kt")
-                public void testNotInterface() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt");
-                }
-
-                @Test
-                @TestMetadata("propertyAccessor.kt")
-                public void testPropertyAccessor() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleOverride.kt")
-                public void testSimpleOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("simplePropertyOverride.kt")
-                public void testSimplePropertyOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("superCall.kt")
-                public void testSuperCall() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity.kt")
-                public void testSuperCallAmbiguity() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity2.kt")
-                public void testSuperCallAmbiguity2() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity2.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity3.kt")
-                public void testSuperCallAmbiguity3() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity3.kt");
-                }
-
-                @Test
-                @TestMetadata("target6.kt")
-                public void testTarget6() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt");
-                }
-
-                @Test
-                @TestMetadata("target8.kt")
-                public void testTarget8() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt");
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/allCompatibility")
                 @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
index 4c620660b2e..006ed5a8543 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxCodegenTestGenerated.java
@@ -8063,6 +8063,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
                 }
 
+                @Test
+                @TestMetadata("callStackTrace.kt")
+                public void testCallStackTrace() throws Exception {
+                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/callStackTrace.kt");
+                }
+
                 @Test
                 @TestMetadata("superCall.kt")
                 public void testSuperCall() throws Exception {
@@ -8075,12 +8081,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt");
                 }
 
-                @Test
-                @TestMetadata("superCallFromInterface2.kt")
-                public void testSuperCallFromInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt");
-                }
-
                 @Test
                 @TestMetadata("superPropAccess.kt")
                 public void testSuperPropAccess() throws Exception {
@@ -8093,12 +8093,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt");
                 }
 
-                @Test
-                @TestMetadata("superPropAccessFromInterface2.kt")
-                public void testSuperPropAccessFromInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt");
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility")
                 @TestDataPath("$PROJECT_ROOT")
@@ -8229,28 +8223,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     public void testNewAndOldSchemes3() throws Exception {
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt");
                     }
-
-                    @Test
-                    @TestMetadata("newSchemeWithJvmDefault.kt")
-                    public void testNewSchemeWithJvmDefault() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt");
-                    }
-                }
-
-                @Nested
-                @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls")
-                @TestDataPath("$PROJECT_ROOT")
-                public class NoDefaultImpls {
-                    @Test
-                    public void testAllFilesPresentInNoDefaultImpls() throws Exception {
-                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                    }
-
-                    @Test
-                    @TestMetadata("superPropAccessFromInterface.kt")
-                    public void testSuperPropAccessFromInterface() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls/superPropAccessFromInterface.kt");
-                    }
                 }
             }
 
@@ -11591,12 +11563,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     public void testDisable() throws Exception {
                         runTest("compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/disable.kt");
                     }
-
-                    @Test
-                    @TestMetadata("enable.kt")
-                    public void testEnable() throws Exception {
-                        runTest("compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/enable.kt");
-                    }
                 }
             }
 
@@ -24745,18 +24711,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/all-compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
                 }
 
-                @Test
-                @TestMetadata("compatibility.kt")
-                public void testCompatibility() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibility.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
-                @Test
-                @TestMetadata("compatibilityGeneric.kt")
-                public void testCompatibilityGeneric() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
                 @Test
                 @TestMetadata("default.kt")
                 public void testDefault() throws Exception {
@@ -24803,18 +24757,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/all-compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
                 }
 
-                @Test
-                @TestMetadata("compatibility.kt")
-                public void testCompatibility() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibility.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
-                @Test
-                @TestMetadata("compatibilityGeneric.kt")
-                public void testCompatibilityGeneric() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
                 @Test
                 @TestMetadata("default.kt")
                 public void testDefault() throws Exception {
@@ -25822,42 +25764,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                 runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultAllPropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
             }
 
-            @Test
-            @TestMetadata("jvmDefaultEnable.kt")
-            public void testJvmDefaultEnable() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnable.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnableGeneric.kt")
-            public void testJvmDefaultEnableGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePrimaryProperty.kt")
-            public void testJvmDefaultEnablePrimaryProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryProperty.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePrimaryPropertyGeneric.kt")
-            public void testJvmDefaultEnablePrimaryPropertyGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryPropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnableProperty.kt")
-            public void testJvmDefaultEnableProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableProperty.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePropertyGeneric.kt")
-            public void testJvmDefaultEnablePropertyGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
             @Test
             @TestMetadata("jvmDefaultGeneric.kt")
             public void testJvmDefaultGeneric() throws Exception {
@@ -30005,71 +29911,11 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
         @TestMetadata("compiler/testData/codegen/box/jvm8/defaults")
         @TestDataPath("$PROJECT_ROOT")
         public class Defaults {
-            @Test
-            @TestMetadata("26360.kt")
-            public void test26360() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/26360.kt");
-            }
-
-            @Test
-            @TestMetadata("accessor.kt")
-            public void testAccessor() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessor.kt");
-            }
-
-            @Test
-            @TestMetadata("accessorFromCompanion.kt")
-            public void testAccessorFromCompanion() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt");
-            }
-
-            @Test
-            @TestMetadata("accessorsFromDefaultImpls.kt")
-            public void testAccessorsFromDefaultImpls() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt");
-            }
-
             @Test
             public void testAllFilesPresentInDefaults() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
             }
 
-            @Test
-            @TestMetadata("bridgeInClass.kt")
-            public void testBridgeInClass() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterface.kt")
-            public void testBridgeInInterface() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterface2.kt")
-            public void testBridgeInInterface2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterfaceWithProperties.kt")
-            public void testBridgeInInterfaceWithProperties() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterfaceWithProperties2.kt")
-            public void testBridgeInInterfaceWithProperties2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeWithJava.kt")
-            public void testBridgeWithJava() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt");
-            }
-
             @Test
             @TestMetadata("builtInsInherited.kt")
             public void testBuiltInsInherited() throws Exception {
@@ -30077,135 +29923,9 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
             }
 
             @Test
-            @TestMetadata("callableReference.kt")
-            public void testCallableReference() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/callableReference.kt");
-            }
-
-            @Test
-            @TestMetadata("capturedSuperCall.kt")
-            public void testCapturedSuperCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt");
-            }
-
-            @Test
-            @TestMetadata("defaultArgs.kt")
-            public void testDefaultArgs() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt");
-            }
-
-            @Test
-            @TestMetadata("defaultArgsViaAnonymousObject.kt")
-            public void testDefaultArgsViaAnonymousObject() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/defaultArgsViaAnonymousObject.kt");
-            }
-
-            @Test
-            @TestMetadata("diamond.kt")
-            public void testDiamond() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/diamond.kt");
-            }
-
-            @Test
-            @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
-            public void testInheritedFunctionWithDefaultParameters() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inheritedFunctionWithDefaultParameters.kt");
-            }
-
-            @Test
-            @TestMetadata("inline.kt")
-            public void testInline() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inline.kt");
-            }
-
-            @Test
-            @TestMetadata("inlineProperty.kt")
-            public void testInlineProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt");
-            }
-
-            @Test
-            @TestMetadata("kt11969.kt")
-            public void testKt11969() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt11969.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243.kt")
-            public void testKt14243() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243_2.kt")
-            public void testKt14243_2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243_prop.kt")
-            public void testKt14243_prop() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt");
-            }
-
-            @Test
-            @TestMetadata("kt40920.kt")
-            public void testKt40920() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt40920.kt");
-            }
-
-            @Test
-            @TestMetadata("kt42674.kt")
-            public void testKt42674() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt42674.kt");
-            }
-
-            @Test
-            @TestMetadata("oneImplementation.kt")
-            public void testOneImplementation() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt");
-            }
-
-            @Test
-            @TestMetadata("oneImplementation2.kt")
-            public void testOneImplementation2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt");
-            }
-
-            @Test
-            @TestMetadata("privateDefaultFromDefaultImpl.kt")
-            public void testPrivateDefaultFromDefaultImpl() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt");
-            }
-
-            @Test
-            @TestMetadata("privateInDefaultImpls.kt")
-            public void testPrivateInDefaultImpls() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt");
-            }
-
-            @Test
-            @TestMetadata("simpleCall.kt")
-            public void testSimpleCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt");
-            }
-
-            @Test
-            @TestMetadata("simpleProperty.kt")
-            public void testSimpleProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt");
-            }
-
-            @Test
-            @TestMetadata("superCall.kt")
-            public void testSuperCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/superCall.kt");
-            }
-
-            @Test
-            @TestMetadata("suspendFunction.kt")
-            public void testSuspendFunction() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/suspendFunction.kt");
+            @TestMetadata("kt26360.kt")
+            public void testKt26360() throws Exception {
+                runTest("compiler/testData/codegen/box/jvm8/defaults/kt26360.kt");
             }
 
             @Nested
@@ -30307,6 +30027,18 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callStackTrace.kt");
                 }
 
+                @Test
+                @TestMetadata("callableReference.kt")
+                public void testCallableReference() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callableReference.kt");
+                }
+
+                @Test
+                @TestMetadata("capturedSuperCall.kt")
+                public void testCapturedSuperCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/capturedSuperCall.kt");
+                }
+
                 @Test
                 @TestMetadata("defaultArgs.kt")
                 public void testDefaultArgs() throws Exception {
@@ -30319,12 +30051,24 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @Test
+                @TestMetadata("deprecatedAnnotation.kt")
+                public void testDeprecatedAnnotation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedAnnotation.kt");
+                }
+
                 @Test
                 @TestMetadata("deprecatedDefaultMethod.kt")
                 public void testDeprecatedDefaultMethod() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedDefaultMethod.kt");
                 }
 
+                @Test
+                @TestMetadata("diamond.kt")
+                public void testDiamond() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/diamond.kt");
+                }
+
                 @Test
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
@@ -30343,12 +30087,30 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inheritedJvmDefault.kt");
                 }
 
+                @Test
+                @TestMetadata("inline.kt")
+                public void testInline() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inline.kt");
+                }
+
+                @Test
+                @TestMetadata("inlineProperty.kt")
+                public void testInlineProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inlineProperty.kt");
+                }
+
                 @Test
                 @TestMetadata("interfaceExtension.kt")
                 public void testInterfaceExtension() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/interfaceExtension.kt");
                 }
 
+                @Test
+                @TestMetadata("kt11969.kt")
+                public void testKt11969() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt11969.kt");
+                }
+
                 @Test
                 @TestMetadata("kt14243.kt")
                 public void testKt14243() throws Exception {
@@ -30361,6 +30123,18 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_2.kt");
                 }
 
+                @Test
+                @TestMetadata("kt14243_prop.kt")
+                public void testKt14243_prop() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_prop.kt");
+                }
+
+                @Test
+                @TestMetadata("kt40920.kt")
+                public void testKt40920() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt40920.kt");
+                }
+
                 @Test
                 @TestMetadata("kt42674.kt")
                 public void testKt42674() throws Exception {
@@ -30373,6 +30147,18 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/localDelegatedProperties.kt");
                 }
 
+                @Test
+                @TestMetadata("oneImplementation.kt")
+                public void testOneImplementation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation.kt");
+                }
+
+                @Test
+                @TestMetadata("oneImplementation2.kt")
+                public void testOneImplementation2() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation2.kt");
+                }
+
                 @Test
                 @TestMetadata("privateFunInInterface.kt")
                 public void testPrivateFunInInterface() throws Exception {
@@ -30444,112 +30230,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Compatibility {
-                @Test
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("bridge.kt")
-                public void testBridge() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt");
-                }
-
-                @Test
-                @TestMetadata("bridge2.kt")
-                public void testBridge2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt");
-                }
-
-                @Test
-                @TestMetadata("bridge3.kt")
-                public void testBridge3() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties.kt")
-                public void testBridgeWithProperties() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties2.kt")
-                public void testBridgeWithProperties2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties3.kt")
-                public void testBridgeWithProperties3() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt");
-                }
-
-                @Test
-                @TestMetadata("defaultArgs.kt")
-                public void testDefaultArgs() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt");
-                }
-
-                @Test
-                @TestMetadata("defaultArgsViaAnonymousObject.kt")
-                public void testDefaultArgsViaAnonymousObject() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgsViaAnonymousObject.kt");
-                }
-
-                @Test
-                @TestMetadata("deprecatedAnnotation.kt")
-                public void testDeprecatedAnnotation() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedAnnotation.kt");
-                }
-
-                @Test
-                @TestMetadata("deprecatedDefaultMethod.kt")
-                public void testDeprecatedDefaultMethod() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt");
-                }
-
-                @Test
-                @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
-                public void testInheritedFunctionWithDefaultParameters() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedFunctionWithDefaultParameters.kt");
-                }
-
-                @Test
-                @TestMetadata("inheritedJvmDefault.kt")
-                public void testInheritedJvmDefault() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt");
-                }
-
-                @Test
-                @TestMetadata("interfaceExtension.kt")
-                public void testInterfaceExtension() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/interfaceExtension.kt");
-                }
-
-                @Test
-                @TestMetadata("kt42674.kt")
-                public void testKt42674() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/kt42674.kt");
-                }
-
-                @Test
-                @TestMetadata("propertyAnnotation.kt")
-                public void testPropertyAnnotation() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleFunction.kt")
-                public void testSimpleFunction() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
             @TestDataPath("$PROJECT_ROOT")
@@ -30564,18 +30244,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                 public void testJavaDefaultMethod() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/javaDefaultMethod.kt");
                 }
-
-                @Test
-                @TestMetadata("simple.kt")
-                public void testSimple() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleProperty.kt")
-                public void testSimpleProperty() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt");
-                }
             }
 
             @Nested
@@ -30671,6 +30339,18 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithProperties3.kt");
                 }
 
+                @Test
+                @TestMetadata("callableReference.kt")
+                public void testCallableReference() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/callableReference.kt");
+                }
+
+                @Test
+                @TestMetadata("capturedSuperCall.kt")
+                public void testCapturedSuperCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/capturedSuperCall.kt");
+                }
+
                 @Test
                 @TestMetadata("defaultArgs.kt")
                 public void testDefaultArgs() throws Exception {
@@ -30683,6 +30363,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @Test
+                @TestMetadata("diamond.kt")
+                public void testDiamond() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/diamond.kt");
+                }
+
                 @Test
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
@@ -30701,12 +30387,30 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inheritedJvmDefault.kt");
                 }
 
+                @Test
+                @TestMetadata("inline.kt")
+                public void testInline() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inline.kt");
+                }
+
+                @Test
+                @TestMetadata("inlineProperty.kt")
+                public void testInlineProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inlineProperty.kt");
+                }
+
                 @Test
                 @TestMetadata("interfaceExtension.kt")
                 public void testInterfaceExtension() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/interfaceExtension.kt");
                 }
 
+                @Test
+                @TestMetadata("kt11969.kt")
+                public void testKt11969() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt11969.kt");
+                }
+
                 @Test
                 @TestMetadata("kt14243.kt")
                 public void testKt14243() throws Exception {
@@ -30719,6 +30423,12 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_2.kt");
                 }
 
+                @Test
+                @TestMetadata("kt14243_prop.kt")
+                public void testKt14243_prop() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_prop.kt");
+                }
+
                 @Test
                 @TestMetadata("kt40920.kt")
                 public void testKt40920() throws Exception {
@@ -30749,6 +30459,18 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/localDelegatedProperties2.kt");
                 }
 
+                @Test
+                @TestMetadata("oneImplementation.kt")
+                public void testOneImplementation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation.kt");
+                }
+
+                @Test
+                @TestMetadata("oneImplementation2.kt")
+                public void testOneImplementation2() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation2.kt");
+                }
+
                 @Test
                 @TestMetadata("privateFunInInterface.kt")
                 public void testPrivateFunInInterface() throws Exception {
@@ -30876,34 +30598,6 @@ public class FirLightTreeBlackBoxCodegenTestGenerated extends AbstractFirLightTr
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-            @TestDataPath("$PROJECT_ROOT")
-            public class NoDelegation {
-                @Test
-                public void testAllFilesPresentInNoDelegation() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInClass.kt")
-                public void testNoDelegationToDefaultMethodInClass() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt");
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInInterface.kt")
-                public void testNoDelegationToDefaultMethodInInterface() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt");
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInInterface2.kt")
-                public void testNoDelegationToDefaultMethodInInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
             @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxModernJdkCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxModernJdkCodegenTestGenerated.java
index 942c3e0cac0..bde0f7f778a 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxModernJdkCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBlackBoxModernJdkCodegenTestGenerated.java
@@ -395,9 +395,9 @@ public class FirLightTreeBlackBoxModernJdkCodegenTestGenerated extends AbstractF
             }
 
             @Test
-            @TestMetadata("propertiesOverridesEnableJvmDefault.kt")
-            public void testPropertiesOverridesEnableJvmDefault() throws Exception {
-                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesEnableJvmDefault.kt");
+            @TestMetadata("propertiesOverridesAllJvmDefault.kt")
+            public void testPropertiesOverridesAllJvmDefault() throws Exception {
+                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllJvmDefault.kt");
             }
 
             @Test
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeListingTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeListingTestGenerated.java
index b7b3d5d4c2a..4f1cde24728 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeListingTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeListingTestGenerated.java
@@ -1560,12 +1560,6 @@ public class FirLightTreeBytecodeListingTestGenerated extends AbstractFirLightTr
             public void testJvmDefaultAll() throws Exception {
                 runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultAll.kt");
             }
-
-            @Test
-            @TestMetadata("jvmDefaultEnable.kt")
-            public void testJvmDefaultEnable() throws Exception {
-                runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultEnable.kt");
-            }
         }
 
         @Nested
@@ -1917,22 +1911,6 @@ public class FirLightTreeBytecodeListingTestGenerated extends AbstractFirLightTr
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Enable {
-                @Test
-                public void testAllFilesPresentInEnable() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("interfaceProperty.kt")
-                public void testInterfaceProperty() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable/interfaceProperty.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl")
             @TestDataPath("$PROJECT_ROOT")
@@ -1947,6 +1925,12 @@ public class FirLightTreeBytecodeListingTestGenerated extends AbstractFirLightTr
                 public void testInterfaceProperty() throws Exception {
                     runTest("compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/interfaceProperty.kt");
                 }
+
+                @Test
+                @TestMetadata("privateAccessorNaming.kt")
+                public void testPrivateAccessorNaming() throws Exception {
+                    runTest("compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.kt");
+                }
             }
         }
     }
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java
index 460f0616d26..238d147ed4b 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirLightTreeBytecodeTextTestGenerated.java
@@ -3916,12 +3916,6 @@ public class FirLightTreeBytecodeTextTestGenerated extends AbstractFirLightTreeB
             runTest("compiler/testData/codegen/bytecodeText/inlineClasses/interfaceDefaultImplStubs.kt");
         }
 
-        @Test
-        @TestMetadata("interfaceJvmDefaultImplStubs.kt")
-        public void testInterfaceJvmDefaultImplStubs() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/inlineClasses/interfaceJvmDefaultImplStubs.kt");
-        }
-
         @Test
         @TestMetadata("isCheckForInlineClass.kt")
         public void testIsCheckForInlineClass() throws Exception {
@@ -4482,46 +4476,6 @@ public class FirLightTreeBytecodeTextTestGenerated extends AbstractFirLightTreeB
                     runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/allCompatibility/simpleProperty.kt");
                 }
             }
-
-            @Nested
-            @TestMetadata("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Compatibility {
-                @Test
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("defaultArgs.kt")
-                public void testDefaultArgs() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleDiamond.kt")
-                public void testSimpleDiamond() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleDiamond.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleFunction.kt")
-                public void testSimpleFunction() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunction.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleFunctionWithAbstractOverride.kt")
-                public void testSimpleFunctionWithAbstractOverride() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunctionWithAbstractOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleProperty.kt")
-                public void testSimpleProperty() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt");
-                }
-            }
         }
     }
 
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
index f0be808df64..7433ffe1601 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxCodegenTestGenerated.java
@@ -8063,6 +8063,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
                 }
 
+                @Test
+                @TestMetadata("callStackTrace.kt")
+                public void testCallStackTrace() throws Exception {
+                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/callStackTrace.kt");
+                }
+
                 @Test
                 @TestMetadata("superCall.kt")
                 public void testSuperCall() throws Exception {
@@ -8075,12 +8081,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt");
                 }
 
-                @Test
-                @TestMetadata("superCallFromInterface2.kt")
-                public void testSuperCallFromInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt");
-                }
-
                 @Test
                 @TestMetadata("superPropAccess.kt")
                 public void testSuperPropAccess() throws Exception {
@@ -8093,12 +8093,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt");
                 }
 
-                @Test
-                @TestMetadata("superPropAccessFromInterface2.kt")
-                public void testSuperPropAccessFromInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt");
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility")
                 @TestDataPath("$PROJECT_ROOT")
@@ -8229,28 +8223,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     public void testNewAndOldSchemes3() throws Exception {
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt");
                     }
-
-                    @Test
-                    @TestMetadata("newSchemeWithJvmDefault.kt")
-                    public void testNewSchemeWithJvmDefault() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt");
-                    }
-                }
-
-                @Nested
-                @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls")
-                @TestDataPath("$PROJECT_ROOT")
-                public class NoDefaultImpls {
-                    @Test
-                    public void testAllFilesPresentInNoDefaultImpls() throws Exception {
-                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                    }
-
-                    @Test
-                    @TestMetadata("superPropAccessFromInterface.kt")
-                    public void testSuperPropAccessFromInterface() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls/superPropAccessFromInterface.kt");
-                    }
                 }
             }
 
@@ -11591,12 +11563,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     public void testDisable() throws Exception {
                         runTest("compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/disable.kt");
                     }
-
-                    @Test
-                    @TestMetadata("enable.kt")
-                    public void testEnable() throws Exception {
-                        runTest("compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/enable.kt");
-                    }
                 }
             }
 
@@ -24745,18 +24711,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/all-compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
                 }
 
-                @Test
-                @TestMetadata("compatibility.kt")
-                public void testCompatibility() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibility.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
-                @Test
-                @TestMetadata("compatibilityGeneric.kt")
-                public void testCompatibilityGeneric() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
                 @Test
                 @TestMetadata("default.kt")
                 public void testDefault() throws Exception {
@@ -24803,18 +24757,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/all-compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
                 }
 
-                @Test
-                @TestMetadata("compatibility.kt")
-                public void testCompatibility() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibility.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
-                @Test
-                @TestMetadata("compatibilityGeneric.kt")
-                public void testCompatibilityGeneric() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
                 @Test
                 @TestMetadata("default.kt")
                 public void testDefault() throws Exception {
@@ -25822,42 +25764,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                 runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultAllPropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
             }
 
-            @Test
-            @TestMetadata("jvmDefaultEnable.kt")
-            public void testJvmDefaultEnable() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnable.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnableGeneric.kt")
-            public void testJvmDefaultEnableGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePrimaryProperty.kt")
-            public void testJvmDefaultEnablePrimaryProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryProperty.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePrimaryPropertyGeneric.kt")
-            public void testJvmDefaultEnablePrimaryPropertyGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryPropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnableProperty.kt")
-            public void testJvmDefaultEnableProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableProperty.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePropertyGeneric.kt")
-            public void testJvmDefaultEnablePropertyGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
             @Test
             @TestMetadata("jvmDefaultGeneric.kt")
             public void testJvmDefaultGeneric() throws Exception {
@@ -30005,71 +29911,11 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
         @TestMetadata("compiler/testData/codegen/box/jvm8/defaults")
         @TestDataPath("$PROJECT_ROOT")
         public class Defaults {
-            @Test
-            @TestMetadata("26360.kt")
-            public void test26360() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/26360.kt");
-            }
-
-            @Test
-            @TestMetadata("accessor.kt")
-            public void testAccessor() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessor.kt");
-            }
-
-            @Test
-            @TestMetadata("accessorFromCompanion.kt")
-            public void testAccessorFromCompanion() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt");
-            }
-
-            @Test
-            @TestMetadata("accessorsFromDefaultImpls.kt")
-            public void testAccessorsFromDefaultImpls() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt");
-            }
-
             @Test
             public void testAllFilesPresentInDefaults() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
             }
 
-            @Test
-            @TestMetadata("bridgeInClass.kt")
-            public void testBridgeInClass() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterface.kt")
-            public void testBridgeInInterface() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterface2.kt")
-            public void testBridgeInInterface2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterfaceWithProperties.kt")
-            public void testBridgeInInterfaceWithProperties() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterfaceWithProperties2.kt")
-            public void testBridgeInInterfaceWithProperties2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeWithJava.kt")
-            public void testBridgeWithJava() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt");
-            }
-
             @Test
             @TestMetadata("builtInsInherited.kt")
             public void testBuiltInsInherited() throws Exception {
@@ -30077,135 +29923,9 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
             }
 
             @Test
-            @TestMetadata("callableReference.kt")
-            public void testCallableReference() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/callableReference.kt");
-            }
-
-            @Test
-            @TestMetadata("capturedSuperCall.kt")
-            public void testCapturedSuperCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt");
-            }
-
-            @Test
-            @TestMetadata("defaultArgs.kt")
-            public void testDefaultArgs() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt");
-            }
-
-            @Test
-            @TestMetadata("defaultArgsViaAnonymousObject.kt")
-            public void testDefaultArgsViaAnonymousObject() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/defaultArgsViaAnonymousObject.kt");
-            }
-
-            @Test
-            @TestMetadata("diamond.kt")
-            public void testDiamond() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/diamond.kt");
-            }
-
-            @Test
-            @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
-            public void testInheritedFunctionWithDefaultParameters() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inheritedFunctionWithDefaultParameters.kt");
-            }
-
-            @Test
-            @TestMetadata("inline.kt")
-            public void testInline() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inline.kt");
-            }
-
-            @Test
-            @TestMetadata("inlineProperty.kt")
-            public void testInlineProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt");
-            }
-
-            @Test
-            @TestMetadata("kt11969.kt")
-            public void testKt11969() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt11969.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243.kt")
-            public void testKt14243() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243_2.kt")
-            public void testKt14243_2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243_prop.kt")
-            public void testKt14243_prop() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt");
-            }
-
-            @Test
-            @TestMetadata("kt40920.kt")
-            public void testKt40920() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt40920.kt");
-            }
-
-            @Test
-            @TestMetadata("kt42674.kt")
-            public void testKt42674() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt42674.kt");
-            }
-
-            @Test
-            @TestMetadata("oneImplementation.kt")
-            public void testOneImplementation() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt");
-            }
-
-            @Test
-            @TestMetadata("oneImplementation2.kt")
-            public void testOneImplementation2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt");
-            }
-
-            @Test
-            @TestMetadata("privateDefaultFromDefaultImpl.kt")
-            public void testPrivateDefaultFromDefaultImpl() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt");
-            }
-
-            @Test
-            @TestMetadata("privateInDefaultImpls.kt")
-            public void testPrivateInDefaultImpls() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt");
-            }
-
-            @Test
-            @TestMetadata("simpleCall.kt")
-            public void testSimpleCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt");
-            }
-
-            @Test
-            @TestMetadata("simpleProperty.kt")
-            public void testSimpleProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt");
-            }
-
-            @Test
-            @TestMetadata("superCall.kt")
-            public void testSuperCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/superCall.kt");
-            }
-
-            @Test
-            @TestMetadata("suspendFunction.kt")
-            public void testSuspendFunction() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/suspendFunction.kt");
+            @TestMetadata("kt26360.kt")
+            public void testKt26360() throws Exception {
+                runTest("compiler/testData/codegen/box/jvm8/defaults/kt26360.kt");
             }
 
             @Nested
@@ -30307,6 +30027,18 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callStackTrace.kt");
                 }
 
+                @Test
+                @TestMetadata("callableReference.kt")
+                public void testCallableReference() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callableReference.kt");
+                }
+
+                @Test
+                @TestMetadata("capturedSuperCall.kt")
+                public void testCapturedSuperCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/capturedSuperCall.kt");
+                }
+
                 @Test
                 @TestMetadata("defaultArgs.kt")
                 public void testDefaultArgs() throws Exception {
@@ -30319,12 +30051,24 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @Test
+                @TestMetadata("deprecatedAnnotation.kt")
+                public void testDeprecatedAnnotation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedAnnotation.kt");
+                }
+
                 @Test
                 @TestMetadata("deprecatedDefaultMethod.kt")
                 public void testDeprecatedDefaultMethod() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedDefaultMethod.kt");
                 }
 
+                @Test
+                @TestMetadata("diamond.kt")
+                public void testDiamond() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/diamond.kt");
+                }
+
                 @Test
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
@@ -30343,12 +30087,30 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inheritedJvmDefault.kt");
                 }
 
+                @Test
+                @TestMetadata("inline.kt")
+                public void testInline() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inline.kt");
+                }
+
+                @Test
+                @TestMetadata("inlineProperty.kt")
+                public void testInlineProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inlineProperty.kt");
+                }
+
                 @Test
                 @TestMetadata("interfaceExtension.kt")
                 public void testInterfaceExtension() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/interfaceExtension.kt");
                 }
 
+                @Test
+                @TestMetadata("kt11969.kt")
+                public void testKt11969() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt11969.kt");
+                }
+
                 @Test
                 @TestMetadata("kt14243.kt")
                 public void testKt14243() throws Exception {
@@ -30361,6 +30123,18 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_2.kt");
                 }
 
+                @Test
+                @TestMetadata("kt14243_prop.kt")
+                public void testKt14243_prop() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_prop.kt");
+                }
+
+                @Test
+                @TestMetadata("kt40920.kt")
+                public void testKt40920() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt40920.kt");
+                }
+
                 @Test
                 @TestMetadata("kt42674.kt")
                 public void testKt42674() throws Exception {
@@ -30373,6 +30147,18 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/localDelegatedProperties.kt");
                 }
 
+                @Test
+                @TestMetadata("oneImplementation.kt")
+                public void testOneImplementation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation.kt");
+                }
+
+                @Test
+                @TestMetadata("oneImplementation2.kt")
+                public void testOneImplementation2() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation2.kt");
+                }
+
                 @Test
                 @TestMetadata("privateFunInInterface.kt")
                 public void testPrivateFunInInterface() throws Exception {
@@ -30444,112 +30230,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Compatibility {
-                @Test
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("bridge.kt")
-                public void testBridge() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt");
-                }
-
-                @Test
-                @TestMetadata("bridge2.kt")
-                public void testBridge2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt");
-                }
-
-                @Test
-                @TestMetadata("bridge3.kt")
-                public void testBridge3() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties.kt")
-                public void testBridgeWithProperties() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties2.kt")
-                public void testBridgeWithProperties2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties3.kt")
-                public void testBridgeWithProperties3() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt");
-                }
-
-                @Test
-                @TestMetadata("defaultArgs.kt")
-                public void testDefaultArgs() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt");
-                }
-
-                @Test
-                @TestMetadata("defaultArgsViaAnonymousObject.kt")
-                public void testDefaultArgsViaAnonymousObject() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgsViaAnonymousObject.kt");
-                }
-
-                @Test
-                @TestMetadata("deprecatedAnnotation.kt")
-                public void testDeprecatedAnnotation() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedAnnotation.kt");
-                }
-
-                @Test
-                @TestMetadata("deprecatedDefaultMethod.kt")
-                public void testDeprecatedDefaultMethod() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt");
-                }
-
-                @Test
-                @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
-                public void testInheritedFunctionWithDefaultParameters() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedFunctionWithDefaultParameters.kt");
-                }
-
-                @Test
-                @TestMetadata("inheritedJvmDefault.kt")
-                public void testInheritedJvmDefault() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt");
-                }
-
-                @Test
-                @TestMetadata("interfaceExtension.kt")
-                public void testInterfaceExtension() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/interfaceExtension.kt");
-                }
-
-                @Test
-                @TestMetadata("kt42674.kt")
-                public void testKt42674() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/kt42674.kt");
-                }
-
-                @Test
-                @TestMetadata("propertyAnnotation.kt")
-                public void testPropertyAnnotation() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleFunction.kt")
-                public void testSimpleFunction() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
             @TestDataPath("$PROJECT_ROOT")
@@ -30564,18 +30244,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                 public void testJavaDefaultMethod() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/javaDefaultMethod.kt");
                 }
-
-                @Test
-                @TestMetadata("simple.kt")
-                public void testSimple() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleProperty.kt")
-                public void testSimpleProperty() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt");
-                }
             }
 
             @Nested
@@ -30671,6 +30339,18 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithProperties3.kt");
                 }
 
+                @Test
+                @TestMetadata("callableReference.kt")
+                public void testCallableReference() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/callableReference.kt");
+                }
+
+                @Test
+                @TestMetadata("capturedSuperCall.kt")
+                public void testCapturedSuperCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/capturedSuperCall.kt");
+                }
+
                 @Test
                 @TestMetadata("defaultArgs.kt")
                 public void testDefaultArgs() throws Exception {
@@ -30683,6 +30363,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @Test
+                @TestMetadata("diamond.kt")
+                public void testDiamond() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/diamond.kt");
+                }
+
                 @Test
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
@@ -30701,12 +30387,30 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inheritedJvmDefault.kt");
                 }
 
+                @Test
+                @TestMetadata("inline.kt")
+                public void testInline() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inline.kt");
+                }
+
+                @Test
+                @TestMetadata("inlineProperty.kt")
+                public void testInlineProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inlineProperty.kt");
+                }
+
                 @Test
                 @TestMetadata("interfaceExtension.kt")
                 public void testInterfaceExtension() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/interfaceExtension.kt");
                 }
 
+                @Test
+                @TestMetadata("kt11969.kt")
+                public void testKt11969() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt11969.kt");
+                }
+
                 @Test
                 @TestMetadata("kt14243.kt")
                 public void testKt14243() throws Exception {
@@ -30719,6 +30423,12 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_2.kt");
                 }
 
+                @Test
+                @TestMetadata("kt14243_prop.kt")
+                public void testKt14243_prop() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_prop.kt");
+                }
+
                 @Test
                 @TestMetadata("kt40920.kt")
                 public void testKt40920() throws Exception {
@@ -30749,6 +30459,18 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/localDelegatedProperties2.kt");
                 }
 
+                @Test
+                @TestMetadata("oneImplementation.kt")
+                public void testOneImplementation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation.kt");
+                }
+
+                @Test
+                @TestMetadata("oneImplementation2.kt")
+                public void testOneImplementation2() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation2.kt");
+                }
+
                 @Test
                 @TestMetadata("privateFunInInterface.kt")
                 public void testPrivateFunInInterface() throws Exception {
@@ -30876,34 +30598,6 @@ public class FirPsiBlackBoxCodegenTestGenerated extends AbstractFirPsiBlackBoxCo
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-            @TestDataPath("$PROJECT_ROOT")
-            public class NoDelegation {
-                @Test
-                public void testAllFilesPresentInNoDelegation() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInClass.kt")
-                public void testNoDelegationToDefaultMethodInClass() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt");
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInInterface.kt")
-                public void testNoDelegationToDefaultMethodInInterface() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt");
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInInterface2.kt")
-                public void testNoDelegationToDefaultMethodInInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
             @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxModernJdkCodegenTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxModernJdkCodegenTestGenerated.java
index 4ac0e988b49..0c2269b897a 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxModernJdkCodegenTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBlackBoxModernJdkCodegenTestGenerated.java
@@ -395,9 +395,9 @@ public class FirPsiBlackBoxModernJdkCodegenTestGenerated extends AbstractFirPsiB
             }
 
             @Test
-            @TestMetadata("propertiesOverridesEnableJvmDefault.kt")
-            public void testPropertiesOverridesEnableJvmDefault() throws Exception {
-                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesEnableJvmDefault.kt");
+            @TestMetadata("propertiesOverridesAllJvmDefault.kt")
+            public void testPropertiesOverridesAllJvmDefault() throws Exception {
+                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllJvmDefault.kt");
             }
 
             @Test
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeListingTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeListingTestGenerated.java
index 5204ba6ee10..2c4d00ad2fb 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeListingTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeListingTestGenerated.java
@@ -1560,12 +1560,6 @@ public class FirPsiBytecodeListingTestGenerated extends AbstractFirPsiBytecodeLi
             public void testJvmDefaultAll() throws Exception {
                 runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultAll.kt");
             }
-
-            @Test
-            @TestMetadata("jvmDefaultEnable.kt")
-            public void testJvmDefaultEnable() throws Exception {
-                runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultEnable.kt");
-            }
         }
 
         @Nested
@@ -1917,22 +1911,6 @@ public class FirPsiBytecodeListingTestGenerated extends AbstractFirPsiBytecodeLi
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Enable {
-                @Test
-                public void testAllFilesPresentInEnable() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("interfaceProperty.kt")
-                public void testInterfaceProperty() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable/interfaceProperty.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl")
             @TestDataPath("$PROJECT_ROOT")
@@ -1947,6 +1925,12 @@ public class FirPsiBytecodeListingTestGenerated extends AbstractFirPsiBytecodeLi
                 public void testInterfaceProperty() throws Exception {
                     runTest("compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/interfaceProperty.kt");
                 }
+
+                @Test
+                @TestMetadata("privateAccessorNaming.kt")
+                public void testPrivateAccessorNaming() throws Exception {
+                    runTest("compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.kt");
+                }
             }
         }
     }
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java
index 0f002c7f3ba..ea3e140dfb9 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/codegen/FirPsiBytecodeTextTestGenerated.java
@@ -3916,12 +3916,6 @@ public class FirPsiBytecodeTextTestGenerated extends AbstractFirPsiBytecodeTextT
             runTest("compiler/testData/codegen/bytecodeText/inlineClasses/interfaceDefaultImplStubs.kt");
         }
 
-        @Test
-        @TestMetadata("interfaceJvmDefaultImplStubs.kt")
-        public void testInterfaceJvmDefaultImplStubs() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/inlineClasses/interfaceJvmDefaultImplStubs.kt");
-        }
-
         @Test
         @TestMetadata("isCheckForInlineClass.kt")
         public void testIsCheckForInlineClass() throws Exception {
@@ -4482,46 +4476,6 @@ public class FirPsiBytecodeTextTestGenerated extends AbstractFirPsiBytecodeTextT
                     runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/allCompatibility/simpleProperty.kt");
                 }
             }
-
-            @Nested
-            @TestMetadata("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Compatibility {
-                @Test
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("defaultArgs.kt")
-                public void testDefaultArgs() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleDiamond.kt")
-                public void testSimpleDiamond() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleDiamond.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleFunction.kt")
-                public void testSimpleFunction() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunction.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleFunctionWithAbstractOverride.kt")
-                public void testSimpleFunctionWithAbstractOverride() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunctionWithAbstractOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleProperty.kt")
-                public void testSimpleProperty() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt");
-                }
-            }
         }
     }
 
diff --git a/compiler/testData/cli/jvm/jvmDefaultCompatibility.args b/compiler/testData/cli/jvm/jvmDefaultCompatibility.args
deleted file mode 100644
index 140dbf76a2c..00000000000
--- a/compiler/testData/cli/jvm/jvmDefaultCompatibility.args
+++ /dev/null
@@ -1,4 +0,0 @@
-$TESTDATA_DIR$/jvmDefaultAll.kt
--d
-$TEMP_DIR$
--Xjvm-default=compatibility
diff --git a/compiler/testData/cli/jvm/jvmDefaultCompatibility.kt b/compiler/testData/cli/jvm/jvmDefaultCompatibility.kt
deleted file mode 100644
index a1684d9ee69..00000000000
--- a/compiler/testData/cli/jvm/jvmDefaultCompatibility.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-interface Foo {
-    @JvmDefault
-    fun test() {}
-}
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/jvmDefaultCompatibility.out b/compiler/testData/cli/jvm/jvmDefaultCompatibility.out
deleted file mode 100644
index c7c30c52201..00000000000
--- a/compiler/testData/cli/jvm/jvmDefaultCompatibility.out
+++ /dev/null
@@ -1,2 +0,0 @@
-warning: '-Xjvm-default=compatibility' is deprecated, please use '-Xjvm-default=all|all-compatibility'
-OK
diff --git a/compiler/testData/cli/jvm/jvmDefaultEnable.args b/compiler/testData/cli/jvm/jvmDefaultEnable.args
deleted file mode 100644
index dbfa48c8b82..00000000000
--- a/compiler/testData/cli/jvm/jvmDefaultEnable.args
+++ /dev/null
@@ -1,4 +0,0 @@
-$TESTDATA_DIR$/jvmDefaultAll.kt
--d
-$TEMP_DIR$
--Xjvm-default=enable
diff --git a/compiler/testData/cli/jvm/jvmDefaultEnable.kt b/compiler/testData/cli/jvm/jvmDefaultEnable.kt
deleted file mode 100644
index a1684d9ee69..00000000000
--- a/compiler/testData/cli/jvm/jvmDefaultEnable.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-interface Foo {
-    @JvmDefault
-    fun test() {}
-}
\ No newline at end of file
diff --git a/compiler/testData/cli/jvm/jvmDefaultEnable.out b/compiler/testData/cli/jvm/jvmDefaultEnable.out
deleted file mode 100644
index 92b35bd5b12..00000000000
--- a/compiler/testData/cli/jvm/jvmDefaultEnable.out
+++ /dev/null
@@ -1,2 +0,0 @@
-warning: '-Xjvm-default=enable' is deprecated, please use '-Xjvm-default=all|all-compatibility'
-OK
diff --git a/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt b/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt
index 11ec35ff6d6..b7e3a4441b6 100644
--- a/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt
+++ b/compiler/testData/codegen/box/builtinStubMethods/mapRemove/noDefaultImpls.kt
@@ -1,4 +1,4 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all
 // SKIP_JDK6
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
@@ -14,7 +14,6 @@ class B : A<String, String>, java.util.AbstractMap<String, String>() {
 }
 
 interface C<K, V> : MutableMap<K, V> {
-    @JvmDefault
     override fun remove(key: K, value: V) = true
 }
 
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy/simple.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy/simple.kt
index 501b144628a..b23241be449 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy/simple.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy/simple.kt
@@ -6,24 +6,11 @@
 // MODULE: lib
 // FILE: 1.kt
 interface Test {
-    @JvmDefault
-    fun test(): String {
-        return "O"
-    }
-
-    fun delegatedTest(): String {
-        return "fail"
-    }
+    fun test(): String = "Fail"
 }
 
 class Delegate : Test {
-    override fun test(): String {
-        return "Fail"
-    }
-
-    override fun delegatedTest(): String {
-        return "K"
-    }
+    override fun test(): String = "OK"
 }
 
 // MODULE: main(lib)
@@ -32,5 +19,5 @@ class TestClass(val foo: Test) : Test by foo
 
 fun box(): String {
     val testClass = TestClass(Delegate())
-    return testClass.test() + testClass.delegatedTest()
+    return testClass.test()
 }
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy/simpleProperty.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy/simpleProperty.kt
index 870f4a93583..ba28ee3c59d 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy/simpleProperty.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility/delegationBy/simpleProperty.kt
@@ -6,21 +6,11 @@
 // MODULE: lib
 // FILE: 1.kt
 interface Test {
-    @JvmDefault
-    val test: String
-        get() = "O"
-
-    val testDelegated: String
-        get() = "fail"
-
+    val test: String get() = "Fail"
 }
 
 class Delegate : Test {
-    override val test: String
-        get() = "fail"
-
-    override val testDelegated: String
-        get() = "K"
+    override val test: String get() = "OK"
 }
 
 // MODULE: main(lib)
@@ -29,5 +19,5 @@ class TestClass(val foo: Test) : Test by foo
 
 fun box(): String {
     val testClass = TestClass(Delegate())
-    return testClass.test + testClass.testDelegated
+    return testClass.test
 }
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/callStackTrace.kt
similarity index 66%
rename from compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt
rename to compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/callStackTrace.kt
index 4db2348e588..6704b308305 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/callStackTrace.kt
@@ -1,11 +1,10 @@
+// !JVM_DEFAULT_MODE: all
 // FULL_JDK
 // WITH_STDLIB
 // JVM_TARGET: 1.8
 // MODULE: lib
-// !JVM_DEFAULT_MODE: enable
 // FILE: 1.kt
 interface KInterface  {
-    @JvmDefault
     fun call(): List<String> {
         return Thread.currentThread().getStackTrace().map { it.className + "." + it.methodName }
     }
@@ -14,10 +13,9 @@ interface KInterface  {
 }
 
 // MODULE: main(lib)
-// !JVM_DEFAULT_MODE: all
 // FILE: main.kt
 interface KInterface2 : KInterface  {
-    override fun superCall() = super.superCall()
+
 }
 
 class Foo: KInterface2 {
@@ -30,10 +28,9 @@ fun box(): String {
     if (result[2] != "MainKt.box") return "fail 2: ${result[2]}"
 
     result = Foo().superCall2()
-    if (result[1] != "KInterface\$DefaultImpls.superCall") return "fail 1: ${result[1]}"
-    if (result[2] != "KInterface2.superCall") return "fail 2: ${result[2]}"
-    if (result[3] != "Foo.superCall2") return "fail 3: ${result[3]}"
-    if (result[4] != "MainKt.box") return "fail 4: ${result[4]}"
+    if (result[1] != "KInterface.superCall") return "fail 1: ${result[1]}"
+    if (result[2] != "Foo.superCall2") return "fail 2: ${result[2]}"
+    if (result[3] != "MainKt.box") return "fail 3: ${result[3]}"
 
 
     return "OK"
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls/superPropAccessFromInterface.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls/superPropAccessFromInterface.kt
deleted file mode 100644
index 586f88ce024..00000000000
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls/superPropAccessFromInterface.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// !JVM_DEFAULT_MODE: all
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// MODULE: lib
-// FILE: 1.kt
-interface Test {
-    val prop: String
-        get() =  "OK"
-}
-
-// MODULE: main(lib)
-// FILE: 2.kt
-interface Test2 : Test {
-    override val prop: String
-        get() = super.prop
-}
-
-fun box(): String {
-    return object : Test2 {}.prop
-}
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt
index 573be7ec62f..29f8f91f079 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCall.kt
@@ -1,10 +1,9 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 // MODULE: lib
 // FILE: 1.kt
 interface Test {
-    @JvmDefault
     fun test(): String {
         return "OK"
     }
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt
index 518768681ec..bb0c041d8ed 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt
@@ -1,10 +1,9 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 // MODULE: lib
 // FILE: 1.kt
 interface Test {
-    @JvmDefault
     fun test(): String {
         return "OK"
     }
@@ -14,7 +13,6 @@ interface Test {
 // FILE: 2.kt
 
 interface Test2 : Test {
-    @JvmDefault
     override fun test(): String {
         return super.test()
     }
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt
deleted file mode 100644
index e19fba2f2ca..00000000000
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// MODULE: lib
-// FILE: 1.kt
-interface Test {
-    @JvmDefault
-    fun test(): String {
-        return "OK"
-    }
-
-    fun defaultImplTrigger(): String {
-        return "OK"
-    }
-}
-
-// MODULE: main(lib)
-// FILE: 2.kt
-
-interface Test2 : Test {
-    @JvmDefault
-    override fun test(): String {
-        return super.test()
-    }
-}
-
-fun box(): String {
-    return object : Test2 {}.test()
-}
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt
index 28a4af4a79a..160ab2738fd 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccess.kt
@@ -1,10 +1,9 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 // MODULE: lib
 // FILE: 1.kt
 interface Test {
-    @JvmDefault
     val prop: String
         get() =  "OK"
 }
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt
index 60d09fd0a58..586f88ce024 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt
@@ -1,10 +1,9 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 // MODULE: lib
 // FILE: 1.kt
 interface Test {
-    @JvmDefault
     val prop: String
         get() =  "OK"
 }
@@ -12,7 +11,6 @@ interface Test {
 // MODULE: main(lib)
 // FILE: 2.kt
 interface Test2 : Test {
-    @JvmDefault
     override val prop: String
         get() = super.prop
 }
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt
deleted file mode 100644
index 05801adfd4e..00000000000
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// MODULE: lib
-// FILE: 1.kt
-interface Test {
-    @JvmDefault
-    val prop: String
-        get() =  "OK"
-
-    val defaultImplTrigger: String
-        get() =  "OK"
-}
-
-// MODULE: main(lib)
-// FILE: 2.kt
-interface Test2 : Test {
-    @JvmDefault
-    override val prop: String
-        get() = super.prop
-}
-
-fun box(): String {
-    return object : Test2 {}.prop
-}
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond.kt
index e3eaf7a3ced..3e728b9bd4c 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond.kt
@@ -1,5 +1,5 @@
-// !JVM_DEFAULT_MODE: enable
 // MODULE: lib
+// !JVM_DEFAULT_MODE: disable
 // FILE: 1.kt
 interface Test {
     fun test(): String {
@@ -8,11 +8,11 @@ interface Test {
 }
 
 // MODULE: main(lib)
+// !JVM_DEFAULT_MODE: all
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 // FILE: 2.kt
 interface Test2 : Test {
-    @JvmDefault
     override fun test(): String {
         return super.test()
     }
@@ -24,7 +24,6 @@ interface Test3 : Test {
 
 
 interface Test4 : Test2, Test3 {
-    @JvmDefault
     override fun test(): String {
         return super.test()
     }
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond2.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond2.kt
index 027f0a91979..f92f7278405 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond2.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond2.kt
@@ -1,5 +1,5 @@
-// !JVM_DEFAULT_MODE: enable
 // MODULE: lib
+// !JVM_DEFAULT_MODE: disable
 // FILE: 1.kt
 interface Test {
     fun test(): String {
@@ -8,6 +8,7 @@ interface Test {
 }
 
 // MODULE: main(lib)
+// !JVM_DEFAULT_MODE: all
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 // FILE: 2.kt
@@ -18,7 +19,6 @@ open class TestClass : Test {
 }
 
 interface Test2 : Test {
-    @JvmDefault
     override fun test(): String
 }
 
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond3.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond3.kt
index 7bd244202d1..bb2a6fe2af4 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond3.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/delegation/diamond3.kt
@@ -1,5 +1,5 @@
-// !JVM_DEFAULT_MODE: enable
 // MODULE: lib
+// !JVM_DEFAULT_MODE: disable
 // FILE: 1.kt
 interface Test {
     fun test(): String {
@@ -8,6 +8,7 @@ interface Test {
 }
 
 // MODULE: main(lib)
+// !JVM_DEFAULT_MODE: all
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 // FILE: 2.kt
@@ -16,7 +17,6 @@ abstract class TestClass : Test {
 }
 
 interface Test2 : Test {
-    @JvmDefault
     override fun test(): String {
         return "OK"
     }
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithBigHierarchy.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithBigHierarchy.kt
index 612b2717610..b5c1eba810c 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithBigHierarchy.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithBigHierarchy.kt
@@ -1,5 +1,5 @@
-// !JVM_DEFAULT_MODE: enable
 // MODULE: lib
+// !JVM_DEFAULT_MODE: disable
 // FILE: 1.kt
 interface Test {
     fun test(): String {
@@ -8,11 +8,11 @@ interface Test {
 }
 
 // MODULE: main(lib)
+// !JVM_DEFAULT_MODE: all
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 // FILE: 2.kt
 interface Test2 : Test {
-    @JvmDefault
     override fun test(): String {
         return super.test()
     }
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithHierarchy.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithHierarchy.kt
index 2aed4128d55..7eaf34ad9ca 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithHierarchy.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simpleCallWithHierarchy.kt
@@ -1,5 +1,5 @@
-// !JVM_DEFAULT_MODE: enable
 // MODULE: lib
+// !JVM_DEFAULT_MODE: disable
 // FILE: 1.kt
 
 interface Test {
@@ -9,11 +9,11 @@ interface Test {
 }
 
 // MODULE: main(lib)
+// !JVM_DEFAULT_MODE: all
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 // FILE: 2.kt
 interface Test2 : Test {
-    @JvmDefault
     override fun test(): String {
         return super.test()
     }
diff --git a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simplePropWithHierarchy.kt b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simplePropWithHierarchy.kt
index d6eca2d91bf..c70e991cfca 100644
--- a/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simplePropWithHierarchy.kt
+++ b/compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/jvm8against6/simplePropWithHierarchy.kt
@@ -1,5 +1,5 @@
-// !JVM_DEFAULT_MODE: enable
 // MODULE: lib
+// !JVM_DEFAULT_MODE: disable
 // FILE: 1.kt
 
 interface Test {
@@ -8,11 +8,11 @@ interface Test {
 }
 
 // MODULE: main(lib)
+// !JVM_DEFAULT_MODE: all
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 // FILE: 2.kt
 interface Test2 : Test {
-    @JvmDefault
     override val test: String
         get() = super.test
 }
diff --git a/compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/enable.kt b/compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/enable.kt
deleted file mode 100644
index ea790d3dcae..00000000000
--- a/compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/enable.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-// WITH_STDLIB
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-
-import kotlin.coroutines.*
-
-class A : BlockingDoubleChain
-
-interface BlockingDoubleChain : BlockingBufferChain
-
-interface BlockingBufferChain {
-    suspend fun nextBuffer(): String = "OK"
-}
-
-fun builder(c: suspend () -> Unit) {
-    c.startCoroutine(Continuation(EmptyCoroutineContext) {
-        it.getOrThrow()
-    })
-}
-
-fun box(): String {
-    var res = "FAIL"
-    builder {
-        res = A().nextBuffer()
-    }
-    return res
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibility.kt b/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibility.kt
deleted file mode 100644
index 1245f19e6b4..00000000000
--- a/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibility.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-// WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
-// LANGUAGE: +ValueClasses
-
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM
-// JVM_TARGET: 1.8
-
-interface Path {
-    fun dispatch(s: String = "K") = "dispatch$s"
-    fun Int.extension(s: String = "K") = "${this}extension$s"
-}
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class RealPath(val x: Int) : Path
-
-fun box(): String {
-    val rp = RealPath(1)
-    val res = "${rp.dispatch()};${rp.dispatch("KK")};" +
-            with(rp) {
-                "${1.extension()};${2.extension("KK")}"
-            }
-    if (res != "dispatchK;dispatchKK;1extensionK;2extensionKK") return res
-    return "OK"
-}
diff --git a/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibilityGeneric.kt b/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibilityGeneric.kt
deleted file mode 100644
index 3083a0a4b57..00000000000
--- a/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibilityGeneric.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-// WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
-// LANGUAGE: +ValueClasses, +GenericInlineClassParameter
-
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM
-// JVM_TARGET: 1.8
-
-interface Path {
-    fun dispatch(s: String = "K") = "dispatch$s"
-    fun Int.extension(s: String = "K") = "${this}extension$s"
-}
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class RealPath<T: Int>(val x: T) : Path
-
-fun box(): String {
-    val rp = RealPath(1)
-    val res = "${rp.dispatch()};${rp.dispatch("KK")};" +
-            with(rp) {
-                "${1.extension()};${2.extension("KK")}"
-            }
-    if (res != "dispatchK;dispatchKK;1extensionK;2extensionKK") return res
-    return "OK"
-}
diff --git a/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibility.kt b/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibility.kt
deleted file mode 100644
index e86b324afbe..00000000000
--- a/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibility.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-// WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
-// LANGUAGE: +ValueClasses
-
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM
-// JVM_TARGET: 1.8
-
-interface Path {
-    fun dispatch(maxDepth: Int = 42)
-    fun Int.extension(maxDepth: Int = 42)
-}
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class RealPath(val x: Int) : Path {
-    override fun dispatch(maxDepth: Int) = Unit
-
-    fun childrenDispatch(recursively: Boolean): Unit =
-        if (recursively) dispatch() else dispatch()
-
-    override fun Int.extension(maxDepth: Int) = Unit
-
-    fun Int.childrenExtension(recursively: Boolean): Unit =
-        if (recursively) extension() else extension()
-}
-
-fun box(): String {
-    RealPath(1)
-    return "OK"
-}
diff --git a/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibilityGeneric.kt b/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibilityGeneric.kt
deleted file mode 100644
index 34f6733a997..00000000000
--- a/compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibilityGeneric.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-// WITH_STDLIB
-// WORKS_WHEN_VALUE_CLASS
-// LANGUAGE: +ValueClasses, +GenericInlineClassParameter
-
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// IGNORE_BACKEND: JVM
-// JVM_TARGET: 1.8
-
-interface Path {
-    fun dispatch(maxDepth: Int = 42)
-    fun Int.extension(maxDepth: Int = 42)
-}
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class RealPath<T: Int>(val x: T) : Path {
-    override fun dispatch(maxDepth: Int) = Unit
-
-    fun childrenDispatch(recursively: Boolean): Unit =
-        if (recursively) dispatch() else dispatch()
-
-    override fun Int.extension(maxDepth: Int) = Unit
-
-    fun Int.childrenExtension(recursively: Boolean): Unit =
-        if (recursively) extension() else extension()
-}
-
-fun box(): String {
-    RealPath(1)
-    return "OK"
-}
diff --git a/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnable.kt b/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnable.kt
deleted file mode 100644
index 0ad7a353be8..00000000000
--- a/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnable.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// WITH_STDLIB
-// JVM_TARGET: 1.8
-// WORKS_WHEN_VALUE_CLASS
-// LANGUAGE: +ValueClasses
-
-// FILE: jvmDefaultEnable.kt
-
-interface IFooBar {
-    @JvmDefault fun foo() = "O"
-    @JvmDefault fun bar() = "Failed"
-}
-
-interface IFooBar2 : IFooBar
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class Test1(val k: String): IFooBar {
-    override fun bar(): String = k
-}
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class Test2(val k: String): IFooBar2 {
-    override fun bar(): String = k
-}
-
-fun box(): String {
-    val k = Test1("K")
-    val ik: IFooBar = k
-    val k2 = Test2("K")
-    val ik2: IFooBar = k2
-    val ik3: IFooBar2 = k2
-
-    val test1 = k.foo() + k.bar()
-    if (test1 != "OK") throw AssertionError("test1: $test1")
-
-    val test2 = ik.foo() + ik.bar()
-    if (test2 != "OK") throw AssertionError("test2: $test2")
-
-    val test3 = k2.foo() + k2.bar()
-    if (test3 != "OK") throw AssertionError("test3: $test3")
-
-    val test4 = ik2.foo() + ik2.bar()
-    if (test4 != "OK") throw AssertionError("test4: $test4")
-
-    val test5 = ik3.foo() + ik3.bar()
-    if (test5 != "OK") throw AssertionError("test5: $test5")
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableGeneric.kt b/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableGeneric.kt
deleted file mode 100644
index 25301cfae3a..00000000000
--- a/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableGeneric.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// WITH_STDLIB
-// JVM_TARGET: 1.8
-// WORKS_WHEN_VALUE_CLASS
-// LANGUAGE: +ValueClasses, +GenericInlineClassParameter
-
-// FILE: jvmDefaultEnable.kt
-
-interface IFooBar {
-    @JvmDefault fun foo() = "O"
-    @JvmDefault fun bar() = "Failed"
-}
-
-interface IFooBar2 : IFooBar
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class Test1<T: String>(val k: T): IFooBar {
-    override fun bar(): String = k
-}
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class Test2<T: String>(val k: T): IFooBar2 {
-    override fun bar(): String = k
-}
-
-fun box(): String {
-    val k = Test1("K")
-    val ik: IFooBar = k
-    val k2 = Test2("K")
-    val ik2: IFooBar = k2
-    val ik3: IFooBar2 = k2
-
-    val test1 = k.foo() + k.bar()
-    if (test1 != "OK") throw AssertionError("test1: $test1")
-
-    val test2 = ik.foo() + ik.bar()
-    if (test2 != "OK") throw AssertionError("test2: $test2")
-
-    val test3 = k2.foo() + k2.bar()
-    if (test3 != "OK") throw AssertionError("test3: $test3")
-
-    val test4 = ik2.foo() + ik2.bar()
-    if (test4 != "OK") throw AssertionError("test4: $test4")
-
-    val test5 = ik3.foo() + ik3.bar()
-    if (test5 != "OK") throw AssertionError("test5: $test5")
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryProperty.kt b/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryProperty.kt
deleted file mode 100644
index 20343d5800e..00000000000
--- a/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryProperty.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// WITH_STDLIB
-// JVM_TARGET: 1.8
-// WORKS_WHEN_VALUE_CLASS
-// LANGUAGE: +ValueClasses
-
-// FILE: jvmDefaultEnable.kt
-
-interface IFooBar {
-    @JvmDefault val foo get() = "O"
-    @JvmDefault val bar get() = "Failed"
-}
-
-interface IFooBar2 : IFooBar
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class Test1(override val bar: String): IFooBar
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class Test2(override val bar: String): IFooBar2
-
-fun box(): String {
-    val k = Test1("K")
-    val ik: IFooBar = k
-    val k2 = Test2("K")
-    val ik2: IFooBar = k2
-    val ik3: IFooBar2 = k2
-
-    val test1 = k.foo + k.bar
-    if (test1 != "OK") throw AssertionError("test1: $test1")
-
-    val test2 = ik.foo + ik.bar
-    if (test2 != "OK") throw AssertionError("test2: $test2")
-
-    val test3 = k2.foo + k2.bar
-    if (test3 != "OK") throw AssertionError("test3: $test3")
-
-    val test4 = ik2.foo + ik2.bar
-    if (test4 != "OK") throw AssertionError("test4: $test4")
-
-    val test5 = ik3.foo + ik3.bar
-    if (test5 != "OK") throw AssertionError("test5: $test5")
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryPropertyGeneric.kt b/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryPropertyGeneric.kt
deleted file mode 100644
index 867ebb6f9b0..00000000000
--- a/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryPropertyGeneric.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// WITH_STDLIB
-// JVM_TARGET: 1.8
-// WORKS_WHEN_VALUE_CLASS
-// LANGUAGE: +ValueClasses, +GenericInlineClassParameter
-
-// FILE: jvmDefaultEnable.kt
-
-interface IFooBar {
-    @JvmDefault val foo get() = "O"
-    @JvmDefault val bar get() = "Failed"
-}
-
-interface IFooBar2 : IFooBar
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class Test1<T: String>(override val bar: T): IFooBar
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class Test2<T: String>(override val bar: T): IFooBar2
-
-fun box(): String {
-    val k = Test1("K")
-    val ik: IFooBar = k
-    val k2 = Test2("K")
-    val ik2: IFooBar = k2
-    val ik3: IFooBar2 = k2
-
-    val test1 = k.foo + k.bar
-    if (test1 != "OK") throw AssertionError("test1: $test1")
-
-    val test2 = ik.foo + ik.bar
-    if (test2 != "OK") throw AssertionError("test2: $test2")
-
-    val test3 = k2.foo + k2.bar
-    if (test3 != "OK") throw AssertionError("test3: $test3")
-
-    val test4 = ik2.foo + ik2.bar
-    if (test4 != "OK") throw AssertionError("test4: $test4")
-
-    val test5 = ik3.foo + ik3.bar
-    if (test5 != "OK") throw AssertionError("test5: $test5")
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableProperty.kt b/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableProperty.kt
deleted file mode 100644
index 685768454f8..00000000000
--- a/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableProperty.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// WITH_STDLIB
-// JVM_TARGET: 1.8
-// WORKS_WHEN_VALUE_CLASS
-// LANGUAGE: +ValueClasses
-
-// FILE: jvmDefaultEnable.kt
-
-interface IFooBar {
-    @JvmDefault val foo get() = "O"
-    @JvmDefault val bar get() = "Failed"
-}
-
-interface IFooBar2 : IFooBar
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class Test1(val k: String): IFooBar {
-    override val bar: String
-        get() = k
-}
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class Test2(val k: String): IFooBar2 {
-    override val bar: String
-        get() = k
-}
-
-fun box(): String {
-    val k = Test1("K")
-    val ik: IFooBar = k
-    val k2 = Test2("K")
-    val ik2: IFooBar = k2
-    val ik3: IFooBar2 = k2
-
-    val test1 = k.foo + k.bar
-    if (test1 != "OK") throw AssertionError("test1: $test1")
-
-    val test2 = ik.foo + ik.bar
-    if (test2 != "OK") throw AssertionError("test2: $test2")
-
-    val test3 = k2.foo + k2.bar
-    if (test3 != "OK") throw AssertionError("test3: $test3")
-
-    val test4 = ik2.foo + ik2.bar
-    if (test4 != "OK") throw AssertionError("test4: $test4")
-
-    val test5 = ik3.foo + ik3.bar
-    if (test5 != "OK") throw AssertionError("test5: $test5")
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePropertyGeneric.kt b/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePropertyGeneric.kt
deleted file mode 100644
index 252ac77e91a..00000000000
--- a/compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePropertyGeneric.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// WITH_STDLIB
-// JVM_TARGET: 1.8
-// WORKS_WHEN_VALUE_CLASS
-// LANGUAGE: +ValueClasses, +GenericInlineClassParameter
-
-// FILE: jvmDefaultEnable.kt
-
-interface IFooBar {
-    @JvmDefault val foo get() = "O"
-    @JvmDefault val bar get() = "Failed"
-}
-
-interface IFooBar2 : IFooBar
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class Test1<T: String>(val k: T): IFooBar {
-    override val bar: String
-        get() = k
-}
-
-OPTIONAL_JVM_INLINE_ANNOTATION
-value class Test2<T: String>(val k: T): IFooBar2 {
-    override val bar: String
-        get() = k
-}
-
-fun box(): String {
-    val k = Test1("K")
-    val ik: IFooBar = k
-    val k2 = Test2("K")
-    val ik2: IFooBar = k2
-    val ik3: IFooBar2 = k2
-
-    val test1 = k.foo + k.bar
-    if (test1 != "OK") throw AssertionError("test1: $test1")
-
-    val test2 = ik.foo + ik.bar
-    if (test2 != "OK") throw AssertionError("test2: $test2")
-
-    val test3 = k2.foo + k2.bar
-    if (test3 != "OK") throw AssertionError("test3: $test3")
-
-    val test4 = ik2.foo + ik2.bar
-    if (test4 != "OK") throw AssertionError("test4: $test4")
-
-    val test5 = ik3.foo + ik3.bar
-    if (test5 != "OK") throw AssertionError("test5: $test5")
-
-    return "OK"
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/jvm8/defaults/accessor.kt b/compiler/testData/codegen/box/jvm8/defaults/accessor.kt
deleted file mode 100644
index 45d0a7859ed..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/accessor.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-var storage = "fail"
-
-interface Test {
-
-    @JvmDefault
-    private var foo: String
-        get() = storage
-        set(value) {
-            storage = value
-        }
-
-    @JvmDefault
-    private fun bar(): String {
-        return "K"
-    }
-
-    @JvmDefault
-    fun call(): String {
-        return {
-            foo = "O"
-            foo + bar()
-        }.let { it() }
-    }
-}
-
-class TestClass : Test {
-
-}
-
-fun box(): String {
-    return TestClass().call()
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt b/compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt
deleted file mode 100644
index fc7b42a593a..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Test {
-    @JvmDefault
-    private val foo: String
-        get() = "O"
-
-    @JvmDefault
-    private fun bar(): String {
-        return "K"
-    }
-
-    companion object {
-        fun call(test: Test): String {
-            return test.foo + test.bar()
-        }
-    }
-}
-
-class TestClass : Test
-
-fun box(): String {
-    return Test.call(TestClass())
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt b/compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt
deleted file mode 100644
index 0e981766f30..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Test {
-    @JvmDefault
-    private val foo: String
-        get() = "O"
-
-    @JvmDefault
-    private fun bar(): String {
-        return "K"
-    }
-
-    fun call(): String {
-        return { foo + bar() }.let { it() }
-    }
-}
-
-class TestClass : Test {
-
-}
-
-fun box(): String {
-    return TestClass().call()
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/callableReference.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callableReference.kt
similarity index 80%
rename from compiler/testData/codegen/box/jvm8/defaults/callableReference.kt
rename to compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callableReference.kt
index 09dd3df9686..c54c1f01195 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/callableReference.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callableReference.kt
@@ -1,13 +1,10 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all-compatibility
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
-// WITH_STDLIB
 
 interface Test {
-    @JvmDefault
     fun foo(): String = "O"
 
-    @JvmDefault
     val bar: String
         get() = "K"
 
diff --git a/compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/capturedSuperCall.kt
similarity index 88%
rename from compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt
rename to compiler/testData/codegen/box/jvm8/defaults/allCompatibility/capturedSuperCall.kt
index ba9b85a90ad..a3c707e9f87 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/capturedSuperCall.kt
@@ -1,10 +1,9 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all-compatibility
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 
 interface IBase {
-    @JvmDefault
     fun bar() = "OK"
 }
 
diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/delegationBy/simple.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/delegationBy/simple.kt
index e314dece6ae..7d1d380e7d1 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/delegationBy/simple.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/delegationBy/simple.kt
@@ -4,29 +4,16 @@
 // WITH_STDLIB
 
 interface Test {
-    @JvmDefault
-    fun test(): String {
-        return "O"
-    }
-
-    fun delegatedTest(): String {
-        return "fail"
-    }
+    fun test(): String = "Fail"
 }
 
 class Delegate : Test {
-    override fun test(): String {
-        return "Fail"
-    }
-
-    override fun delegatedTest(): String {
-        return "K"
-    }
+    override fun test(): String = "OK"
 }
 
 class TestClass(val foo: Test) : Test by foo
 
 fun box(): String {
     val testClass = TestClass(Delegate())
-    return testClass.test() + testClass.delegatedTest()
+    return testClass.test()
 }
diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/delegationBy/simpleProperty.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/delegationBy/simpleProperty.kt
index 31bcb780765..40dd5570958 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/delegationBy/simpleProperty.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/delegationBy/simpleProperty.kt
@@ -4,26 +4,16 @@
 // WITH_STDLIB
 
 interface Test {
-    @JvmDefault
-    val test: String
-        get() = "O"
-
-    val testDelegated: String
-        get() = "fail"
-
+    val test: String get() = "Fail"
 }
 
 class Delegate : Test {
-    override val test: String
-        get() = "fail"
-
-    override val testDelegated: String
-        get() = "K"
+    override val test: String get() = "OK"
 }
 
 class TestClass(val foo: Test) : Test by foo
 
 fun box(): String {
     val testClass = TestClass(Delegate())
-    return testClass.test + testClass.testDelegated
+    return testClass.test
 }
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedAnnotation.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedAnnotation.kt
similarity index 91%
rename from compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedAnnotation.kt
rename to compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedAnnotation.kt
index 5f7dd77a81b..a8605479dc2 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedAnnotation.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedAnnotation.kt
@@ -1,11 +1,10 @@
-// !JVM_DEFAULT_MODE: compatibility
+// !JVM_DEFAULT_MODE: all-compatibility
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // FULL_JDK
 // WITH_STDLIB
 
 interface IFoo {
-    @JvmDefault
     fun foo() {}
 }
 
diff --git a/compiler/testData/codegen/box/jvm8/defaults/diamond.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/diamond.kt
similarity index 93%
rename from compiler/testData/codegen/box/jvm8/defaults/diamond.kt
rename to compiler/testData/codegen/box/jvm8/defaults/allCompatibility/diamond.kt
index 2b1cb0b3082..50c08e59e74 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/diamond.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/diamond.kt
@@ -1,4 +1,4 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all-compatibility
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND: ANDROID
 // JVM_TARGET: 1.8
@@ -6,7 +6,6 @@
 // FULL_JDK
 
 interface Test {
-    @JvmDefault
     fun test(): String {
         return "Test"
     }
@@ -18,7 +17,6 @@ open class TestClass : Test {
 
 
 interface Test2 : Test {
-    @JvmDefault
     override fun test(): String {
         return "Test2"
     }
diff --git a/compiler/testData/codegen/box/jvm8/defaults/inline.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inline.kt
similarity index 52%
rename from compiler/testData/codegen/box/jvm8/defaults/inline.kt
rename to compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inline.kt
index 8dfaae056ab..8648e493d74 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/inline.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inline.kt
@@ -1,21 +1,15 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all-compatibility
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_STDLIB
+// IGNORE_INLINER: IR
 
 interface Test {
-    @JvmDefault
     fun test(): String {
-        return inlineFun { "O" }
+        return inlineFun { "OK" }
     }
 
-    fun testDefaultImpls(): String {
-        return inlineFun { "K" }
-    }
-
-    @JvmDefault
     private inline fun inlineFun(s: () -> String) = s()
-
 }
 
 class TestClass : Test {
@@ -24,5 +18,5 @@ class TestClass : Test {
 
 fun box(): String {
     val foo = TestClass()
-    return foo.test() + foo.testDefaultImpls()
+    return foo.test()
 }
diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inlineProperty.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inlineProperty.kt
new file mode 100644
index 00000000000..cbb70308e54
--- /dev/null
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inlineProperty.kt
@@ -0,0 +1,22 @@
+// !JVM_DEFAULT_MODE: all-compatibility
+// TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
+// WITH_STDLIB
+// IGNORE_INLINER: IR
+
+interface Test {
+    fun test(): String {
+        return inlineProp
+    }
+
+    private inline val inlineProp: String
+        get() = "OK"
+
+}
+
+class TestClass : Test {
+
+}
+
+fun box(): String =
+    TestClass().test()
diff --git a/compiler/testData/codegen/box/jvm8/defaults/kt11969.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt11969.kt
similarity index 94%
rename from compiler/testData/codegen/box/jvm8/defaults/kt11969.kt
rename to compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt11969.kt
index beb4df58d87..66cf7694bb9 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/kt11969.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt11969.kt
@@ -1,24 +1,18 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all-compatibility
 // TARGET_BACKEND: JVM
 // IGNORE_BACKEND: ANDROID
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 
 interface Z {
-
-    @JvmDefault
     private fun privateFun() = { "OK" }
 
-    @JvmDefault
     fun callPrivateFun() = privateFun()
 
-    @JvmDefault
     fun publicFun() = { "OK" }
 
-    @JvmDefault
     fun funWithDefaultArgs(s: () -> Unit = {}): () -> Unit
 
-    @JvmDefault
     val property: () -> Unit
         get() = {}
 
diff --git a/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_prop.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_prop.kt
new file mode 100644
index 00000000000..c227d8c7667
--- /dev/null
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_prop.kt
@@ -0,0 +1,27 @@
+// !JVM_DEFAULT_MODE: all-compatibility
+// TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
+// WITH_STDLIB
+
+interface Z<T> {
+    val value: T
+
+    val z: T
+        get() = value
+}
+
+@JvmDefaultWithoutCompatibility
+open class ZImpl : Z<String> {
+    override val value: String
+        get() = "OK"
+}
+
+open class ZImpl2 : ZImpl() {
+    override val z: String
+        get() = super.z
+}
+
+
+fun box(): String {
+    return ZImpl2().value
+}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/kt40920.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt40920.kt
similarity index 89%
rename from compiler/testData/codegen/box/jvm8/defaults/kt40920.kt
rename to compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt40920.kt
index baccd36b9d5..a0bd06d7d64 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/kt40920.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt40920.kt
@@ -1,4 +1,4 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all-compatibility
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_STDLIB
@@ -13,7 +13,6 @@ public interface JBase extends Base {
 // FILE: main.kt
 
 interface Base {
-    @JvmDefault
     fun test(): String = "Base"
 }
 
diff --git a/compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation.kt
similarity index 89%
rename from compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt
rename to compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation.kt
index 3649d347e74..4782341f7a0 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation.kt
@@ -1,15 +1,13 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all-compatibility
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 
 interface KCallable {
-    @JvmDefault
     val returnType: String
 }
 
 interface KCallableImpl : KCallable {
-    @JvmDefault
     override val returnType: String
         get() = "OK"
 }
diff --git a/compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation2.kt
similarity index 92%
rename from compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt
rename to compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation2.kt
index 49412f1af3f..99f85227b60 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation2.kt
@@ -1,15 +1,13 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all-compatibility
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 
 interface KCallable {
-    @JvmDefault
     val returnType: String
 }
 
 interface KCallableImpl : KCallable {
-    @JvmDefault
     override val returnType: String
         get() = "OK"
 }
diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt
deleted file mode 100644
index 1dcad627332..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Test<T> {
-    @JvmDefault
-    fun test(p: T): T {
-        return p
-    }
-}
-
-class TestClass : Test<String> {
-    override fun test(p: String): String {
-        return p + "K"
-    }
-}
-
-fun <T> execute(t: Test<T>, p: T): T {
-    return t.test(p)
-}
-
-fun box(): String {
-    return execute(TestClass(), "O")
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt
deleted file mode 100644
index 9ffbf1ebd4a..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Test<T> {
-    @JvmDefault
-    fun test(p: T): T {
-        return p
-    }
-}
-
-interface Test2: Test<String> {
-    @JvmDefault
-    override fun test(p: String): String {
-        return p + "K"
-    }
-}
-
-class TestClass : Test2 {
-}
-
-fun <T> execute(t: Test<T>, p: T): T {
-    return t.test(p)
-}
-
-fun box(): String {
-    return execute(TestClass(), "O")
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt
deleted file mode 100644
index 8ca1fbb665c..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// IGNORE_BACKEND: ANDROID
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FULL_JDK
-
-interface Test<T> {
-    @JvmDefault
-    fun test(p: T): T {
-        return null!!
-    }
-
-    fun foo(p: T): T {
-        return null!!
-    }
-}
-
-interface Test2: Test<String> {
-    @JvmDefault
-    override fun test(p: String): String {
-        return p
-    }
-
-    override fun foo(p: String): String {
-        return p
-    }
-}
-
-class TestClass : Test2
-
-fun box(): String {
-    checkNoMethod(Test2::class.java, "foo", Any::class.java)
-    checkMethodExists(Test2::class.java, "test", Any::class.java)
-
-    checkNoMethod(TestClass::class.java, "test", Any::class.java)
-    checkMethodExists(TestClass::class.java, "foo", String::class.java)
-    checkMethodExists(TestClass::class.java, "foo", Any::class.java)
-
-
-    val test2DefaultImpls = java.lang.Class.forName("Test2\$DefaultImpls")
-    checkNoMethod(test2DefaultImpls, "test", Any::class.java)
-    checkNoMethod(test2DefaultImpls, "test", String::class.java)
-    checkMethodExists(test2DefaultImpls, "foo", Test2::class.java, String::class.java)
-
-    return "OK"
-}
-
-fun checkNoMethod(clazz: Class<*>, name: String, vararg parameterTypes: Class<*>) {
-    try {
-        clazz.getDeclaredMethod(name, *parameterTypes)
-    }
-    catch (e: NoSuchMethodException) {
-        return
-    }
-    throw AssertionError("fail: method $name was found in " + clazz)
-}
-
-fun checkMethodExists(clazz: Class<*>, name: String, vararg parameterTypes: Class<*>) {
-    try {
-        clazz.getDeclaredMethod(name, *parameterTypes)
-        return
-    }
-    catch (e: NoSuchMethodException) {
-        throw AssertionError("fail: method $name was not found in " + clazz, e)
-    }
-
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt
deleted file mode 100644
index 816a8159c73..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Test<T> {
-    @JvmDefault
-    var test: T
-        get() = null!!
-        set(value) {
-            null!!
-        }
-}
-var result = "fail"
-
-interface Test2 : Test<String> {
-    @JvmDefault
-    override var test: String
-        get() = result
-        set(value) {
-            result = value
-        }
-}
-
-class TestClass : Test2
-
-fun <T> execute(t: Test<T>, p: T): T {
-    t.test = p
-    return t.test
-}
-
-fun box(): String {
-    return execute(TestClass(), "OK")
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt
deleted file mode 100644
index c1e84e15709..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt
+++ /dev/null
@@ -1,82 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// IGNORE_BACKEND: ANDROID
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FULL_JDK
-
-interface Test<T> {
-    @JvmDefault
-    var T.test: T
-        get() = null!!
-        set(value) {
-            null!!
-        }
-
-    var T.foo: T
-        get() = null!!
-        set(value) {
-            null!!
-        }
-}
-
-interface Test2 : Test<String> {
-    @JvmDefault
-    override var String.test: String
-        get() = ""
-        set(value) {}
-
-    override var String.foo: String
-        get() = ""
-        set(value) {}
-}
-
-class TestClass : Test2
-
-fun box(): String {
-    checkMethodExists(Test2::class.java, "getTest", String::class.java)
-    checkMethodExists(Test2::class.java, "getTest", Any::class.java)
-    checkMethodExists(Test2::class.java, "setTest", Any::class.java, Any::class.java)
-    checkMethodExists(Test2::class.java, "setTest", String::class.java, String::class.java)
-
-    checkNoMethod(Test2::class.java, "setFoo", Any::class.java, Any::class.java)
-
-    checkNoMethod(TestClass::class.java, "getTest", String::class.java)
-    checkNoMethod(TestClass::class.java, "getTest", Any::class.java)
-    checkNoMethod(TestClass::class.java, "setTest", Any::class.java, Any::class.java)
-    checkNoMethod(TestClass::class.java, "setTest", String::class.java, String::class.java)
-
-    checkMethodExists(TestClass::class.java, "getFoo", String::class.java)
-    checkMethodExists(TestClass::class.java, "getFoo", Any::class.java)
-    checkMethodExists(TestClass::class.java, "setFoo", Any::class.java, Any::class.java)
-    checkMethodExists(TestClass::class.java, "setFoo", String::class.java, String::class.java)
-
-    val test2DefaultImpls = java.lang.Class.forName("Test2\$DefaultImpls")
-    checkNoMethod(test2DefaultImpls, "getTest", Test2::class.java, String::class.java)
-    checkNoMethod(test2DefaultImpls, "getTest", Test2::class.java, Any::class.java)
-    checkNoMethod(test2DefaultImpls, "setTest", Test2::class.java, Any::class.java, Any::class.java)
-    checkNoMethod(test2DefaultImpls, "setTest", Test2::class.java, String::class.java, String::class.java)
-
-    return "OK"
-}
-
-fun checkNoMethod(clazz: Class<*>, name: String, vararg parameterTypes: Class<*>) {
-    try {
-        clazz.getDeclaredMethod(name, *parameterTypes)
-    }
-    catch (e: NoSuchMethodException) {
-        return
-    }
-    throw AssertionError("fail: method $name was found in " + clazz)
-}
-
-fun checkMethodExists(clazz: Class<*>, name: String, vararg parameterTypes: Class<*>) {
-    try {
-        clazz.getDeclaredMethod(name, *parameterTypes)
-        return
-    }
-    catch (e: NoSuchMethodException) {
-        throw AssertionError("fail: method $name was not found in " + clazz, e)
-    }
-
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt b/compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt
deleted file mode 100644
index 8bdbe41905e..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FULL_JDK
-
-// FILE: Test.java
-
-public interface Test<T> {
-    default T test(T p) {
-        return null;
-    }
-}
-
-// FILE: kotlin.kt
-
-interface Test2: Test<String> {
-    @JvmDefault
-    override fun test(p: String): String {
-        return p
-    }
-
-    fun forDefaultImpls() {}
-}
-
-class TestClass : Test2
-
-fun box(): String {
-    checkMethodExists(Test2::class.java, "test", String::class.java)
-    checkMethodExists(Test2::class.java, "test", Any::class.java)
-
-    checkNoMethod(TestClass::class.java, "test", String::class.java)
-    checkNoMethod(TestClass::class.java, "test", Any::class.java)
-
-    val test2DefaultImpls = java.lang.Class.forName("Test2\$DefaultImpls")
-    checkNoMethod(test2DefaultImpls, "test", Any::class.java)
-    checkNoMethod(test2DefaultImpls, "test", String::class.java)
-
-    return "OK"
-}
-
-fun checkNoMethod(clazz: Class<*>, name: String, vararg parameterTypes: Class<*>) {
-    try {
-        clazz.getDeclaredMethod(name, *parameterTypes)
-    }
-    catch (e: NoSuchMethodException) {
-        return
-    }
-    throw AssertionError("fail: method $name was found in " + clazz)
-}
-
-fun checkMethodExists(clazz: Class<*>, name: String, vararg parameterTypes: Class<*>) {
-    try {
-        clazz.getDeclaredMethod(name, *parameterTypes)
-        return
-    }
-    catch (e: NoSuchMethodException) {
-        throw AssertionError("fail: method $name was not found in " + clazz, e)
-    }
-
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt
deleted file mode 100644
index e62dfab721c..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FILE: Simple.java
-
-public interface Simple extends KInterface2 {
-    default String test() {
-        return KInterface2.DefaultImpls.test2(this, "OK");
-    }
-}
-
-// FILE: Foo.java
-public class Foo implements Simple {
-
-}
-
-// FILE: main.kt
-
-interface KInterface<T>  {
-    @JvmDefault
-    fun test2(p: T): T {
-        return p
-    }
-}
-
-interface KInterface2 : KInterface<String> {
-
-}
-
-
-fun box(): String {
-
-    val result = Foo().test()
-    if (result != "OK") return "fail 1: ${result}"
-
-    return Foo().test2("OK")
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt
deleted file mode 100644
index df412430b4d..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FILE: Simple.java
-
-public interface Simple extends KInterface2 {
-    default String test() {
-        return KInterface2.DefaultImpls.test2(this, "OK");
-    }
-}
-
-// FILE: Foo.java
-public class Foo implements Simple {
-    public String test2(String p) {
-        return "fail";
-    }
-}
-
-// FILE: main.kt
-
-interface KInterface<T>  {
-    @JvmDefault
-    fun test2(p: T): T {
-        return p
-    }
-}
-
-interface KInterface2 : KInterface<String> {
-
-}
-
-
-fun box(): String {
-    return Foo().test()
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt
deleted file mode 100644
index 6c100045626..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FILE: Simple.java
-
-public interface Simple extends KInterface3 {
-    default String test() {
-        return KInterface3.DefaultImpls.test2(this, "OK");
-    }
-}
-
-// FILE: Foo.java
-public class Foo implements Simple {
-    public String test2(String p) {
-        return "fail";
-    }
-}
-
-// FILE: main.kt
-
-interface KInterface<T>  {
-    @JvmDefault
-    fun test2(p: T): T {
-        return p
-    }
-}
-
-interface KInterface2 : KInterface<String> {
-
-}
-
-interface KInterface3 : KInterface2 {
-
-}
-
-
-fun box(): String {
-    return Foo().test()
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt
deleted file mode 100644
index 4d1247b7fd9..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FILE: Simple.java
-
-public interface Simple extends KInterface2 {
-    default String test() {
-        return KInterface2.DefaultImpls.getBar(this);
-    }
-}
-
-// FILE: Foo.java
-public class Foo implements Simple {
-
-}
-
-// FILE: main.kt
-
-interface KInterface<T>  {
-
-    val foo: T
-
-    @JvmDefault
-    val bar: T
-        get() = foo
-}
-
-interface KInterface2 : KInterface<String> {
-    @JvmDefault
-    override val foo: String
-        get() = "OK"
-}
-
-
-fun box(): String {
-
-    val result = Foo().test()
-    if (result != "OK") return "fail 1: ${result}"
-
-    return Foo().bar
-
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt
deleted file mode 100644
index ac38ac225eb..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FILE: Simple.java
-
-public interface Simple extends KInterface2 {
-    default String test() {
-        return KInterface2.DefaultImpls.getBar(this);
-    }
-}
-
-// FILE: Foo.java
-public class Foo implements Simple {
-    public String getBar() {
-        return "fail";
-    }
-}
-
-// FILE: main.kt
-
-interface KInterface<T>  {
-
-    val foo: T
-
-    @JvmDefault
-    val bar: T
-        get() = foo
-}
-
-interface KInterface2 : KInterface<String> {
-    @JvmDefault
-    override val foo: String
-        get() = "OK"
-}
-
-
-fun box(): String {
-    return Foo().test()
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt
deleted file mode 100644
index 58f335bb234..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FILE: Simple.java
-
-public interface Simple extends KInterface3 {
-    default String test() {
-        return KInterface3.DefaultImpls.getBar(this);
-    }
-}
-
-// FILE: Foo.java
-public class Foo implements Simple {
-
-}
-
-// FILE: main.kt
-
-interface KInterface<T>  {
-
-    val foo: T
-
-    @JvmDefault
-    val bar: T
-        get() = foo
-}
-
-interface KInterface2 : KInterface<String> {
-    @JvmDefault
-    override val foo: String
-        get() = "OK"
-}
-
-interface KInterface3 : KInterface2 {
-
-}
-
-
-fun box(): String {
-    return Foo().test()
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt
deleted file mode 100644
index 8774b053fa1..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FULL_JDK
-
-interface Test {
-    @JvmDefault
-    fun test(s: String ="OK"): String {
-        return s
-    }
-}
-
-class TestClass : Test {
-
-}
-
-fun box(): String {
-    val defaultImpls = java.lang.Class.forName(Test::class.java.canonicalName + "\$DefaultImpls")
-
-    val declaredMethod = defaultImpls.getDeclaredMethod("test\$default", Test::class.java, String::class.java, Int::class.java, Any::class.java)
-    return declaredMethod.invoke(null, TestClass(), null, 1, null) as String
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgsViaAnonymousObject.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgsViaAnonymousObject.kt
deleted file mode 100644
index 53ca14dde7f..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgsViaAnonymousObject.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface A {
-    @JvmDefault
-    fun foo(x: String = "OK"): String {
-        return x
-    }
-}
-
-fun box(): String {
-    val x = object : A {}
-    return x.foo()
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt
deleted file mode 100644
index ce7e67b77e1..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface I {
-    @Deprecated("message")
-    @JvmDefault
-    fun result() = "OK"
-}
-
-fun box(): String = object : I {}.result()
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedFunctionWithDefaultParameters.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedFunctionWithDefaultParameters.kt
deleted file mode 100644
index 5b16fd844d9..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedFunctionWithDefaultParameters.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-interface I {
-    @JvmDefault
-    fun foo(x: String = "OK"): String = x
-}
-
-interface J : I
-
-object O : J
-
-fun box(): String = O.foo()
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt
deleted file mode 100644
index 8065eed7c91..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FILE: Simple.java
-
-public interface Simple extends KInterface2 {
-    default String test() {
-        return KInterface2.DefaultImpls.test2(this);
-    }
-}
-
-// FILE: Foo.java
-public class Foo implements Simple {
-
-}
-
-// FILE: main.kt
-
-interface KInterface  {
-    @JvmDefault
-    fun test2(): String {
-        return "OK"
-    }
-}
-
-interface KInterface2 : KInterface {
-
-}
-
-
-fun box(): String {
-    val result = Foo().test()
-    if (result != "OK") return "fail 1: ${result}"
-
-    return Foo().test2()
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/interfaceExtension.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/interfaceExtension.kt
deleted file mode 100644
index 3102f2aba6e..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/interfaceExtension.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-interface A {
-    @JvmDefault
-    fun String.foo(k: String) = "O" + k
-}
-
-fun box(): String =
-    object : A {
-        fun box() = "FAIL".foo("K")
-    }.box()
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/kt42674.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/kt42674.kt
deleted file mode 100644
index 41390913773..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/kt42674.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FILE: A.java
-
-public interface A {
-    default String foo() {
-        return "fail";
-    }
-}
-// FILE: B.java
-
-public abstract class B implements A {}
-
-// FILE: test.kt
-
-interface KDefault : A {
-    @JvmDefault
-    override fun foo() = "OK"
-}
-
-class Problem : B(), KDefault
-
-fun box(): String {
-    return Problem().foo()
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt
deleted file mode 100644
index 41b0c2f71ee..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_REFLECT
-
-annotation class Property(val value: String)
-annotation class Accessor(val value: String)
-
-interface Z {
-    @Property("OK")
-    @JvmDefault
-    val z: String
-        @Accessor("OK")
-        get() = "OK"
-}
-
-
-class Test : Z
-
-fun box() : String {
-    val value = Z::z.annotations.filterIsInstance<Property>().single().value
-    if (value != "OK") return value
-    return (Z::z.getter.annotations.single() as Accessor).value
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt b/compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt
deleted file mode 100644
index 14f8b092d2d..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FILE: Simple.java
-
-public interface Simple extends KInterface {
-    default String test() {
-        return KInterface.DefaultImpls.test2(this);
-    }
-}
-
-// FILE: Foo.java
-public class Foo implements Simple {
-
-}
-
-// FILE: main.kt
-
-interface KInterface  {
-    @JvmDefault
-    fun test2(): String {
-        return "OK"
-    }
-}
-
-
-fun box(): String {
-    val result = Foo().test()
-    if (result != "OK") return "fail 1: ${result}"
-
-    return Foo().test2()
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt b/compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt
deleted file mode 100644
index 3206fe883a5..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Z {
-    @JvmDefault
-    fun test(s: String = "OK"): String {
-        return s
-    }
-}
-
-class Test: Z
-
-fun box(): String {
-    return Test().test()
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/defaultArgsViaAnonymousObject.kt b/compiler/testData/codegen/box/jvm8/defaults/defaultArgsViaAnonymousObject.kt
deleted file mode 100644
index ebeb7a2d4f4..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/defaultArgsViaAnonymousObject.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface A {
-    @JvmDefault
-    fun foo(x: String = "OK"): String {
-        return x
-    }
-}
-
-fun box(): String {
-    val x = object : A {}
-    return x.foo()
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt b/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt
deleted file mode 100644
index ac1826a4ff4..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Test {
-    @JvmDefault
-    fun test(): String {
-        return "O"
-    }
-
-    fun delegatedTest(): String {
-        return "fail"
-    }
-}
-
-class Delegate : Test {
-    override fun test(): String {
-        return "Fail"
-    }
-
-    override fun delegatedTest(): String {
-        return "K"
-    }
-}
-
-class TestClass(val foo: Test) : Test by foo
-
-fun box(): String {
-    val testClass = TestClass(Delegate())
-    return testClass.test() + testClass.delegatedTest()
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt b/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt
deleted file mode 100644
index 68f6b57000c..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Test {
-    @JvmDefault
-    val test: String
-        get() = "O"
-
-    val testDelegated: String
-        get() = "fail"
-
-}
-
-class Delegate : Test {
-    override val test: String
-        get() = "fail"
-
-    override val testDelegated: String
-        get() = "K"
-}
-
-class TestClass(val foo: Test) : Test by foo
-
-fun box(): String {
-    val testClass = TestClass(Delegate())
-    return testClass.test + testClass.testDelegated
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/inheritedFunctionWithDefaultParameters.kt b/compiler/testData/codegen/box/jvm8/defaults/inheritedFunctionWithDefaultParameters.kt
deleted file mode 100644
index da03db479b8..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/inheritedFunctionWithDefaultParameters.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-interface I {
-    @JvmDefault
-    fun foo(x: String = "OK"): String = x
-}
-
-interface J : I
-
-object O : J
-
-fun box(): String = O.foo()
diff --git a/compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt b/compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt
deleted file mode 100644
index e7d99a35bc2..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Test {
-    @JvmDefault
-    fun test(): String {
-        return inlineProp
-    }
-
-    fun testDefaultImpls(): String {
-        return inlineProp
-    }
-
-    @JvmDefault
-    private inline val inlineProp: String
-        get() = "OK"
-
-}
-
-class TestClass : Test {
-
-}
-
-fun box(): String {
-    val foo = TestClass()
-    if (foo.test() != "OK") return "fail: ${foo.test()}"
-    return foo.testDefaultImpls()
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/kt14243.kt b/compiler/testData/codegen/box/jvm8/defaults/kt14243.kt
deleted file mode 100644
index 1c8ecf7316a..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/kt14243.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Z<T> {
-    @JvmDefault
-    fun test(p: T): T {
-        return p
-    }
-}
-
-open class ZImpl : Z<String>
-
-class ZImpl2 : ZImpl() {
-
-    override fun test(p: String): String {
-        return super.test(p)
-    }
-}
-
-fun box(): String {
-    return ZImpl2().test("OK")
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt b/compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt
deleted file mode 100644
index 9141adb5a6f..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Z<T> {
-    @JvmDefault
-    fun test(p: T): T {
-        return p
-    }
-}
-
-open class ZImpl : Z<String>
-
-open class ZImpl2 : Z<String>, ZImpl()
-
-class ZImpl3 : ZImpl2() {
-
-    override fun test(p: String): String {
-        return super.test(p)
-    }
-}
-
-fun box(): String {
-    return ZImpl3().test("OK")
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/26360.kt b/compiler/testData/codegen/box/jvm8/defaults/kt26360.kt
similarity index 83%
rename from compiler/testData/codegen/box/jvm8/defaults/26360.kt
rename to compiler/testData/codegen/box/jvm8/defaults/kt26360.kt
index 4979ed55a17..b59456ead2d 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/26360.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/kt26360.kt
@@ -1,5 +1,5 @@
 // JVM_TARGET: 1.8
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all
 // WITH_STDLIB
 // TARGET_BACKEND: JVM
 interface Base {
@@ -8,8 +8,8 @@ interface Base {
 
 interface SubA : Base
 
+@JvmDefaultWithCompatibility
 interface SubB : Base {
-    @JvmDefault
     override fun value(): String = "OK"
 }
 
diff --git a/compiler/testData/codegen/box/jvm8/defaults/kt42674.kt b/compiler/testData/codegen/box/jvm8/defaults/kt42674.kt
deleted file mode 100644
index 3f03460224f..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/kt42674.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FILE: A.java
-
-public interface A {
-    default String foo() {
-        return "fail";
-    }
-}
-// FILE: B.java
-
-public abstract class B implements A {}
-
-// FILE: test.kt
-
-interface KDefault : A {
-    @JvmDefault
-    override fun foo() = "OK"
-}
-
-class Problem : B(), KDefault
-
-fun box(): String {
-    return Problem().foo()
-}
\ No newline at end of file
diff --git a/compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/callableReference.kt
similarity index 53%
rename from compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt
rename to compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/callableReference.kt
index 88d9314d3c4..117955f9f59 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/callableReference.kt
@@ -1,12 +1,15 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
-// WITH_STDLIB
 
 interface Test {
-    @JvmDefault
+    fun foo(): String = "O"
+
+    val bar: String
+        get() = "K"
+
     fun test(): String {
-        return "OK"
+        return (::foo).let { it() } + (::bar).let { it() }
     }
 }
 
diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/capturedSuperCall.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/capturedSuperCall.kt
new file mode 100644
index 00000000000..14997340429
--- /dev/null
+++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/capturedSuperCall.kt
@@ -0,0 +1,28 @@
+// !JVM_DEFAULT_MODE: all
+// TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
+// WITH_STDLIB
+
+interface IBase {
+    fun bar() = "OK"
+}
+
+open class Base {
+    fun foo() = "OK"
+}
+
+class C : Base(), IBase {
+    val lambda1 = {
+        super.foo()
+    }
+
+    val lambda2 = {
+        super.bar()
+    }
+}
+
+fun box(): String {
+    if (C().lambda1() != "OK") return "fail 1"
+
+    return C().lambda2()
+}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/defaultArgs.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/defaultArgs.kt
index f598faeea68..192a32c49f4 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/defaultArgs.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/defaultArgs.kt
@@ -18,7 +18,7 @@ fun box(): String {
     try {
         val defaultImpls = java.lang.Class.forName(Test::class.java.canonicalName + "\$DefaultImpls")
     } catch (e: ClassNotFoundException) {
-        return "OK"
+        return TestClass().test()
     }
     return "fail: DefaultImpls shouldn't be generated"
 }
diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/delegationBy/simple.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/delegationBy/simple.kt
index 94b9838e941..2dc17d24944 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/delegationBy/simple.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/delegationBy/simple.kt
@@ -4,29 +4,16 @@
 // WITH_STDLIB
 
 interface Test {
-    @JvmDefault
-    fun test(): String {
-        return "O"
-    }
-
-    fun delegatedTest(): String {
-        return "fail"
-    }
+    fun test(): String = "Fail"
 }
 
 class Delegate : Test {
-    override fun test(): String {
-        return "Fail"
-    }
-
-    override fun delegatedTest(): String {
-        return "K"
-    }
+    override fun test(): String = "OK"
 }
 
 class TestClass(val foo: Test) : Test by foo
 
 fun box(): String {
     val testClass = TestClass(Delegate())
-    return testClass.test() + testClass.delegatedTest()
+    return testClass.test()
 }
diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/delegationBy/simpleProperty.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/delegationBy/simpleProperty.kt
index 3f0736eda50..7d60fc44b89 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/delegationBy/simpleProperty.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/delegationBy/simpleProperty.kt
@@ -4,26 +4,16 @@
 // WITH_STDLIB
 
 interface Test {
-    @JvmDefault
-    val test: String
-        get() = "O"
-
-    val testDelegated: String
-        get() = "fail"
-
+    val test: String get() = "Fail"
 }
 
 class Delegate : Test {
-    override val test: String
-        get() = "fail"
-
-    override val testDelegated: String
-        get() = "K"
+    override val test: String get() = "OK"
 }
 
 class TestClass(val foo: Test) : Test by foo
 
 fun box(): String {
     val testClass = TestClass(Delegate())
-    return testClass.test + testClass.testDelegated
+    return testClass.test
 }
diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/diamond.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/diamond.kt
new file mode 100644
index 00000000000..d2fc3d83863
--- /dev/null
+++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/diamond.kt
@@ -0,0 +1,52 @@
+// !JVM_DEFAULT_MODE: all
+// TARGET_BACKEND: JVM
+// IGNORE_BACKEND: ANDROID
+// JVM_TARGET: 1.8
+// WITH_REFLECT
+// FULL_JDK
+
+interface Test {
+    fun test(): String {
+        return "Test"
+    }
+}
+
+open class TestClass : Test {
+
+}
+
+
+interface Test2 : Test {
+    override fun test(): String {
+        return "Test2"
+    }
+}
+
+interface Test3 : Test2 {
+
+}
+
+
+class TestClass2 : TestClass(), Test3 {
+
+}
+
+fun box(): String {
+    val test = TestClass2().test()
+    if (test != "Test2") return "fail 1: $test"
+    checkNoMethod(TestClass::class.java, "test")
+    checkNoMethod(Test3::class.java, "test")
+    checkNoMethod(TestClass2::class.java, "test")
+
+    return "OK"
+}
+
+fun checkNoMethod(clazz: Class<*>, name: String) {
+    try {
+        clazz.getDeclaredMethod(name)
+    }
+    catch (e: NoSuchMethodException) {
+        return
+    }
+    throw AssertionError("fail: method $name was found in " + clazz)
+}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inline.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inline.kt
new file mode 100644
index 00000000000..c365b39da21
--- /dev/null
+++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inline.kt
@@ -0,0 +1,22 @@
+// !JVM_DEFAULT_MODE: all
+// TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
+// WITH_STDLIB
+// IGNORE_INLINER: IR
+
+interface Test {
+    fun test(): String {
+        return inlineFun { "OK" }
+    }
+
+    private inline fun inlineFun(s: () -> String) = s()
+}
+
+class TestClass : Test {
+
+}
+
+fun box(): String {
+    val foo = TestClass()
+    return foo.test()
+}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inlineProperty.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inlineProperty.kt
new file mode 100644
index 00000000000..4a2bbe2ba42
--- /dev/null
+++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inlineProperty.kt
@@ -0,0 +1,22 @@
+// !JVM_DEFAULT_MODE: all
+// TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
+// WITH_STDLIB
+// IGNORE_INLINER: IR
+
+interface Test {
+    fun test(): String {
+        return inlineProp
+    }
+
+    private inline val inlineProp: String
+        get() = "OK"
+
+}
+
+class TestClass : Test {
+
+}
+
+fun box(): String =
+    TestClass().test()
diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt11969.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt11969.kt
new file mode 100644
index 00000000000..2461dd15157
--- /dev/null
+++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt11969.kt
@@ -0,0 +1,56 @@
+// !JVM_DEFAULT_MODE: all
+// TARGET_BACKEND: JVM
+// IGNORE_BACKEND: ANDROID
+// JVM_TARGET: 1.8
+// WITH_STDLIB
+
+interface Z {
+    private fun privateFun() = { "OK" }
+
+    fun callPrivateFun() = privateFun()
+
+    fun publicFun() = { "OK" }
+
+    fun funWithDefaultArgs(s: () -> Unit = {}): () -> Unit
+
+    val property: () -> Unit
+        get() = {}
+
+    class Nested
+}
+
+class Test : Z {
+    override fun funWithDefaultArgs(s: () -> Unit): () -> Unit {
+        return s
+    }
+}
+
+fun box(): String {
+
+    val privateFun = Test().callPrivateFun()
+    var enclosing = privateFun.javaClass.enclosingMethod!!
+    if (enclosing.name != "privateFun") return "fail 1: ${enclosing.name}"
+    if (enclosing.getDeclaringClass().simpleName != "Z") return "fail 2: ${enclosing.getDeclaringClass().simpleName}"
+
+    val publicFun = Test().publicFun()
+    enclosing = publicFun.javaClass.enclosingMethod!!
+    if (enclosing.name != "publicFun") return "fail 3: ${enclosing.name}"
+    if (enclosing.getDeclaringClass().simpleName != "Z") return "fail 4: ${enclosing.getDeclaringClass().simpleName}"
+
+    val property = Test().property
+    enclosing = property.javaClass.enclosingMethod!!
+    if (enclosing.name != "getProperty") return "fail 4: ${enclosing.name}"
+    if (enclosing.getDeclaringClass().simpleName != "Z") return "fail 5: ${enclosing.getDeclaringClass().simpleName}"
+
+    val defaultArgs = Test().funWithDefaultArgs()
+    enclosing = defaultArgs.javaClass.enclosingMethod!!
+    if (enclosing.name != "funWithDefaultArgs\$default") return "fail 6: ${enclosing.name}"
+    if (enclosing.parameterTypes.size != 4) return "fail 7: not default method ${enclosing.name}"
+    if (enclosing.getDeclaringClass().simpleName != "Z") return "fail 8: ${enclosing.getDeclaringClass().simpleName}"
+
+    val nested = Z.Nested::class.java
+    val enclosingClass = nested.enclosingClass!!
+    if (enclosingClass.name != "Z") return "fail 9: ${enclosingClass.name}"
+
+    return "OK"
+}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_prop.kt
similarity index 88%
rename from compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt
rename to compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_prop.kt
index 3e28ba85bf3..7a4c548df8f 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_prop.kt
@@ -1,13 +1,11 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all
 // TARGET_BACKEND: JVM
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 
 interface Z<T> {
-
     val value: T
 
-    @JvmDefault
     val z: T
         get() = value
 }
diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation.kt
new file mode 100644
index 00000000000..5a4b3a0ac9a
--- /dev/null
+++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation.kt
@@ -0,0 +1,23 @@
+// !JVM_DEFAULT_MODE: all
+// TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
+// WITH_STDLIB
+
+interface KCallable {
+    val returnType: String
+}
+
+interface KCallableImpl : KCallable {
+    override val returnType: String
+        get() = "OK"
+}
+
+interface KCallableImpl2 : KCallableImpl
+
+open class DescriptorBasedProperty : KCallableImpl
+open class KProperty1Impl : DescriptorBasedProperty(), KCallableImpl2
+open class KMutableProperty1Impl : KProperty1Impl(), KCallable
+
+fun box(): String {
+    return KMutableProperty1Impl().returnType
+}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation2.kt b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation2.kt
new file mode 100644
index 00000000000..1b73724bf10
--- /dev/null
+++ b/compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation2.kt
@@ -0,0 +1,28 @@
+// !JVM_DEFAULT_MODE: all
+// TARGET_BACKEND: JVM
+// JVM_TARGET: 1.8
+// WITH_STDLIB
+
+interface KCallable {
+    val returnType: String
+}
+
+interface KCallableImpl : KCallable {
+    override val returnType: String
+        get() = "OK"
+}
+
+interface KProperty : KCallable
+interface KPropertyImpl : KProperty, KCallableImpl
+interface KMutableProperty : KProperty
+interface KProperty1 : KProperty
+interface KMutableProperty1 : KProperty1, KMutableProperty
+interface KMutablePropertyImpl : KPropertyImpl
+
+open class DescriptorBasedProperty : KCallableImpl
+open class KProperty1Impl : DescriptorBasedProperty(), KProperty1, KPropertyImpl
+open class KMutableProperty1Impl : KProperty1Impl(), KMutableProperty1, KMutablePropertyImpl
+
+fun box(): String {
+    return KMutableProperty1Impl().returnType
+}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt b/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
deleted file mode 100644
index 6689570348b..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// IGNORE_BACKEND: ANDROID
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FULL_JDK
-
-interface Test {
-    @JvmDefault
-    fun test() {
-    }
-}
-
-class TestClass : Test {
-
-}
-
-fun box(): String {
-    try {
-        TestClass::class.java.getDeclaredMethod("test")
-    }
-    catch (e: NoSuchMethodException) {
-        return "OK"
-    }
-    return "fail"
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt b/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
deleted file mode 100644
index f93caaba249..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FULL_JDK
-
-interface Test {
-    @JvmDefault
-    fun test() {
-    }
-}
-
-interface Test2 : Test {
-
-}
-
-fun box(): String {
-    try {
-        Test2::class.java.getDeclaredMethod("test")
-    }
-    catch (e: NoSuchMethodException) {
-        return "OK"
-    }
-    return "fail"
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt b/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
deleted file mode 100644
index 08e9f5e2e1e..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-// FULL_JDK
-
-interface Test {
-    @JvmDefault
-    fun test() {
-    }
-}
-
-interface Test2 : Test {
-
-}
-
-interface Test3 : Test2 {
-
-}
-
-fun box(): String {
-    try {
-        Test3::class.java.getDeclaredMethod("test")
-    }
-    catch (e: NoSuchMethodException) {
-        return "OK"
-    }
-    return "fail"
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt b/compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt
deleted file mode 100644
index 96c44c3c334..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Test {
-    fun test(): String {
-        return privateFun() + privateProp
-    }
-
-    @JvmDefault
-    private fun privateFun(): String {
-        return "O"
-    }
-
-    @JvmDefault
-    private val privateProp: String
-        get() = "K"
-}
-
-class TestImpl: Test
-
-fun box(): String {
-    return TestImpl().test()
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt b/compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt
deleted file mode 100644
index 55f7d4727d8..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Test {
-    @JvmDefault
-    fun test(): String {
-        return privateFun() + privateProp
-    }
-
-    private fun privateFun(): String {
-        return "O"
-    }
-
-    private val privateProp: String
-        get() = "K"
-}
-
-class TestImpl: Test
-
-fun box(): String {
-    return TestImpl().test()
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt b/compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt
index c067b8abe71..18ebeb2f2b2 100644
--- a/compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt
+++ b/compiler/testData/codegen/box/jvm8/defaults/reflection/propertyAnnotations.kt
@@ -1,5 +1,6 @@
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all
 // TARGET_BACKEND: JVM
+// IGNORE_BACKEND: ANDROID
 // JVM_TARGET: 1.8
 // WITH_REFLECT
 
@@ -8,7 +9,6 @@ annotation class Accessor(val value: String)
 
 interface Z {
     @Property("OK")
-    @JvmDefault
     val z: String
         @Accessor("OK")
         get() = "OK"
diff --git a/compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt b/compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt
deleted file mode 100644
index 119225c7393..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Z {
-    @JvmDefault
-    val z: String
-        get() = "OK"
-}
-
-
-class Test : Z
-
-fun box() : String {
-    return Test().z
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/superCall.kt b/compiler/testData/codegen/box/jvm8/defaults/superCall.kt
deleted file mode 100644
index 5e888c275f8..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/superCall.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Test {
-    @JvmDefault
-    fun test(): String {
-        return "OK"
-    }
-}
-
-interface Test2 : Test {
-    @JvmDefault
-    override fun test(): String {
-        return super.test()
-    }
-}
-
-
-class TestClass : Test2 {
-
-}
-
-
-fun box(): String {
-    return TestClass().test()
-}
diff --git a/compiler/testData/codegen/box/jvm8/defaults/suspendFunction.kt b/compiler/testData/codegen/box/jvm8/defaults/suspendFunction.kt
deleted file mode 100644
index 539f5ece656..00000000000
--- a/compiler/testData/codegen/box/jvm8/defaults/suspendFunction.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// TARGET_BACKEND: JVM
-// JVM_TARGET: 1.8
-// WITH_COROUTINES
-// WITH_STDLIB
-
-import kotlin.coroutines.*
-import helpers.*
-
-interface S {
-    suspend fun foo()
-}
-
-interface T : S {
-    @JvmDefault
-    override suspend fun foo() {
-        bar()
-    }
-
-    fun bar()
-}
-
-object O : T {
-    var result = ""
-
-    override fun bar() {
-        result = "OK"
-    }
-}
-
-fun builder(block: suspend () -> Unit) {
-    block.startCoroutine(EmptyContinuation)
-}
-
-fun box(): String {
-    builder { O.foo() }
-    return O.result
-}
diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllCompatibilityJvmDefault.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllCompatibilityJvmDefault.kt
index 9a01631a6b2..026a0e39f63 100644
--- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllCompatibilityJvmDefault.kt
+++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllCompatibilityJvmDefault.kt
@@ -1,5 +1,5 @@
 // ENABLE_JVM_PREVIEW
-// JVM_DEFAULT_MODE: all-compatibility
+// !JVM_DEFAULT_MODE: all-compatibility
 
 // FILE: JavaClass.java
 public class JavaClass {
diff --git a/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesEnableJvmDefault.kt b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllJvmDefault.kt
similarity index 86%
rename from compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesEnableJvmDefault.kt
rename to compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllJvmDefault.kt
index 39e4a9094fd..6acc6ae42d4 100644
--- a/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesEnableJvmDefault.kt
+++ b/compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllJvmDefault.kt
@@ -1,7 +1,5 @@
-// !API_VERSION: 1.5
-// !LANGUAGE: +JvmRecordSupport
 // ENABLE_JVM_PREVIEW
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all
 
 // FILE: JavaClass.java
 public class JavaClass {
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultEnable.kt b/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultEnable.kt
deleted file mode 100644
index cfa2d62070b..00000000000
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultEnable.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// WITH_STDLIB
-// JVM_TARGET: 1.8
-
-interface IFooBar {
-    @JvmDefault fun foo() = "O"
-    @JvmDefault fun bar() = "Failed"
-}
-
-interface IFooBar2 : IFooBar
-
-inline class Test1(val k: String): IFooBar {
-    override fun bar(): String = k
-}
-
-inline class Test2(val k: String): IFooBar2 {
-    override fun bar(): String = k
-}
diff --git a/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultEnable.txt b/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultEnable.txt
deleted file mode 100644
index 9732168d406..00000000000
--- a/compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultEnable.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-@kotlin.Metadata
-public interface IFooBar {
-    // source: 'jvmDefaultEnable.kt'
-    public @kotlin.jvm.JvmDefault @org.jetbrains.annotations.NotNull method bar(): java.lang.String
-    public @kotlin.jvm.JvmDefault @org.jetbrains.annotations.NotNull method foo(): java.lang.String
-}
-
-@kotlin.Metadata
-public interface IFooBar2 {
-    // source: 'jvmDefaultEnable.kt'
-}
-
-@kotlin.jvm.JvmInline
-@kotlin.Metadata
-public final class Test1 {
-    // source: 'jvmDefaultEnable.kt'
-    private final @org.jetbrains.annotations.NotNull field k: java.lang.String
-    private synthetic method <init>(p0: java.lang.String): void
-    public @org.jetbrains.annotations.NotNull method bar(): java.lang.String
-    public static @org.jetbrains.annotations.NotNull method bar-impl(p0: java.lang.String): java.lang.String
-    public synthetic final static method box-impl(p0: java.lang.String): Test1
-    public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
-    public method equals(p0: java.lang.Object): boolean
-    public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean
-    public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean
-    public final @org.jetbrains.annotations.NotNull method getK(): java.lang.String
-    public method hashCode(): int
-    public static method hashCode-impl(p0: java.lang.String): int
-    public method toString(): java.lang.String
-    public static method toString-impl(p0: java.lang.String): java.lang.String
-    public synthetic final method unbox-impl(): java.lang.String
-}
-
-@kotlin.jvm.JvmInline
-@kotlin.Metadata
-public final class Test2 {
-    // source: 'jvmDefaultEnable.kt'
-    private final @org.jetbrains.annotations.NotNull field k: java.lang.String
-    private synthetic method <init>(p0: java.lang.String): void
-    public @org.jetbrains.annotations.NotNull method bar(): java.lang.String
-    public static @org.jetbrains.annotations.NotNull method bar-impl(p0: java.lang.String): java.lang.String
-    public synthetic final static method box-impl(p0: java.lang.String): Test2
-    public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
-    public method equals(p0: java.lang.Object): boolean
-    public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean
-    public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean
-    public final @org.jetbrains.annotations.NotNull method getK(): java.lang.String
-    public method hashCode(): int
-    public static method hashCode-impl(p0: java.lang.String): int
-    public method toString(): java.lang.String
-    public static method toString-impl(p0: java.lang.String): java.lang.String
-    public synthetic final method unbox-impl(): java.lang.String
-}
diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable/interfaceProperty.kt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable/interfaceProperty.kt
deleted file mode 100644
index 8f8ce164741..00000000000
--- a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable/interfaceProperty.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-@Target(AnnotationTarget.PROPERTY)
-annotation class Foo
-
-interface Deprecated {
-
-    @Foo
-    val prop: String
-}
diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable/interfaceProperty.txt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable/interfaceProperty.txt
deleted file mode 100644
index fafd203f42e..00000000000
--- a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable/interfaceProperty.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-@kotlin.Metadata
-public final class Deprecated$DefaultImpls {
-    // source: 'interfaceProperty.kt'
-    public synthetic deprecated static @Foo method getProp$annotations(): void
-    public final inner class Deprecated$DefaultImpls
-}
-
-@kotlin.Metadata
-public interface Deprecated {
-    // source: 'interfaceProperty.kt'
-    public abstract @org.jetbrains.annotations.NotNull method getProp(): java.lang.String
-    public final inner class Deprecated$DefaultImpls
-}
-
-@kotlin.annotation.Target(allowedTargets=[PROPERTY])
-@java.lang.annotation.Retention(value=RUNTIME)
-@java.lang.annotation.Target(value=[])
-@kotlin.Metadata
-public annotation class Foo {
-    // source: 'interfaceProperty.kt'
-}
diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.ir.txt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.ir.txt
new file mode 100644
index 00000000000..a0b8ed00c5b
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.ir.txt
@@ -0,0 +1,6 @@
+@kotlin.Metadata
+public interface I {
+    // source: 'privateAccessorNaming.kt'
+    public method bar(): int
+    private method foo(): int
+}
diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.kt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.kt
new file mode 100644
index 00000000000..5a06fe22bf1
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.kt
@@ -0,0 +1,10 @@
+// TARGET_BACKEND: JVM
+// !JVM_DEFAULT_MODE: all
+// JVM_TARGET: 1.8
+// WITH_STDLIB
+
+interface I {
+    private fun foo() = 4
+
+    fun bar() = { foo() + 5 }()
+}
diff --git a/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.txt b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.txt
new file mode 100644
index 00000000000..d79f2713dac
--- /dev/null
+++ b/compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.txt
@@ -0,0 +1,19 @@
+@kotlin.Metadata
+final class I$bar$1 {
+    // source: 'privateAccessorNaming.kt'
+    enclosing method I.bar()I
+    synthetic final field this$0: I
+    inner (anonymous) class I$bar$1
+    method <init>(p0: I): void
+    public final method invoke(): int
+    public synthetic bridge method invoke(): java.lang.Object
+}
+
+@kotlin.Metadata
+public interface I {
+    // source: 'privateAccessorNaming.kt'
+    inner (anonymous) class I$bar$1
+    public synthetic static method access$foo(p0: I): int
+    public method bar(): int
+    private method foo(): int
+}
diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/interfaceJvmDefaultImplStubs.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/interfaceJvmDefaultImplStubs.kt
deleted file mode 100644
index c531ce8ef97..00000000000
--- a/compiler/testData/codegen/bytecodeText/inlineClasses/interfaceJvmDefaultImplStubs.kt
+++ /dev/null
@@ -1,33 +0,0 @@
-// !LANGUAGE: +InlineClasses
-// !JVM_DEFAULT_MODE: enable
-// JVM_TARGET: 1.8
-// FILE: test.kt
-
-
-fun box(): String {
-    val b = B(0)
-    return b.f() + b.g()
-}
-
-interface A {
-    fun f() = "O"
-    @JvmDefault
-    fun g() = "K"
-}
-
-inline class B(val x: Int) : A
-
-// 1 public static f-impl\(I\)Ljava/lang/String;
-// 1 public f\(\)Ljava/lang/String;
-
-// 0 public static g-impl\(I\)Ljava/lang/String;
-// 0 public g\(\)Ljava/lang/String;
-
-// 0 INVOKESTATIC B.g-impl \(I\)Ljava/lang/String;
-
-// JVM_TEMPLATES:
-// 2 INVOKESTATIC B.f-impl \(I\)Ljava/lang/String;
-
-// JVM_IR_TEMPLATES:
-// 1 INVOKESTATIC B.f-impl \(I\)Ljava/lang/String;
-
diff --git a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt
deleted file mode 100644
index 79f757c0152..00000000000
--- a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// JVM_TARGET: 1.8
-// FULL_JDK
-
-interface KInterface {
-    @JvmDefault
-    fun test(s: String ="OK"): String {
-        return s
-    }
-}
-
-// 1 INVOKESTATIC KInterface.access\$test\$jd
-// 1 INVOKESTATIC KInterface.test\$default
-
-// from $default
-// 1 INVOKEINTERFACE KInterface.test
-
-//from $jd
-// 1 INVOKESPECIAL KInterface.test
diff --git a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleDiamond.kt b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleDiamond.kt
deleted file mode 100644
index e95fd1936d1..00000000000
--- a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleDiamond.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// JVM_TARGET: 1.8
-
-interface A {
-    @JvmDefault
-    fun foo() = "FAIL"
-}
-
-interface Left : A { }
-interface Right : A {
-    @JvmDefault
-    override fun foo() = "OK"
-}
-
-interface C : Left, Right {}
-
-fun box(): String {
-    val x = object : C {}
-    return x.foo()
-}
-
-// 0 INVOKESTATIC .*\$DefaultImpls\.foo
diff --git a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunction.kt b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunction.kt
deleted file mode 100644
index 6ace7993aab..00000000000
--- a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunction.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// JVM_TARGET: 1.8
-
-interface KInterface  {
-    @JvmDefault
-    fun test2(): String {
-        return "OK"
-    }
-}
-
-interface KInterface2 : KInterface  {
-
-}
-
-// 1 INVOKESTATIC KInterface2.access\$test2\$jd
-// 1 INVOKESTATIC KInterface.access\$test2\$jd
-
-// 1 INVOKESPECIAL KInterface2.test2
-// 1 INVOKESPECIAL KInterface.test2
diff --git a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunctionWithAbstractOverride.kt b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunctionWithAbstractOverride.kt
deleted file mode 100644
index 227eb96c28f..00000000000
--- a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunctionWithAbstractOverride.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// JVM_TARGET: 1.8
-
-interface KInterface  {
-    @JvmDefault
-    fun test2(): String {
-        return "OK"
-    }
-}
-
-interface KInterface2 : KInterface  {
-    @JvmDefault
-    abstract override fun test2(): String
-}
-
-// 1 INVOKESTATIC KInterface.access\$test2\$jd
-// +
-// 0 INVOKESTATIC KInterface2.access\$test2\$jd
-// =
-// 1 INVOKESTATIC KInterface
-
-// 1 INVOKESPECIAL KInterface.test2
-// 0 INVOKESPECIAL KInterface2.test2
diff --git a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt b/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt
deleted file mode 100644
index 04d4e7b0a37..00000000000
--- a/compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-// !JVM_DEFAULT_MODE: compatibility
-// JVM_TARGET: 1.8
-
-interface KInterface {
-
-    @JvmDefault
-    var bar: String
-        get() = "OK"
-        set(field) {}
-}
-
-interface KInterface2 : KInterface {
-
-}
-
-// 1 INVOKESTATIC KInterface2.access\$getBar\$jd
-// 1 INVOKESTATIC KInterface2.access\$setBar\$jd
-// 1 INVOKESTATIC KInterface.access\$getBar\$jd
-// 1 INVOKESTATIC KInterface.access\$setBar\$jd
-
-// 1 INVOKESPECIAL KInterface2.getBar
-// 1 INVOKESPECIAL KInterface2.setBar
-// 1 INVOKESPECIAL KInterface.getBar
-// 1 INVOKESPECIAL KInterface.setBar
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt
index 5e66b511a5f..6ff6fbaa665 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt
@@ -1,26 +1,26 @@
 // FIR_IDENTICAL
 // !JVM_TARGET: 1.8
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all
 
 interface A<T> {
-    @<!DEPRECATION!>JvmDefault<!>
     fun test(p: T) {
     }
 }
 
+@JvmDefaultWithCompatibility
 interface ANonDefault {
     fun test(p: String) {}
 }
 
 interface B<T> : A<T> {
 
-    <!JVM_DEFAULT_REQUIRED_FOR_OVERRIDE!>override fun test(p: T)<!>
+    override fun test(p: T)
     {}
 }
 
 interface C<T> : A<T>, ANonDefault {
 
-    <!JVM_DEFAULT_REQUIRED_FOR_OVERRIDE!>override fun test(p: T)<!>
+    override fun test(p: T)
     {}
 
     override fun test(p: String) {
@@ -41,7 +41,7 @@ interface C2 : C<String>, ANonDefault {
 
 interface D<T> : ANonDefault, A<T> {
 
-    <!JVM_DEFAULT_REQUIRED_FOR_OVERRIDE!>override fun test(p: T)<!>
+    override fun test(p: T)
     {}
 
     override fun test(p: String) {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.txt
index 535f69049a1..df9a011934c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.txt
@@ -3,11 +3,11 @@ package
 public interface A</*0*/ T> {
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open fun test(/*0*/ p: T): kotlin.Unit
+    public open fun test(/*0*/ p: T): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
-public interface ANonDefault {
+@kotlin.jvm.JvmDefaultWithCompatibility public interface ANonDefault {
     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 fun test(/*0*/ p: kotlin.String): kotlin.Unit
@@ -64,3 +64,4 @@ public interface D2 : ANonDefault, D<kotlin.String> {
     public open override /*3*/ fun test(/*0*/ p: kotlin.String): kotlin.Unit
     public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.fir.kt
deleted file mode 100644
index c18a5c1724b..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.fir.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// !JVM_TARGET: 1.8
-
-// FILE: JavaInterface.java
-public interface JavaInterface {
-    default void test() {}
-
-    default void testForNonDefault() {}
-
-    void testAbstract();
-}
-
-// FILE: 1.kt
-
-interface KotlinInterface : JavaInterface {
-    @<!DEPRECATION!>JvmDefault<!>
-    override fun test() {}
-
-    <!NON_JVM_DEFAULT_OVERRIDES_JAVA_DEFAULT!>override fun testForNonDefault()<!> {}
-
-    override fun testAbstract() {}
-}
-
-interface KotlinInterface2 : JavaInterface, KotlinInterface {
-    @<!DEPRECATION!>JvmDefault<!>
-    override fun test() {}
-
-    <!NON_JVM_DEFAULT_OVERRIDES_JAVA_DEFAULT!>override fun testForNonDefault()<!> {}
-
-    override fun testAbstract() {}
-}
-
-
-interface KotlinInterfaceForIndirect : JavaInterface {
-
-}
-
-interface KotlinInterfaceIndirectInheritance : KotlinInterfaceForIndirect {
-
-    @<!DEPRECATION!>JvmDefault<!>
-    override fun test() {}
-
-    <!NON_JVM_DEFAULT_OVERRIDES_JAVA_DEFAULT!>override fun testForNonDefault()<!> {}
-
-    override fun testAbstract() {}
-}
-
-open class KotlinClass : JavaInterface {
-    override fun test() {}
-
-    override fun testForNonDefault() {}
-
-    override fun testAbstract() {}
-}
-
-interface KotlinInterfaceX  {
-
-    fun test() {}
-
-    fun testForNonDefault() {}
-
-    fun testAbstract() {}
-}
-
-interface KotlinInterfaceManySuper: JavaInterface, KotlinInterfaceX {
-    @<!DEPRECATION!>JvmDefault<!>
-    override fun test() {}
-
-    <!NON_JVM_DEFAULT_OVERRIDES_JAVA_DEFAULT!>override fun testForNonDefault()<!> {}
-
-    override fun testAbstract() {}
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt
deleted file mode 100644
index 9a87a0a26a0..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt
+++ /dev/null
@@ -1,72 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// !JVM_TARGET: 1.8
-
-// FILE: JavaInterface.java
-public interface JavaInterface {
-    default void test() {}
-
-    default void testForNonDefault() {}
-
-    void testAbstract();
-}
-
-// FILE: 1.kt
-
-interface KotlinInterface : JavaInterface {
-    @<!DEPRECATION!>JvmDefault<!>
-    override fun test() {}
-
-    <!NON_JVM_DEFAULT_OVERRIDES_JAVA_DEFAULT!>override fun testForNonDefault()<!> {}
-
-    override fun testAbstract() {}
-}
-
-interface KotlinInterface2 : JavaInterface, KotlinInterface {
-    @<!DEPRECATION!>JvmDefault<!>
-    override fun test() {}
-
-    override fun testForNonDefault() {}
-
-    override fun testAbstract() {}
-}
-
-
-interface KotlinInterfaceForIndirect : JavaInterface {
-
-}
-
-interface KotlinInterfaceIndirectInheritance : KotlinInterfaceForIndirect {
-
-    @<!DEPRECATION!>JvmDefault<!>
-    override fun test() {}
-
-    <!NON_JVM_DEFAULT_OVERRIDES_JAVA_DEFAULT!>override fun testForNonDefault()<!> {}
-
-    override fun testAbstract() {}
-}
-
-open class KotlinClass : JavaInterface {
-    override fun test() {}
-
-    override fun testForNonDefault() {}
-
-    override fun testAbstract() {}
-}
-
-interface KotlinInterfaceX  {
-
-    fun test() {}
-
-    fun testForNonDefault() {}
-
-    fun testAbstract() {}
-}
-
-interface KotlinInterfaceManySuper: JavaInterface, KotlinInterfaceX {
-    @<!DEPRECATION!>JvmDefault<!>
-    override fun test() {}
-
-    <!NON_JVM_DEFAULT_OVERRIDES_JAVA_DEFAULT!>override fun testForNonDefault()<!> {}
-
-    override fun testAbstract() {}
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.txt
deleted file mode 100644
index 39b1f5d883a..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-package
-
-public interface JavaInterface {
-    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 fun test(): kotlin.Unit
-    public abstract fun testAbstract(): kotlin.Unit
-    public open fun testForNonDefault(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public open class KotlinClass : JavaInterface {
-    public constructor KotlinClass()
-    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*/ fun test(): kotlin.Unit
-    public open override /*1*/ fun testAbstract(): kotlin.Unit
-    public open override /*1*/ fun testForNonDefault(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface KotlinInterface : JavaInterface {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*1*/ fun test(): kotlin.Unit
-    public open override /*1*/ fun testAbstract(): kotlin.Unit
-    public open override /*1*/ fun testForNonDefault(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface KotlinInterface2 : JavaInterface, KotlinInterface {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*2*/ fun test(): kotlin.Unit
-    public open override /*2*/ fun testAbstract(): kotlin.Unit
-    public open override /*2*/ fun testForNonDefault(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface KotlinInterfaceForIndirect : JavaInterface {
-    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 test(): kotlin.Unit
-    public abstract override /*1*/ /*fake_override*/ fun testAbstract(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun testForNonDefault(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface KotlinInterfaceIndirectInheritance : KotlinInterfaceForIndirect {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*1*/ fun test(): kotlin.Unit
-    public open override /*1*/ fun testAbstract(): kotlin.Unit
-    public open override /*1*/ fun testForNonDefault(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface KotlinInterfaceManySuper : JavaInterface, KotlinInterfaceX {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*2*/ fun test(): kotlin.Unit
-    public open override /*2*/ fun testAbstract(): kotlin.Unit
-    public open override /*2*/ fun testForNonDefault(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface KotlinInterfaceX {
-    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 fun test(): kotlin.Unit
-    public open fun testAbstract(): kotlin.Unit
-    public open fun testForNonDefault(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverrideAll.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverrideAll.kt
deleted file mode 100644
index 03fdc6d9125..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverrideAll.kt
+++ /dev/null
@@ -1,70 +0,0 @@
-// FIR_IDENTICAL
-// !JVM_DEFAULT_MODE: all
-// !JVM_TARGET: 1.8
-
-// FILE: JavaInterface.java
-public interface JavaInterface {
-    default void test() {}
-
-    default void testForNonDefault() {}
-
-    void testAbstract();
-}
-
-// FILE: 1.kt
-
-interface KotlinInterface : JavaInterface {
-    @<!DEPRECATION!>JvmDefault<!>
-    override fun test() {}
-
-    override fun testForNonDefault() {}
-
-    override fun testAbstract() {}
-}
-
-interface KotlinInterface2 : JavaInterface, KotlinInterface {
-    override fun test() {}
-
-    override fun testForNonDefault() {}
-
-    override fun testAbstract() {}
-}
-
-
-interface KotlinInterfaceForIndirect : JavaInterface {
-
-}
-
-interface KotlinInterfaceIndirectInheritance : KotlinInterfaceForIndirect {
-
-    override fun test() {}
-
-    override fun testForNonDefault() {}
-
-    override fun testAbstract() {}
-}
-
-open class KotlinClass : JavaInterface {
-    override fun test() {}
-
-    override fun testForNonDefault() {}
-
-    override fun testAbstract() {}
-}
-
-interface KotlinInterfaceX  {
-
-    fun test() {}
-
-    fun testForNonDefault() {}
-
-    fun testAbstract() {}
-}
-
-interface KotlinInterfaceManySuper: JavaInterface, KotlinInterfaceX {
-    override fun test() {}
-
-    override fun testForNonDefault() {}
-
-    override fun testAbstract() {}
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverrideAll.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverrideAll.txt
deleted file mode 100644
index 892a3f0ae99..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverrideAll.txt
+++ /dev/null
@@ -1,74 +0,0 @@
-package
-
-public interface JavaInterface {
-    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 fun test(): kotlin.Unit
-    public abstract fun testAbstract(): kotlin.Unit
-    public open fun testForNonDefault(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public open class KotlinClass : JavaInterface {
-    public constructor KotlinClass()
-    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*/ fun test(): kotlin.Unit
-    public open override /*1*/ fun testAbstract(): kotlin.Unit
-    public open override /*1*/ fun testForNonDefault(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface KotlinInterface : JavaInterface {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*1*/ fun test(): kotlin.Unit
-    public open override /*1*/ fun testAbstract(): kotlin.Unit
-    public open override /*1*/ fun testForNonDefault(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface KotlinInterface2 : JavaInterface, KotlinInterface {
-    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 /*2*/ fun test(): kotlin.Unit
-    public open override /*2*/ fun testAbstract(): kotlin.Unit
-    public open override /*2*/ fun testForNonDefault(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface KotlinInterfaceForIndirect : JavaInterface {
-    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 test(): kotlin.Unit
-    public abstract override /*1*/ /*fake_override*/ fun testAbstract(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun testForNonDefault(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface KotlinInterfaceIndirectInheritance : KotlinInterfaceForIndirect {
-    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*/ fun test(): kotlin.Unit
-    public open override /*1*/ fun testAbstract(): kotlin.Unit
-    public open override /*1*/ fun testForNonDefault(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface KotlinInterfaceManySuper : JavaInterface, KotlinInterfaceX {
-    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 /*2*/ fun test(): kotlin.Unit
-    public open override /*2*/ fun testAbstract(): kotlin.Unit
-    public open override /*2*/ fun testForNonDefault(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface KotlinInterfaceX {
-    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 fun test(): kotlin.Unit
-    public open fun testAbstract(): kotlin.Unit
-    public open fun testForNonDefault(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.fir.kt
deleted file mode 100644
index 35aeef20136..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.fir.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-// !JVM_TARGET: 1.8
-
-interface A {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    fun test() {
-    }
-}
-
-interface B : A {
-}
-
-
-open class Foo : B
-open class Foo2 : B, A
-
-open class FooNoError : B {
-    override fun test() {
-    }
-}
-open class Foo2NoError : B, A {
-    override fun test() {
-    }
-}
-
-class Bar : Foo()
-class Bar2 : Foo(), A
-class Bar3 : Foo(), B
-
-open class BarWithJvmDefault : B {
-    <!JVM_DEFAULT_NOT_IN_INTERFACE!>@<!DEPRECATION!>JvmDefault<!><!>
-    override fun test() {
-    }
-}
-
-class BarWithJvmDefaultSuper: BarWithJvmDefault()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.kt
deleted file mode 100644
index e63a100c5b0..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-// !JVM_TARGET: 1.8
-
-interface A {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    fun test()<!> {
-    }
-}
-
-interface B : A {
-}
-
-
-open class Foo : B
-open class Foo2 : B, A
-
-open class FooNoError : B {
-    override fun test() {
-    }
-}
-open class Foo2NoError : B, A {
-    override fun test() {
-    }
-}
-
-class Bar : Foo()
-class Bar2 : Foo(), A
-class Bar3 : Foo(), B
-
-open class BarWithJvmDefault : B {
-    <!JVM_DEFAULT_NOT_IN_INTERFACE!>@<!DEPRECATION!>JvmDefault<!><!>
-    override fun test() {
-    }
-}
-
-class BarWithJvmDefaultSuper: BarWithJvmDefault()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.txt
deleted file mode 100644
index 6b3e3adcff9..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-package
-
-public interface 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
-    @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface 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
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class Bar : Foo {
-    public constructor Bar()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class Bar2 : Foo, A {
-    public constructor Bar2()
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*2*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class Bar3 : Foo, B {
-    public constructor Bar3()
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*2*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public open class BarWithJvmDefault : B {
-    public constructor BarWithJvmDefault()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*1*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class BarWithJvmDefaultSuper : BarWithJvmDefault {
-    public constructor BarWithJvmDefaultSuper()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public open class Foo : B {
-    public constructor 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
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public open class Foo2 : B, A {
-    public constructor Foo2()
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*2*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public open class Foo2NoError : B, A {
-    public constructor Foo2NoError()
-    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 /*2*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public open class FooNoError : B {
-    public constructor FooNoError()
-    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*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt
index 668f15eed33..5ce739c37a4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt
@@ -1,184 +1,68 @@
 // FIR_IDENTICAL
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all
 // !JVM_TARGET: 1.8
 
 public interface KInterface {
-    @<!DEPRECATION!>JvmDefault<!>
     fun test(): String {
         return "OK";
     }
 
-    @<!DEPRECATION!>JvmDefault<!>
     val property: String
         get() = "OK"
-
-
-    fun testNonDefault(): String {
-        return "OK";
-    }
-
-    val propertyNonDefault: String
-        get() = "OK"
 }
 
 // FILE: 1.kt
 
 interface KotlinInterface : KInterface {
-    @<!DEPRECATION!>JvmDefault<!>
     fun fooo() {
         super.test()
         super.property
 
-        super.testNonDefault()
-        super.propertyNonDefault
-
         object  {
             fun run () {
                 super@KotlinInterface.test()
                 super@KotlinInterface.property
-
-                super@KotlinInterface.testNonDefault()
-                super@KotlinInterface.propertyNonDefault
             }
         }
     }
 
-    @<!DEPRECATION!>JvmDefault<!>
     val propertyy: String
         get() {
             super.test()
             super.property
 
-            super.testNonDefault()
-            super.propertyNonDefault
-
             object  {
                 fun run () {
                     super@KotlinInterface.test()
                     super@KotlinInterface.property
-
-                    super@KotlinInterface.testNonDefault()
-                    super@KotlinInterface.propertyNonDefault
                 }
             }
             return ""
         }
-
-    fun foooNonDefault() {
-        super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-        super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
-
-        super.testNonDefault()
-        super.propertyNonDefault
-
-        object  {
-            fun run () {
-                super@KotlinInterface.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-                super@KotlinInterface.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
-
-                super@KotlinInterface.testNonDefault()
-                super@KotlinInterface.propertyNonDefault
-            }
-        }
-    }
-
-    val propertyyNonDefault: String
-        get() {
-            super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-            super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
-
-            super.testNonDefault()
-            super.propertyNonDefault
-
-            object  {
-                fun run () {
-                    super@KotlinInterface.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-                    super@KotlinInterface.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
-
-                    super@KotlinInterface.testNonDefault()
-                    super@KotlinInterface.propertyNonDefault
-                }
-            }
-            return ""
-        }
-
-
 }
 
 interface KotlinInterfaceIndirectInheritance : KotlinInterface {
-    @<!DEPRECATION!>JvmDefault<!>
     fun foooo() {
         super.test()
         super.property
 
-        super.testNonDefault()
-        super.propertyNonDefault
-
         object  {
             fun run () {
                 super@KotlinInterfaceIndirectInheritance.test()
                 super@KotlinInterfaceIndirectInheritance.property
-
-                super@KotlinInterfaceIndirectInheritance.testNonDefault()
-                super@KotlinInterfaceIndirectInheritance.propertyNonDefault
             }
         }
     }
 
-    @<!DEPRECATION!>JvmDefault<!>
     val propertyyy: String
         get() {
             super.test()
             super.property
 
-            super.testNonDefault()
-            super.propertyNonDefault
-
             object  {
                 fun run () {
                     super@KotlinInterfaceIndirectInheritance.test()
                     super@KotlinInterfaceIndirectInheritance.property
-
-                    super@KotlinInterfaceIndirectInheritance.testNonDefault()
-                    super@KotlinInterfaceIndirectInheritance.propertyNonDefault
-                }
-            }
-            return ""
-        }
-
-    fun fooooNonDefault() {
-        super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-        super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
-
-        super.testNonDefault()
-        super.propertyNonDefault
-
-        object  {
-            fun run () {
-                super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-                super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
-
-                super@KotlinInterfaceIndirectInheritance.testNonDefault()
-                super@KotlinInterfaceIndirectInheritance.propertyNonDefault
-            }
-        }
-    }
-
-    val propertyyyNonDefault: String
-        get() {
-            super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-            super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
-
-            super.testNonDefault()
-            super.propertyNonDefault
-
-            object  {
-                fun run () {
-                    super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
-                    super@KotlinInterfaceIndirectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
-
-                    super@KotlinInterfaceIndirectInheritance.testNonDefault()
-                    super@KotlinInterfaceIndirectInheritance.propertyNonDefault
                 }
             }
             return ""
@@ -190,16 +74,10 @@ open class KotlinClass : KInterface {
         super.test()
         super.property
 
-        super.testNonDefault()
-        super.propertyNonDefault
-
         object  {
             fun run () {
                 super@KotlinClass.test()
                 super@KotlinClass.property
-
-                super@KotlinClass.testNonDefault()
-                super@KotlinClass.propertyNonDefault
             }
         }
     }
@@ -209,16 +87,10 @@ open class KotlinClass : KInterface {
             super.test()
             super.property
 
-            super.testNonDefault()
-            super.propertyNonDefault
-
             object  {
                 fun run () {
                     super@KotlinClass.test()
                     super@KotlinClass.property
-
-                    super@KotlinClass.testNonDefault()
-                    super@KotlinClass.propertyNonDefault
                 }
             }
 
@@ -231,16 +103,10 @@ class KotlinClassIndirectInheritance : KotlinClass() {
         super.test()
         super.property
 
-        super.testNonDefault()
-        super.propertyNonDefault
-
         object  {
             fun run () {
                 super@KotlinClassIndirectInheritance.test()
                 super@KotlinClassIndirectInheritance.property
-
-                super@KotlinClassIndirectInheritance.testNonDefault()
-                super@KotlinClassIndirectInheritance.propertyNonDefault
             }
         }
 
@@ -251,16 +117,10 @@ class KotlinClassIndirectInheritance : KotlinClass() {
             super.test()
             super.property
 
-            super.testNonDefault()
-            super.propertyNonDefault
-
             object  {
                 fun run () {
                     super@KotlinClassIndirectInheritance.test()
                     super@KotlinClassIndirectInheritance.property
-
-                    super@KotlinClassIndirectInheritance.testNonDefault()
-                    super@KotlinClassIndirectInheritance.propertyNonDefault
                 }
             }
             return ""
@@ -272,16 +132,10 @@ class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
         super.test()
         super.property
 
-        super.testNonDefault()
-        super.propertyNonDefault
-
         object  {
             fun run () {
                 super@KotlinClassIndirectInheritance2.test()
                 super@KotlinClassIndirectInheritance2.property
-
-                super@KotlinClassIndirectInheritance2.testNonDefault()
-                super@KotlinClassIndirectInheritance2.propertyNonDefault
             }
         }
     }
@@ -291,16 +145,10 @@ class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
             super.test()
             super.property
 
-            super.testNonDefault()
-            super.propertyNonDefault
-
             object  {
                 fun run () {
                     super@KotlinClassIndirectInheritance2.test()
                     super@KotlinClassIndirectInheritance2.property
-
-                    super@KotlinClassIndirectInheritance2.testNonDefault()
-                    super@KotlinClassIndirectInheritance2.propertyNonDefault
                 }
             }
             return ""
@@ -310,14 +158,9 @@ class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
 fun test() {
     KotlinClass().test()
     KotlinClass().property
-    KotlinClass().propertyNonDefault
     KotlinClassIndirectInheritance2().test()
-    KotlinClassIndirectInheritance2().testNonDefault()
     KotlinClassIndirectInheritance2().propertyyy
-    KotlinClassIndirectInheritance2().propertyyyNonDefault
 
     KotlinClass().test()
-    KotlinClass().testNonDefault()
     KotlinClass().property
-    KotlinClass().propertyNonDefault
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.txt
index 400f40a13c2..67052833dac 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.txt
@@ -3,92 +3,71 @@ package
 public fun test(): kotlin.Unit
 
 public interface KInterface {
-    @kotlin.jvm.JvmDefault public open val property: kotlin.String
-    public open val propertyNonDefault: kotlin.String
+    public open val property: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open fun test(): kotlin.String
-    public open fun testNonDefault(): kotlin.String
+    public open fun test(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public open class KotlinClass : KInterface {
     public constructor KotlinClass()
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
-    public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
+    public open override /*1*/ /*fake_override*/ val property: kotlin.String
     public final val xproperty: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun foo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun testNonDefault(): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public final class KotlinClassIndirectInheritance : KotlinClass {
     public constructor KotlinClassIndirectInheritance()
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
+    public open override /*1*/ /*fake_override*/ val property: kotlin.String
     public final val property2: kotlin.String
-    public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
     public final override /*1*/ /*fake_override*/ val xproperty: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
     public final fun foo2(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun testNonDefault(): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public final class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
     public constructor KotlinClassIndirectInheritance2()
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
-    public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
-    public open override /*1*/ /*fake_override*/ val propertyyNonDefault: kotlin.String
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String
-    public open override /*1*/ /*fake_override*/ val propertyyyNonDefault: kotlin.String
+    public open override /*1*/ /*fake_override*/ val property: kotlin.String
+    public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
+    public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String
     public final val xproperty: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun foo(): kotlin.Unit
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun fooo(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun foooNonDefault(): kotlin.Unit
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun foooo(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun fooooNonDefault(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun fooo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun foooo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun testNonDefault(): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface KotlinInterface : KInterface {
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
-    public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
-    @kotlin.jvm.JvmDefault public open val propertyy: kotlin.String
-    public open val propertyyNonDefault: kotlin.String
+    public open override /*1*/ /*fake_override*/ val property: kotlin.String
+    public open val propertyy: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.jvm.JvmDefault public open fun fooo(): kotlin.Unit
-    public open fun foooNonDefault(): kotlin.Unit
+    public open fun fooo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun testNonDefault(): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface KotlinInterfaceIndirectInheritance : KotlinInterface {
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
-    public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
-    public open override /*1*/ /*fake_override*/ val propertyyNonDefault: kotlin.String
-    @kotlin.jvm.JvmDefault public open val propertyyy: kotlin.String
-    public open val propertyyyNonDefault: kotlin.String
+    public open override /*1*/ /*fake_override*/ val property: kotlin.String
+    public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
+    public open val propertyyy: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun fooo(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun foooNonDefault(): kotlin.Unit
-    @kotlin.jvm.JvmDefault public open fun foooo(): kotlin.Unit
-    public open fun fooooNonDefault(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun fooo(): kotlin.Unit
+    public open fun foooo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
-    public open override /*1*/ /*fake_override*/ fun testNonDefault(): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt
index 0e4f2e708b8..66ce37f81d2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt
@@ -1,5 +1,5 @@
 // FIR_IDENTICAL
-// !JVM_DEFAULT_MODE: enable
+// !JVM_DEFAULT_MODE: all
 // !JVM_TARGET: 1.8
 // FILE: JavaInterface.java
 
@@ -16,7 +16,6 @@ public interface JavaInterface {
 // FILE: 1.kt
 
 interface KotlinInterface : JavaInterface {
-    @<!DEPRECATION!>JvmDefault<!>
     fun fooo() {
         super.test()
 
@@ -27,7 +26,6 @@ interface KotlinInterface : JavaInterface {
         }
     }
 
-    @<!DEPRECATION!>JvmDefault<!>
     val propertyy: String
         get() {
             super.test()
@@ -40,14 +38,12 @@ interface KotlinInterface : JavaInterface {
             return ""
         }
 
-    @<!DEPRECATION!>JvmDefault<!>
     override fun testOverride(): String {
         return "OK";
     }
 }
 
 interface KotlinInterfaceIndirectInheritance : KotlinInterface {
-    @<!DEPRECATION!>JvmDefault<!>
     fun foooo() {
         super.test()
 
@@ -58,7 +54,6 @@ interface KotlinInterfaceIndirectInheritance : KotlinInterface {
         }
     }
 
-    @<!DEPRECATION!>JvmDefault<!>
     val propertyyy: String
         get() {
             super.test()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.txt
index d6bf75a67d4..58f6638d8f1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.txt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.txt
@@ -37,36 +37,37 @@ public final class KotlinClassIndirectInheritance : KotlinClass {
 public final class KotlinClassIndirectInheritance2 : KotlinInterfaceIndirectInheritance {
     public constructor KotlinClassIndirectInheritance2()
     public final val property: kotlin.String
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String
+    public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
+    public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
     public final fun foo(): kotlin.Unit
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun fooo(): kotlin.Unit
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun foooo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun fooo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun foooo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun test(): kotlin.String!
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun testOverride(): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun testOverride(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface KotlinInterface : JavaInterface {
-    @kotlin.jvm.JvmDefault public open val propertyy: kotlin.String
+    public open val propertyy: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.jvm.JvmDefault public open fun fooo(): kotlin.Unit
+    public open fun fooo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun test(): kotlin.String!
-    @kotlin.jvm.JvmDefault public open override /*1*/ fun testOverride(): kotlin.String
+    public open override /*1*/ fun testOverride(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
 
 public interface KotlinInterfaceIndirectInheritance : KotlinInterface {
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
-    @kotlin.jvm.JvmDefault public open val propertyyy: kotlin.String
+    public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
+    public open val propertyyy: kotlin.String
     public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun fooo(): kotlin.Unit
-    @kotlin.jvm.JvmDefault public open fun foooo(): kotlin.Unit
+    public open override /*1*/ /*fake_override*/ fun fooo(): kotlin.Unit
+    public open fun foooo(): kotlin.Unit
     public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
     public open override /*1*/ /*fake_override*/ fun test(): kotlin.String!
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun testOverride(): kotlin.String
+    public open override /*1*/ /*fake_override*/ fun testOverride(): kotlin.String
     public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
 }
+
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.fir.kt
deleted file mode 100644
index dabda030cf9..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.fir.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-// !JVM_TARGET: 1.8
-
-interface B {
-
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    fun test() {}
-
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    abstract fun test2(s: String = "")
-
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    abstract fun test3()
-
-
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    abstract val prop: String
-
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    abstract val prop2: String
-
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    val prop3: String
-        get() = ""
-
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    var prop4: String
-        get() = ""
-        set(value) {}
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt
deleted file mode 100644
index 0106e3ef2c6..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-// !JVM_TARGET: 1.8
-
-interface B {
-
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    fun test()<!> {}
-
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    abstract fun test2(s: String = "")<!>
-
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    abstract fun test3()<!>
-
-
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    abstract val prop: String<!>
-
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    abstract val prop2: String<!>
-
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    val prop3: String<!>
-        get() = ""
-
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    var prop4: String<!>
-        get() = ""
-        set(value) {}
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.txt
deleted file mode 100644
index e804d227eb0..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-package
-
-public interface B {
-    @kotlin.jvm.JvmDefault public abstract val prop: kotlin.String
-    @kotlin.jvm.JvmDefault public abstract val prop2: kotlin.String
-    @kotlin.jvm.JvmDefault public open val prop3: kotlin.String
-    @kotlin.jvm.JvmDefault public open var prop4: kotlin.String
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit
-    @kotlin.jvm.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
-    @kotlin.jvm.JvmDefault public abstract fun test3(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt
deleted file mode 100644
index 22451a9a42a..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-// FIR_IDENTICAL
-// !JVM_TARGET: 1.8
-
-abstract class A {
-
-    <!JVM_DEFAULT_NOT_IN_INTERFACE!>@<!DEPRECATION!>JvmDefault<!><!>
-    fun test() {}
-
-    <!JVM_DEFAULT_NOT_IN_INTERFACE!>@<!DEPRECATION!>JvmDefault<!><!>
-    abstract fun test2(s: String = "")
-
-    <!JVM_DEFAULT_NOT_IN_INTERFACE!>@<!DEPRECATION!>JvmDefault<!><!>
-    abstract fun test3()
-}
-
-object B {
-
-    <!JVM_DEFAULT_NOT_IN_INTERFACE!>@<!DEPRECATION!>JvmDefault<!><!>
-    fun test() {}
-
-    <!JVM_DEFAULT_NOT_IN_INTERFACE!>@<!DEPRECATION!>JvmDefault<!><!>
-    fun test2(s: String = "") {}
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.txt
deleted file mode 100644
index 437125aebe0..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-package
-
-public abstract class A {
-    public 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
-    @kotlin.jvm.JvmDefault public final fun test(): kotlin.Unit
-    @kotlin.jvm.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
-    @kotlin.jvm.JvmDefault public abstract fun test3(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public object B {
-    private constructor B()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public final fun test(): kotlin.Unit
-    @kotlin.jvm.JvmDefault public final fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt
deleted file mode 100644
index b6a4fcb2f79..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-// FIR_IDENTICAL
-// !JVM_TARGET: 1.8
-// !JVM_DEFAULT_MODE: enable
-
-interface B {
-
-    @<!DEPRECATION!>JvmDefault<!>
-    val prop1: String
-    <!WRONG_ANNOTATION_TARGET!>@<!DEPRECATION!>JvmDefault<!><!> get() = ""
-
-
-    var prop2: String
-        <!WRONG_ANNOTATION_TARGET!>@<!DEPRECATION!>JvmDefault<!><!> get() = ""
-        <!WRONG_ANNOTATION_TARGET!>@<!DEPRECATION!>JvmDefault<!><!> set(value) {}
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.txt
deleted file mode 100644
index b4aafc9ca9b..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-package
-
-public interface B {
-    @kotlin.jvm.JvmDefault @get:kotlin.jvm.JvmDefault public open val prop1: kotlin.String
-    @get:kotlin.jvm.JvmDefault @set:kotlin.jvm.JvmDefault public open var prop2: kotlin.String
-    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/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt
deleted file mode 100644
index 60624676191..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-// FIR_IDENTICAL
-// !JVM_TARGET: 1.8
-// !JVM_DEFAULT_MODE: enable
-
-interface A {
-    @<!DEPRECATION!>JvmDefault<!>
-    fun test() {}
-}
-
-interface Abstract : A {
-    <!JVM_DEFAULT_REQUIRED_FOR_OVERRIDE!>override fun test()<!>
-}
-
-interface ANonDefault {
-    fun test() {}
-}
-
-interface B: A {
-    <!JVM_DEFAULT_REQUIRED_FOR_OVERRIDE!>override fun test()<!> {}
-}
-
-interface C: ANonDefault, A {
-    <!JVM_DEFAULT_REQUIRED_FOR_OVERRIDE!>override fun test()<!> {}
-}
-
-interface D: A, ANonDefault {
-    <!JVM_DEFAULT_REQUIRED_FOR_OVERRIDE!>override fun test()<!> {}
-}
-
-class Foo : A {
-    override fun test() {}
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.txt
deleted file mode 100644
index 664cf34353e..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-package
-
-public interface 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
-    @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface ANonDefault {
-    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 fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface Abstract : 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 abstract override /*1*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface 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*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface C : ANonDefault, A {
-    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 /*2*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface D : A, ANonDefault {
-    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 /*2*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class Foo : A {
-    public constructor 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*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.fir.kt
deleted file mode 100644
index c6b3082d893..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.fir.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-// !JVM_TARGET: 1.8
-// !JVM_DEFAULT_MODE: enable
-
-interface A {
-    @<!DEPRECATION!>JvmDefault<!>
-    val test: String
-        get() = "OK"
-}
-
-interface Abstract : A {
-    override val test: String
-}
-
-interface ANonDefault {
-    val test: String
-        get() = "ANonDefault"
-}
-
-interface B: A {
-    override val test: String
-        get() = "B"
-}
-
-interface C: ANonDefault, A {
-    override val test: String
-        get() = "C"
-}
-
-interface D: A, ANonDefault {
-    override val test: String
-        get() = "C"
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt
deleted file mode 100644
index 5232315c24e..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-// !JVM_TARGET: 1.8
-// !JVM_DEFAULT_MODE: enable
-
-interface A {
-    @<!DEPRECATION!>JvmDefault<!>
-    val test: String
-        get() = "OK"
-}
-
-interface Abstract : A {
-    <!JVM_DEFAULT_REQUIRED_FOR_OVERRIDE!>override val test: String<!>
-}
-
-interface ANonDefault {
-    val test: String
-        get() = "ANonDefault"
-}
-
-interface B: A {
-    <!JVM_DEFAULT_REQUIRED_FOR_OVERRIDE!>override val test: String<!>
-        get() = "B"
-}
-
-interface C: ANonDefault, A {
-    <!JVM_DEFAULT_REQUIRED_FOR_OVERRIDE!>override val test: String<!>
-        get() = "C"
-}
-
-interface D: A, ANonDefault {
-    <!JVM_DEFAULT_REQUIRED_FOR_OVERRIDE!>override val test: String<!>
-        get() = "C"
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.txt
deleted file mode 100644
index 423d0b1282d..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-package
-
-public interface A {
-    @kotlin.jvm.JvmDefault public open val test: kotlin.String
-    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 ANonDefault {
-    public open val test: kotlin.String
-    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 Abstract : A {
-    public abstract override /*1*/ val test: kotlin.String
-    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 B : A {
-    public open override /*1*/ val test: kotlin.String
-    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 C : ANonDefault, A {
-    public open override /*2*/ val test: kotlin.String
-    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 /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface D : A, ANonDefault {
-    public open override /*2*/ val test: kotlin.String
-    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 /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.fir.kt
deleted file mode 100644
index 4b7b2d1915e..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.fir.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-// !JVM_TARGET: 1.8
-// !LANGUAGE: -QualifiedSupertypeMayBeExtendedByOtherSupertype
-// FILE: 1.kt
-interface A {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    fun test() {
-    }
-}
-
-// FILE: 2.kt
-interface B : A {
-
-}
-
-interface C : B {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    override fun test() {
-        super.test()
-    }
-}
-
-open class Foo : B {
-    override fun test() {
-        super.test()
-    }
-}
-open class Foo2 : B
-
-open class Bar : Foo2() {
-    override fun test() {
-        super.test()
-    }
-}
-
-open class Bar2 : Bar() {
-    override fun test() {
-        super.test()
-    }
-}
-
-class ManySupers: Foo2(), B {
-    fun foo() {
-        super<Foo2>.test()
-        super<<!QUALIFIED_SUPERTYPE_EXTENDED_BY_OTHER_SUPERTYPE!>B<!>>.test()
-        <!AMBIGUOUS_SUPER!>super<!>.test()
-    }
-}
-
-class ManySupers2: Foo2(), C {
-    fun foo() {
-        super<Foo2>.test()
-        super<C>.test()
-        <!AMBIGUOUS_SUPER!>super<!>.test()
-    }
-}
-
-<!MANY_IMPL_MEMBER_NOT_IMPLEMENTED!>class ManySupers3<!>: Bar2(), C {
-    fun foo() {
-        super<Bar2>.test()
-        super<C>.test()
-        <!AMBIGUOUS_SUPER!>super<!>.test()
-    }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.kt
deleted file mode 100644
index d16a4ab02e7..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-// !JVM_TARGET: 1.8
-// !LANGUAGE: -QualifiedSupertypeMayBeExtendedByOtherSupertype
-// FILE: 1.kt
-interface A {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    fun test()<!> {
-    }
-}
-
-// FILE: 2.kt
-interface B : A {
-
-}
-
-interface C : B {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    override fun test()<!> {
-        super.test()
-    }
-}
-
-open class Foo : B {
-    override fun test() {
-        super.test()
-    }
-}
-open class Foo2 : B
-
-open class Bar : Foo2() {
-    override fun test() {
-        super.test()
-    }
-}
-
-open class Bar2 : Bar() {
-    override fun test() {
-        super.test()
-    }
-}
-
-class ManySupers: Foo2(), B {
-    fun foo() {
-        super<Foo2>.test()
-        super<<!QUALIFIED_SUPERTYPE_EXTENDED_BY_OTHER_SUPERTYPE!>B<!>>.test()
-        <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>test<!>()
-    }
-}
-
-class ManySupers2: Foo2(), C {
-    fun foo() {
-        super<Foo2>.test()
-        super<C>.test()
-        <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>test<!>()
-    }
-}
-
-<!MANY_IMPL_MEMBER_NOT_IMPLEMENTED!>class ManySupers3<!>: Bar2(), C {
-    fun foo() {
-        super<Bar2>.test()
-        super<C>.test()
-        <!AMBIGUOUS_SUPER!>super<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>test<!>()
-    }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.txt
deleted file mode 100644
index 6b2cd424ce2..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.txt
+++ /dev/null
@@ -1,81 +0,0 @@
-package
-
-public interface 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
-    @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface 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
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public open class Bar : Foo2 {
-    public constructor Bar()
-    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*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public open class Bar2 : Bar {
-    public constructor Bar2()
-    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*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface C : B {
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*1*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public open class Foo : B {
-    public constructor 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*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public open class Foo2 : B {
-    public constructor Foo2()
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class ManySupers : Foo2, B {
-    public constructor ManySupers()
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*2*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class ManySupers2 : Foo2, C {
-    public constructor ManySupers2()
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*2*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class ManySupers3 : Bar2, C {
-    public constructor ManySupers3()
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity.fir.kt
deleted file mode 100644
index 2587b5eb0a1..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity.fir.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-// !JVM_TARGET: 1.8
-interface A {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    fun test() {
-    }
-}
-
-interface B{
-    fun test() {
-    }
-}
-
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>interface AB<!>: A, B
-
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>interface BA<!>: B, A
-
-
-interface C : A, B {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    override fun test() {
-        super<B>.test()
-        super<A>.test()
-    }
-}
-
-interface D : B, A {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    override fun test() {
-        super<B>.test()
-        super<A>.test()
-    }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity.kt
deleted file mode 100644
index 77053e43d3c..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-// !JVM_TARGET: 1.8
-interface A {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    fun test()<!> {
-    }
-}
-
-interface B{
-    fun test() {
-    }
-}
-
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>interface AB<!>: A, B
-
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>interface BA<!>: B, A
-
-
-interface C : A, B {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    override fun test()<!> {
-        super<B>.test()
-        super<A>.test()
-    }
-}
-
-interface D : B, A {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    override fun test()<!> {
-        super<B>.test()
-        super<A>.test()
-    }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity.txt
deleted file mode 100644
index e566b4d40c0..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-package
-
-public interface 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
-    @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface AB : A, B {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*2*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*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 override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface BA : B, A {
-    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 /*2*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface C : A, B {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*2*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface D : B, A {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*2*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity2.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity2.fir.kt
deleted file mode 100644
index 115d09ff450..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity2.fir.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-// !JVM_TARGET: 1.8
-interface A {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    fun test()
-}
-
-interface B{
-    fun test() {
-    }
-}
-
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>interface AB<!>: A, B
-
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>interface BA<!>: B, A
-
-class C : A, B {
-    override fun test() {
-        super<B>.test()
-    }
-}
-
-class D : B, A {
-    override fun test() {
-        super<B>.test()
-    }
-}
-
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>class E<!>: B, A {
-    fun foo() {
-        super<B>.test()
-    }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity2.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity2.kt
deleted file mode 100644
index 4a5bfe788af..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity2.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-// !JVM_TARGET: 1.8
-interface A {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    fun test()<!>
-}
-
-interface B{
-    fun test() {
-    }
-}
-
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>interface AB<!>: A, B
-
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>interface BA<!>: B, A
-
-class C : A, B {
-    override fun test() {
-        super<B>.test()
-    }
-}
-
-class D : B, A {
-    override fun test() {
-        super<B>.test()
-    }
-}
-
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>class E<!>: B, A {
-    fun foo() {
-        super<B>.test()
-    }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity2.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity2.txt
deleted file mode 100644
index ac40e6522ae..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity2.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-package
-
-public interface 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
-    @kotlin.jvm.JvmDefault public abstract fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface AB : A, B {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*2*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*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 override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface BA : B, A {
-    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 /*2*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class C : A, B {
-    public constructor C()
-    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 /*2*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class D : B, A {
-    public constructor D()
-    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 /*2*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class E : B, A {
-    public constructor E()
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity3.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity3.fir.kt
deleted file mode 100644
index 925c0d6707c..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity3.fir.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-// !JVM_TARGET: 1.8
-interface A {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!><!>
-    fun test() {
-
-    }
-}
-
-interface B{
-    fun test()
-}
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>interface AB<!> : A, B
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>interface BA<!> : B, A
-
-class C : A, B {
-    override fun test() {
-        super<A>.test()
-    }
-}
-
-class D : B, A {
-    override fun test() {
-        super<A>.test()
-    }
-}
-
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>class E<!>: B, A {
-    fun foo() {
-        super<A>.test()
-    }
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity3.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity3.kt
deleted file mode 100644
index 5bbb17e1592..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity3.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-// !JVM_TARGET: 1.8
-interface A {
-    <!JVM_DEFAULT_IN_DECLARATION!>@<!DEPRECATION!>JvmDefault<!>
-    fun test()<!> {
-
-    }
-}
-
-interface B{
-    fun test()
-}
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>interface AB<!> : A, B
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>interface BA<!> : B, A
-
-class C : A, B {
-    override fun test() {
-        super<A>.test()
-    }
-}
-
-class D : B, A {
-    override fun test() {
-        super<A>.test()
-    }
-}
-
-<!MANY_INTERFACES_MEMBER_NOT_IMPLEMENTED!>class E<!>: B, A {
-    fun foo() {
-        super<A>.test()
-    }
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity3.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity3.txt
deleted file mode 100644
index 6ad3e5834c2..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity3.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-package
-
-public interface 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
-    @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface AB : A, B {
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open override /*2*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*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 override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public abstract fun test(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface BA : B, A {
-    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 /*2*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class C : A, B {
-    public constructor C()
-    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 /*2*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class D : B, A {
-    public constructor D()
-    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 /*2*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class E : B, A {
-    public constructor E()
-    public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public final fun foo(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*2*/ /*fake_override*/ fun test(): kotlin.Unit
-    public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt
deleted file mode 100644
index 0d5a6dd8ab3..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-// FIR_IDENTICAL
-// !JVM_TARGET: 1.6
-
-interface B {
-
-    <!JVM_DEFAULT_IN_JVM6_TARGET!>@<!DEPRECATION!>JvmDefault<!><!>
-    fun test() {}
-
-    <!JVM_DEFAULT_IN_JVM6_TARGET!>@<!DEPRECATION!>JvmDefault<!><!>
-    abstract fun test2(s: String = "")
-
-    <!JVM_DEFAULT_IN_JVM6_TARGET!>@<!DEPRECATION!>JvmDefault<!><!>
-    abstract fun test3()
-
-
-    <!JVM_DEFAULT_IN_JVM6_TARGET!>@<!DEPRECATION!>JvmDefault<!><!>
-    abstract val prop: String
-
-    <!JVM_DEFAULT_IN_JVM6_TARGET!>@<!DEPRECATION!>JvmDefault<!><!>
-    abstract val prop2: String
-
-    <!JVM_DEFAULT_IN_JVM6_TARGET!>@<!DEPRECATION!>JvmDefault<!><!>
-    val prop3: String
-        get() = ""
-
-    <!JVM_DEFAULT_IN_JVM6_TARGET!>@<!DEPRECATION!>JvmDefault<!><!>
-    var prop4: String
-        get() = ""
-        set(value) {}
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.txt
deleted file mode 100644
index e804d227eb0..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-package
-
-public interface B {
-    @kotlin.jvm.JvmDefault public abstract val prop: kotlin.String
-    @kotlin.jvm.JvmDefault public abstract val prop2: kotlin.String
-    @kotlin.jvm.JvmDefault public open val prop3: kotlin.String
-    @kotlin.jvm.JvmDefault public open var prop4: kotlin.String
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit
-    @kotlin.jvm.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
-    @kotlin.jvm.JvmDefault public abstract fun test3(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt
deleted file mode 100644
index 701beb7cded..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-// FIR_IDENTICAL
-// !JVM_TARGET: 1.8
-// !JVM_DEFAULT_MODE: enable
-
-interface B {
-
-    @<!DEPRECATION!>JvmDefault<!>
-    fun test() {}
-
-    @<!DEPRECATION!>JvmDefault<!>
-    abstract fun test2(s: String = "")
-
-    @<!DEPRECATION!>JvmDefault<!>
-    abstract fun test3()
-
-
-    @<!DEPRECATION!>JvmDefault<!>
-    abstract val prop: String
-
-    @<!DEPRECATION!>JvmDefault<!>
-    abstract val prop2: String
-
-    @<!DEPRECATION!>JvmDefault<!>
-    val prop3: String
-        get() = ""
-
-    @<!DEPRECATION!>JvmDefault<!>
-    var prop4: String
-        get() = ""
-        set(value) {}
-}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.txt b/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.txt
deleted file mode 100644
index e804d227eb0..00000000000
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-package
-
-public interface B {
-    @kotlin.jvm.JvmDefault public abstract val prop: kotlin.String
-    @kotlin.jvm.JvmDefault public abstract val prop2: kotlin.String
-    @kotlin.jvm.JvmDefault public open val prop3: kotlin.String
-    @kotlin.jvm.JvmDefault public open var prop4: kotlin.String
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    @kotlin.jvm.JvmDefault public open fun test(): kotlin.Unit
-    @kotlin.jvm.JvmDefault public abstract fun test2(/*0*/ s: kotlin.String = ...): kotlin.Unit
-    @kotlin.jvm.JvmDefault public abstract fun test3(): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/writeFlags/jvm8/defaults/compatibility/defaultImplementations.kt b/compiler/testData/writeFlags/jvm8/defaults/all-compatibility/defaultImplementations.kt
similarity index 80%
rename from compiler/testData/writeFlags/jvm8/defaults/compatibility/defaultImplementations.kt
rename to compiler/testData/writeFlags/jvm8/defaults/all-compatibility/defaultImplementations.kt
index b3905cb996a..2ccbe83c05f 100644
--- a/compiler/testData/writeFlags/jvm8/defaults/compatibility/defaultImplementations.kt
+++ b/compiler/testData/writeFlags/jvm8/defaults/all-compatibility/defaultImplementations.kt
@@ -1,9 +1,8 @@
-// !JVM_DEFAULT_MODE: compatibility
+// !JVM_DEFAULT_MODE: all-compatibility
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 
 interface A {
-    @JvmDefault
     fun foo(x: Int = 0): Int {
         return x
     }
@@ -19,4 +18,4 @@ interface A {
 
 // TESTED_OBJECT_KIND: function
 // TESTED_OBJECTS: A$DefaultImpls, foo$default
-// FLAGS: ACC_PUBLIC, ACC_SYNTHETIC, ACC_STATIC
\ No newline at end of file
+// FLAGS: ACC_PUBLIC, ACC_SYNTHETIC, ACC_STATIC
diff --git a/compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAccessors.kt b/compiler/testData/writeFlags/jvm8/defaults/all-compatibility/propertyAccessors.kt
similarity index 88%
rename from compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAccessors.kt
rename to compiler/testData/writeFlags/jvm8/defaults/all-compatibility/propertyAccessors.kt
index 2eb39b16b1f..b4d8742c428 100644
--- a/compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAccessors.kt
+++ b/compiler/testData/writeFlags/jvm8/defaults/all-compatibility/propertyAccessors.kt
@@ -1,13 +1,11 @@
-// !JVM_DEFAULT_MODE: compatibility
+// !JVM_DEFAULT_MODE: all-compatibility
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 
 interface Test {
-    @JvmDefault
     val test: String
         get() = "OK"
 
-    @JvmDefault
     var test2: String
         get() = "OK"
         set(field) {}
@@ -24,4 +22,3 @@ interface Test {
 // TESTED_OBJECT_KIND: function
 // TESTED_OBJECTS: Test, access$setTest2$jd
 // FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC
-
diff --git a/compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAnnotation.kt b/compiler/testData/writeFlags/jvm8/defaults/all-compatibility/propertyAnnotation.kt
similarity index 78%
rename from compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAnnotation.kt
rename to compiler/testData/writeFlags/jvm8/defaults/all-compatibility/propertyAnnotation.kt
index 484be1817ad..86f72326f53 100644
--- a/compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAnnotation.kt
+++ b/compiler/testData/writeFlags/jvm8/defaults/all-compatibility/propertyAnnotation.kt
@@ -1,5 +1,4 @@
-// !JVM_DEFAULT_MODE: compatibility
-// !LANGUAGE: +UseGetterNameForPropertyAnnotationsMethodOnJvm
+// !JVM_DEFAULT_MODE: all-compatibility
 // JVM_TARGET: 1.8
 // WITH_STDLIB
 
@@ -7,7 +6,6 @@ annotation class Property(val value: String)
 
 interface Test {
     @Property("OK")
-    @JvmDefault
     val test: String
         get() = "OK"
 }
diff --git a/compiler/testData/writeFlags/jvm8/defaults/defaultMethod.kt b/compiler/testData/writeFlags/jvm8/defaults/defaultMethod.kt
deleted file mode 100644
index 426edb08bed..00000000000
--- a/compiler/testData/writeFlags/jvm8/defaults/defaultMethod.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Test {
-    @JvmDefault
-    fun test(): String {
-        return "OK"
-    }
-
-    fun testAbstract(): String
-
-    fun testDefaultImpl() {
-
-    }
-}
-
-// TESTED_OBJECT_KIND: function
-// TESTED_OBJECTS: Test, test
-// FLAGS: ACC_PUBLIC
-
-// TESTED_OBJECT_KIND: function
-// TESTED_OBJECTS: Test, testAbstract
-// FLAGS: ACC_PUBLIC, ACC_ABSTRACT
-
-// TESTED_OBJECT_KIND: function
-// TESTED_OBJECTS: Test, testDefaultImpl
-// FLAGS: ACC_PUBLIC, ACC_ABSTRACT
-
-// TESTED_OBJECT_KIND: function
-// TESTED_OBJECTS: Test$DefaultImpls, test
-// ABSENT: TRUE
-
-// TESTED_OBJECT_KIND: function
-// TESTED_OBJECTS: Test$DefaultImpls, testAbstract
-// ABSENT: TRUE
-
-// TESTED_OBJECT_KIND: function
-// TESTED_OBJECTS: Test$DefaultImpls, testDefaultImpl
-// FLAGS: ACC_PUBLIC, ACC_STATIC
diff --git a/compiler/testData/writeFlags/jvm8/defaults/defaultProperty.kt b/compiler/testData/writeFlags/jvm8/defaults/defaultProperty.kt
deleted file mode 100644
index 1455712458d..00000000000
--- a/compiler/testData/writeFlags/jvm8/defaults/defaultProperty.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Test {
-    @JvmDefault
-    var z: String
-        get() = "OK"
-        set(value) {}
-}
-
-// TESTED_OBJECT_KIND: function
-// TESTED_OBJECTS: Test, getZ
-// FLAGS: ACC_PUBLIC
-
-// TESTED_OBJECT_KIND: function
-// TESTED_OBJECTS: Test, setZ
-// FLAGS: ACC_PUBLIC
diff --git a/compiler/testData/writeFlags/jvm8/defaults/onlyJvmDefaultsOnInterface.kt b/compiler/testData/writeFlags/jvm8/defaults/onlyJvmDefaultsOnInterface.kt
deleted file mode 100644
index 8891bf2de84..00000000000
--- a/compiler/testData/writeFlags/jvm8/defaults/onlyJvmDefaultsOnInterface.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-interface Test {
-    @JvmDefault
-    fun foo(): String {
-        return "OK"
-    }
-
-    @JvmDefault
-    fun bar(x: String = "OK"): String {
-        return x
-    }
-}
-
-
-// TESTED_OBJECT_KIND: innerClass
-// TESTED_OBJECTS: Test, DefaultImpls
-// ABSENT: TRUE
\ No newline at end of file
diff --git a/compiler/testData/writeFlags/jvm8/defaults/privateAccessorNaming.kt b/compiler/testData/writeFlags/jvm8/defaults/privateAccessorNaming.kt
deleted file mode 100644
index 8bd44a4074f..00000000000
--- a/compiler/testData/writeFlags/jvm8/defaults/privateAccessorNaming.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// IGNORE_BACKEND_K2: JVM_IR
-// TARGET_BACKEND: JVM
-// !JVM_DEFAULT_MODE: enable
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-interface I {
-
-    @JvmDefault
-    private fun foo() = 4
-
-    fun bar() = { foo() + 5 }()
-
-}
-
-
-// TESTED_OBJECT_KIND: function
-// TESTED_OBJECTS: I, access$foo
-// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC
\ No newline at end of file
diff --git a/compiler/testData/writeFlags/jvm8/defaults/propertyAnnotation.kt b/compiler/testData/writeFlags/jvm8/defaults/propertyAnnotation.kt
deleted file mode 100644
index 9ab70203ea7..00000000000
--- a/compiler/testData/writeFlags/jvm8/defaults/propertyAnnotation.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// !LANGUAGE: +UseGetterNameForPropertyAnnotationsMethodOnJvm
-// JVM_TARGET: 1.8
-// WITH_STDLIB
-
-annotation class Property(val value: String)
-
-interface Test {
-    @Property("OK")
-    @JvmDefault
-    val test: String
-        get() = "OK"
-
-    fun stub() {}
-}
-
-// TESTED_OBJECT_KIND: function
-// TESTED_OBJECTS: Test, getTest$annotations
-// ABSENT: TRUE
-
-// TESTED_OBJECT_KIND: function
-// TESTED_OBJECTS: Test$DefaultImpls, getTest$annotations
-// FLAGS: ACC_PUBLIC, ACC_STATIC, ACC_SYNTHETIC, ACC_DEPRECATED
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 8d1b6ab58ee..1c5bf53ad75 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -37015,24 +37015,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/generic.kt");
                 }
 
-                @Test
-                @TestMetadata("javaOverride.kt")
-                public void testJavaOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("javaOverrideAll.kt")
-                public void testJavaOverrideAll() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/javaOverrideAll.kt");
-                }
-
-                @Test
-                @TestMetadata("jvmDefaultInInheritance.kt")
-                public void testJvmDefaultInInheritance() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultInInheritance.kt");
-                }
-
                 @Test
                 @TestMetadata("jvmDefaults.kt")
                 public void testJvmDefaults() throws Exception {
@@ -37045,72 +37027,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                     runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt");
                 }
 
-                @Test
-                @TestMetadata("noJvmDefaultFlag.kt")
-                public void testNoJvmDefaultFlag() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/noJvmDefaultFlag.kt");
-                }
-
-                @Test
-                @TestMetadata("notInterface.kt")
-                public void testNotInterface() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/notInterface.kt");
-                }
-
-                @Test
-                @TestMetadata("propertyAccessor.kt")
-                public void testPropertyAccessor() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/propertyAccessor.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleOverride.kt")
-                public void testSimpleOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simpleOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("simplePropertyOverride.kt")
-                public void testSimplePropertyOverride() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/simplePropertyOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("superCall.kt")
-                public void testSuperCall() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCall.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity.kt")
-                public void testSuperCallAmbiguity() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity2.kt")
-                public void testSuperCallAmbiguity2() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity2.kt");
-                }
-
-                @Test
-                @TestMetadata("superCallAmbiguity3.kt")
-                public void testSuperCallAmbiguity3() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/superCallAmbiguity3.kt");
-                }
-
-                @Test
-                @TestMetadata("target6.kt")
-                public void testTarget6() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target6.kt");
-                }
-
-                @Test
-                @TestMetadata("target8.kt")
-                public void testTarget8() throws Exception {
-                    runTest("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/target8.kt");
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/allCompatibility")
                 @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
index e667dc86cc0..bdda60e8214 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxCodegenTestGenerated.java
@@ -7841,6 +7841,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
                 }
 
+                @Test
+                @TestMetadata("callStackTrace.kt")
+                public void testCallStackTrace() throws Exception {
+                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/callStackTrace.kt");
+                }
+
                 @Test
                 @TestMetadata("superCall.kt")
                 public void testSuperCall() throws Exception {
@@ -7853,12 +7859,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt");
                 }
 
-                @Test
-                @TestMetadata("superCallFromInterface2.kt")
-                public void testSuperCallFromInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt");
-                }
-
                 @Test
                 @TestMetadata("superPropAccess.kt")
                 public void testSuperPropAccess() throws Exception {
@@ -7871,12 +7871,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt");
                 }
 
-                @Test
-                @TestMetadata("superPropAccessFromInterface2.kt")
-                public void testSuperPropAccessFromInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt");
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility")
                 @TestDataPath("$PROJECT_ROOT")
@@ -8007,28 +8001,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     public void testNewAndOldSchemes3() throws Exception {
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt");
                     }
-
-                    @Test
-                    @TestMetadata("newSchemeWithJvmDefault.kt")
-                    public void testNewSchemeWithJvmDefault() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt");
-                    }
-                }
-
-                @Nested
-                @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls")
-                @TestDataPath("$PROJECT_ROOT")
-                public class NoDefaultImpls {
-                    @Test
-                    public void testAllFilesPresentInNoDefaultImpls() throws Exception {
-                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
-                    }
-
-                    @Test
-                    @TestMetadata("superPropAccessFromInterface.kt")
-                    public void testSuperPropAccessFromInterface() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls/superPropAccessFromInterface.kt");
-                    }
                 }
             }
 
@@ -11321,12 +11293,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     public void testDisable() throws Exception {
                         runTest("compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/disable.kt");
                     }
-
-                    @Test
-                    @TestMetadata("enable.kt")
-                    public void testEnable() throws Exception {
-                        runTest("compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/enable.kt");
-                    }
                 }
             }
 
@@ -23725,18 +23691,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/all-compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
                 }
 
-                @Test
-                @TestMetadata("compatibility.kt")
-                public void testCompatibility() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibility.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
-                @Test
-                @TestMetadata("compatibilityGeneric.kt")
-                public void testCompatibilityGeneric() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
                 @Test
                 @TestMetadata("default.kt")
                 public void testDefault() throws Exception {
@@ -23783,18 +23737,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/all-compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
                 }
 
-                @Test
-                @TestMetadata("compatibility.kt")
-                public void testCompatibility() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibility.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
-                @Test
-                @TestMetadata("compatibilityGeneric.kt")
-                public void testCompatibilityGeneric() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
                 @Test
                 @TestMetadata("default.kt")
                 public void testDefault() throws Exception {
@@ -24802,42 +24744,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultAllPropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
             }
 
-            @Test
-            @TestMetadata("jvmDefaultEnable.kt")
-            public void testJvmDefaultEnable() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnable.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnableGeneric.kt")
-            public void testJvmDefaultEnableGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePrimaryProperty.kt")
-            public void testJvmDefaultEnablePrimaryProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryProperty.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePrimaryPropertyGeneric.kt")
-            public void testJvmDefaultEnablePrimaryPropertyGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryPropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnableProperty.kt")
-            public void testJvmDefaultEnableProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableProperty.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePropertyGeneric.kt")
-            public void testJvmDefaultEnablePropertyGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
             @Test
             @TestMetadata("jvmDefaultGeneric.kt")
             public void testJvmDefaultGeneric() throws Exception {
@@ -28565,71 +28471,11 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
         @TestMetadata("compiler/testData/codegen/box/jvm8/defaults")
         @TestDataPath("$PROJECT_ROOT")
         public class Defaults {
-            @Test
-            @TestMetadata("26360.kt")
-            public void test26360() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/26360.kt");
-            }
-
-            @Test
-            @TestMetadata("accessor.kt")
-            public void testAccessor() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessor.kt");
-            }
-
-            @Test
-            @TestMetadata("accessorFromCompanion.kt")
-            public void testAccessorFromCompanion() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt");
-            }
-
-            @Test
-            @TestMetadata("accessorsFromDefaultImpls.kt")
-            public void testAccessorsFromDefaultImpls() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt");
-            }
-
             @Test
             public void testAllFilesPresentInDefaults() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
             }
 
-            @Test
-            @TestMetadata("bridgeInClass.kt")
-            public void testBridgeInClass() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterface.kt")
-            public void testBridgeInInterface() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterface2.kt")
-            public void testBridgeInInterface2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterfaceWithProperties.kt")
-            public void testBridgeInInterfaceWithProperties() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterfaceWithProperties2.kt")
-            public void testBridgeInInterfaceWithProperties2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeWithJava.kt")
-            public void testBridgeWithJava() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt");
-            }
-
             @Test
             @TestMetadata("builtInsInherited.kt")
             public void testBuiltInsInherited() throws Exception {
@@ -28637,135 +28483,9 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
             }
 
             @Test
-            @TestMetadata("callableReference.kt")
-            public void testCallableReference() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/callableReference.kt");
-            }
-
-            @Test
-            @TestMetadata("capturedSuperCall.kt")
-            public void testCapturedSuperCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt");
-            }
-
-            @Test
-            @TestMetadata("defaultArgs.kt")
-            public void testDefaultArgs() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt");
-            }
-
-            @Test
-            @TestMetadata("defaultArgsViaAnonymousObject.kt")
-            public void testDefaultArgsViaAnonymousObject() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/defaultArgsViaAnonymousObject.kt");
-            }
-
-            @Test
-            @TestMetadata("diamond.kt")
-            public void testDiamond() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/diamond.kt");
-            }
-
-            @Test
-            @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
-            public void testInheritedFunctionWithDefaultParameters() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inheritedFunctionWithDefaultParameters.kt");
-            }
-
-            @Test
-            @TestMetadata("inline.kt")
-            public void testInline() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inline.kt");
-            }
-
-            @Test
-            @TestMetadata("inlineProperty.kt")
-            public void testInlineProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt");
-            }
-
-            @Test
-            @TestMetadata("kt11969.kt")
-            public void testKt11969() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt11969.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243.kt")
-            public void testKt14243() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243_2.kt")
-            public void testKt14243_2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243_prop.kt")
-            public void testKt14243_prop() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt");
-            }
-
-            @Test
-            @TestMetadata("kt40920.kt")
-            public void testKt40920() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt40920.kt");
-            }
-
-            @Test
-            @TestMetadata("kt42674.kt")
-            public void testKt42674() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt42674.kt");
-            }
-
-            @Test
-            @TestMetadata("oneImplementation.kt")
-            public void testOneImplementation() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt");
-            }
-
-            @Test
-            @TestMetadata("oneImplementation2.kt")
-            public void testOneImplementation2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt");
-            }
-
-            @Test
-            @TestMetadata("privateDefaultFromDefaultImpl.kt")
-            public void testPrivateDefaultFromDefaultImpl() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt");
-            }
-
-            @Test
-            @TestMetadata("privateInDefaultImpls.kt")
-            public void testPrivateInDefaultImpls() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt");
-            }
-
-            @Test
-            @TestMetadata("simpleCall.kt")
-            public void testSimpleCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt");
-            }
-
-            @Test
-            @TestMetadata("simpleProperty.kt")
-            public void testSimpleProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt");
-            }
-
-            @Test
-            @TestMetadata("superCall.kt")
-            public void testSuperCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/superCall.kt");
-            }
-
-            @Test
-            @TestMetadata("suspendFunction.kt")
-            public void testSuspendFunction() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/suspendFunction.kt");
+            @TestMetadata("kt26360.kt")
+            public void testKt26360() throws Exception {
+                runTest("compiler/testData/codegen/box/jvm8/defaults/kt26360.kt");
             }
 
             @Nested
@@ -28867,6 +28587,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callStackTrace.kt");
                 }
 
+                @Test
+                @TestMetadata("callableReference.kt")
+                public void testCallableReference() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callableReference.kt");
+                }
+
+                @Test
+                @TestMetadata("capturedSuperCall.kt")
+                public void testCapturedSuperCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/capturedSuperCall.kt");
+                }
+
                 @Test
                 @TestMetadata("defaultArgs.kt")
                 public void testDefaultArgs() throws Exception {
@@ -28879,12 +28611,24 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @Test
+                @TestMetadata("deprecatedAnnotation.kt")
+                public void testDeprecatedAnnotation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedAnnotation.kt");
+                }
+
                 @Test
                 @TestMetadata("deprecatedDefaultMethod.kt")
                 public void testDeprecatedDefaultMethod() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedDefaultMethod.kt");
                 }
 
+                @Test
+                @TestMetadata("diamond.kt")
+                public void testDiamond() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/diamond.kt");
+                }
+
                 @Test
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
@@ -28903,12 +28647,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inheritedJvmDefault.kt");
                 }
 
+                @Test
+                @TestMetadata("inline.kt")
+                public void testInline() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inline.kt");
+                }
+
+                @Test
+                @TestMetadata("inlineProperty.kt")
+                public void testInlineProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inlineProperty.kt");
+                }
+
                 @Test
                 @TestMetadata("interfaceExtension.kt")
                 public void testInterfaceExtension() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/interfaceExtension.kt");
                 }
 
+                @Test
+                @TestMetadata("kt11969.kt")
+                public void testKt11969() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt11969.kt");
+                }
+
                 @Test
                 @TestMetadata("kt14243.kt")
                 public void testKt14243() throws Exception {
@@ -28921,6 +28683,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_2.kt");
                 }
 
+                @Test
+                @TestMetadata("kt14243_prop.kt")
+                public void testKt14243_prop() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_prop.kt");
+                }
+
+                @Test
+                @TestMetadata("kt40920.kt")
+                public void testKt40920() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt40920.kt");
+                }
+
                 @Test
                 @TestMetadata("kt42674.kt")
                 public void testKt42674() throws Exception {
@@ -28933,6 +28707,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/localDelegatedProperties.kt");
                 }
 
+                @Test
+                @TestMetadata("oneImplementation.kt")
+                public void testOneImplementation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation.kt");
+                }
+
+                @Test
+                @TestMetadata("oneImplementation2.kt")
+                public void testOneImplementation2() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation2.kt");
+                }
+
                 @Test
                 @TestMetadata("privateFunInInterface.kt")
                 public void testPrivateFunInInterface() throws Exception {
@@ -29004,112 +28790,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Compatibility {
-                @Test
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
-                }
-
-                @Test
-                @TestMetadata("bridge.kt")
-                public void testBridge() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt");
-                }
-
-                @Test
-                @TestMetadata("bridge2.kt")
-                public void testBridge2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt");
-                }
-
-                @Test
-                @TestMetadata("bridge3.kt")
-                public void testBridge3() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties.kt")
-                public void testBridgeWithProperties() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties2.kt")
-                public void testBridgeWithProperties2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties3.kt")
-                public void testBridgeWithProperties3() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt");
-                }
-
-                @Test
-                @TestMetadata("defaultArgs.kt")
-                public void testDefaultArgs() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt");
-                }
-
-                @Test
-                @TestMetadata("defaultArgsViaAnonymousObject.kt")
-                public void testDefaultArgsViaAnonymousObject() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgsViaAnonymousObject.kt");
-                }
-
-                @Test
-                @TestMetadata("deprecatedAnnotation.kt")
-                public void testDeprecatedAnnotation() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedAnnotation.kt");
-                }
-
-                @Test
-                @TestMetadata("deprecatedDefaultMethod.kt")
-                public void testDeprecatedDefaultMethod() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt");
-                }
-
-                @Test
-                @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
-                public void testInheritedFunctionWithDefaultParameters() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedFunctionWithDefaultParameters.kt");
-                }
-
-                @Test
-                @TestMetadata("inheritedJvmDefault.kt")
-                public void testInheritedJvmDefault() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt");
-                }
-
-                @Test
-                @TestMetadata("interfaceExtension.kt")
-                public void testInterfaceExtension() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/interfaceExtension.kt");
-                }
-
-                @Test
-                @TestMetadata("kt42674.kt")
-                public void testKt42674() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/kt42674.kt");
-                }
-
-                @Test
-                @TestMetadata("propertyAnnotation.kt")
-                public void testPropertyAnnotation() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleFunction.kt")
-                public void testSimpleFunction() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
             @TestDataPath("$PROJECT_ROOT")
@@ -29124,18 +28804,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 public void testJavaDefaultMethod() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/javaDefaultMethod.kt");
                 }
-
-                @Test
-                @TestMetadata("simple.kt")
-                public void testSimple() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleProperty.kt")
-                public void testSimpleProperty() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt");
-                }
             }
 
             @Nested
@@ -29231,6 +28899,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithProperties3.kt");
                 }
 
+                @Test
+                @TestMetadata("callableReference.kt")
+                public void testCallableReference() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/callableReference.kt");
+                }
+
+                @Test
+                @TestMetadata("capturedSuperCall.kt")
+                public void testCapturedSuperCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/capturedSuperCall.kt");
+                }
+
                 @Test
                 @TestMetadata("defaultArgs.kt")
                 public void testDefaultArgs() throws Exception {
@@ -29243,6 +28923,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @Test
+                @TestMetadata("diamond.kt")
+                public void testDiamond() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/diamond.kt");
+                }
+
                 @Test
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
@@ -29261,12 +28947,30 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inheritedJvmDefault.kt");
                 }
 
+                @Test
+                @TestMetadata("inline.kt")
+                public void testInline() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inline.kt");
+                }
+
+                @Test
+                @TestMetadata("inlineProperty.kt")
+                public void testInlineProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inlineProperty.kt");
+                }
+
                 @Test
                 @TestMetadata("interfaceExtension.kt")
                 public void testInterfaceExtension() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/interfaceExtension.kt");
                 }
 
+                @Test
+                @TestMetadata("kt11969.kt")
+                public void testKt11969() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt11969.kt");
+                }
+
                 @Test
                 @TestMetadata("kt14243.kt")
                 public void testKt14243() throws Exception {
@@ -29279,6 +28983,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_2.kt");
                 }
 
+                @Test
+                @TestMetadata("kt14243_prop.kt")
+                public void testKt14243_prop() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_prop.kt");
+                }
+
                 @Test
                 @TestMetadata("kt40920.kt")
                 public void testKt40920() throws Exception {
@@ -29309,6 +29019,18 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/localDelegatedProperties2.kt");
                 }
 
+                @Test
+                @TestMetadata("oneImplementation.kt")
+                public void testOneImplementation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation.kt");
+                }
+
+                @Test
+                @TestMetadata("oneImplementation2.kt")
+                public void testOneImplementation2() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation2.kt");
+                }
+
                 @Test
                 @TestMetadata("privateFunInInterface.kt")
                 public void testPrivateFunInInterface() throws Exception {
@@ -29436,34 +29158,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest {
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-            @TestDataPath("$PROJECT_ROOT")
-            public class NoDelegation {
-                @Test
-                public void testAllFilesPresentInNoDelegation() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInClass.kt")
-                public void testNoDelegationToDefaultMethodInClass() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt");
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInInterface.kt")
-                public void testNoDelegationToDefaultMethodInInterface() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt");
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInInterface2.kt")
-                public void testNoDelegationToDefaultMethodInInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
             @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxModernJdkCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxModernJdkCodegenTestGenerated.java
index 5f668260911..9816f874e63 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxModernJdkCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BlackBoxModernJdkCodegenTestGenerated.java
@@ -365,9 +365,9 @@ public class BlackBoxModernJdkCodegenTestGenerated extends AbstractBlackBoxCodeg
             }
 
             @Test
-            @TestMetadata("propertiesOverridesEnableJvmDefault.kt")
-            public void testPropertiesOverridesEnableJvmDefault() throws Exception {
-                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesEnableJvmDefault.kt");
+            @TestMetadata("propertiesOverridesAllJvmDefault.kt")
+            public void testPropertiesOverridesAllJvmDefault() throws Exception {
+                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllJvmDefault.kt");
             }
 
             @Test
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeListingTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeListingTestGenerated.java
index b3ade8a7707..843104ca09c 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeListingTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeListingTestGenerated.java
@@ -1452,12 +1452,6 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
             public void testJvmDefaultAll() throws Exception {
                 runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultAll.kt");
             }
-
-            @Test
-            @TestMetadata("jvmDefaultEnable.kt")
-            public void testJvmDefaultEnable() throws Exception {
-                runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultEnable.kt");
-            }
         }
 
         @Nested
@@ -1809,22 +1803,6 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Enable {
-                @Test
-                public void testAllFilesPresentInEnable() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
-                }
-
-                @Test
-                @TestMetadata("interfaceProperty.kt")
-                public void testInterfaceProperty() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable/interfaceProperty.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl")
             @TestDataPath("$PROJECT_ROOT")
@@ -1839,6 +1817,12 @@ public class BytecodeListingTestGenerated extends AbstractBytecodeListingTest {
                 public void testInterfaceProperty() throws Exception {
                     runTest("compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/interfaceProperty.kt");
                 }
+
+                @Test
+                @TestMetadata("privateAccessorNaming.kt")
+                public void testPrivateAccessorNaming() throws Exception {
+                    runTest("compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.kt");
+                }
             }
         }
     }
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java
index 349922f8a45..a826bfad324 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/BytecodeTextTestGenerated.java
@@ -3586,12 +3586,6 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
             runTest("compiler/testData/codegen/bytecodeText/inlineClasses/interfaceDefaultImplStubs.kt");
         }
 
-        @Test
-        @TestMetadata("interfaceJvmDefaultImplStubs.kt")
-        public void testInterfaceJvmDefaultImplStubs() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/inlineClasses/interfaceJvmDefaultImplStubs.kt");
-        }
-
         @Test
         @TestMetadata("isCheckForInlineClass.kt")
         public void testIsCheckForInlineClass() throws Exception {
@@ -4110,46 +4104,6 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
                     runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/allCompatibility/simpleProperty.kt");
                 }
             }
-
-            @Nested
-            @TestMetadata("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Compatibility {
-                @Test
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
-                }
-
-                @Test
-                @TestMetadata("defaultArgs.kt")
-                public void testDefaultArgs() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleDiamond.kt")
-                public void testSimpleDiamond() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleDiamond.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleFunction.kt")
-                public void testSimpleFunction() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunction.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleFunctionWithAbstractOverride.kt")
-                public void testSimpleFunctionWithAbstractOverride() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunctionWithAbstractOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleProperty.kt")
-                public void testSimpleProperty() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt");
-                }
-            }
         }
     }
 
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
index 49b369b64a6..9d3d02d38b5 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenTestGenerated.java
@@ -8063,6 +8063,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
                 }
 
+                @Test
+                @TestMetadata("callStackTrace.kt")
+                public void testCallStackTrace() throws Exception {
+                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/callStackTrace.kt");
+                }
+
                 @Test
                 @TestMetadata("superCall.kt")
                 public void testSuperCall() throws Exception {
@@ -8075,12 +8081,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt");
                 }
 
-                @Test
-                @TestMetadata("superCallFromInterface2.kt")
-                public void testSuperCallFromInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt");
-                }
-
                 @Test
                 @TestMetadata("superPropAccess.kt")
                 public void testSuperPropAccess() throws Exception {
@@ -8093,12 +8093,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt");
                 }
 
-                @Test
-                @TestMetadata("superPropAccessFromInterface2.kt")
-                public void testSuperPropAccessFromInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt");
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility")
                 @TestDataPath("$PROJECT_ROOT")
@@ -8229,28 +8223,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     public void testNewAndOldSchemes3() throws Exception {
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt");
                     }
-
-                    @Test
-                    @TestMetadata("newSchemeWithJvmDefault.kt")
-                    public void testNewSchemeWithJvmDefault() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt");
-                    }
-                }
-
-                @Nested
-                @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls")
-                @TestDataPath("$PROJECT_ROOT")
-                public class NoDefaultImpls {
-                    @Test
-                    public void testAllFilesPresentInNoDefaultImpls() throws Exception {
-                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                    }
-
-                    @Test
-                    @TestMetadata("superPropAccessFromInterface.kt")
-                    public void testSuperPropAccessFromInterface() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls/superPropAccessFromInterface.kt");
-                    }
                 }
             }
 
@@ -11591,12 +11563,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     public void testDisable() throws Exception {
                         runTest("compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/disable.kt");
                     }
-
-                    @Test
-                    @TestMetadata("enable.kt")
-                    public void testEnable() throws Exception {
-                        runTest("compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/enable.kt");
-                    }
                 }
             }
 
@@ -24745,18 +24711,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/all-compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
                 }
 
-                @Test
-                @TestMetadata("compatibility.kt")
-                public void testCompatibility() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibility.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
-                @Test
-                @TestMetadata("compatibilityGeneric.kt")
-                public void testCompatibilityGeneric() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
                 @Test
                 @TestMetadata("default.kt")
                 public void testDefault() throws Exception {
@@ -24803,18 +24757,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/all-compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
                 }
 
-                @Test
-                @TestMetadata("compatibility.kt")
-                public void testCompatibility() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibility.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
-                @Test
-                @TestMetadata("compatibilityGeneric.kt")
-                public void testCompatibilityGeneric() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
                 @Test
                 @TestMetadata("default.kt")
                 public void testDefault() throws Exception {
@@ -25822,42 +25764,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultAllPropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
             }
 
-            @Test
-            @TestMetadata("jvmDefaultEnable.kt")
-            public void testJvmDefaultEnable() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnable.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnableGeneric.kt")
-            public void testJvmDefaultEnableGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePrimaryProperty.kt")
-            public void testJvmDefaultEnablePrimaryProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryProperty.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePrimaryPropertyGeneric.kt")
-            public void testJvmDefaultEnablePrimaryPropertyGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryPropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnableProperty.kt")
-            public void testJvmDefaultEnableProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableProperty.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePropertyGeneric.kt")
-            public void testJvmDefaultEnablePropertyGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
             @Test
             @TestMetadata("jvmDefaultGeneric.kt")
             public void testJvmDefaultGeneric() throws Exception {
@@ -30005,71 +29911,11 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
         @TestMetadata("compiler/testData/codegen/box/jvm8/defaults")
         @TestDataPath("$PROJECT_ROOT")
         public class Defaults {
-            @Test
-            @TestMetadata("26360.kt")
-            public void test26360() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/26360.kt");
-            }
-
-            @Test
-            @TestMetadata("accessor.kt")
-            public void testAccessor() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessor.kt");
-            }
-
-            @Test
-            @TestMetadata("accessorFromCompanion.kt")
-            public void testAccessorFromCompanion() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt");
-            }
-
-            @Test
-            @TestMetadata("accessorsFromDefaultImpls.kt")
-            public void testAccessorsFromDefaultImpls() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt");
-            }
-
             @Test
             public void testAllFilesPresentInDefaults() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
             }
 
-            @Test
-            @TestMetadata("bridgeInClass.kt")
-            public void testBridgeInClass() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterface.kt")
-            public void testBridgeInInterface() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterface2.kt")
-            public void testBridgeInInterface2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterfaceWithProperties.kt")
-            public void testBridgeInInterfaceWithProperties() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterfaceWithProperties2.kt")
-            public void testBridgeInInterfaceWithProperties2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeWithJava.kt")
-            public void testBridgeWithJava() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt");
-            }
-
             @Test
             @TestMetadata("builtInsInherited.kt")
             public void testBuiltInsInherited() throws Exception {
@@ -30077,135 +29923,9 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
             }
 
             @Test
-            @TestMetadata("callableReference.kt")
-            public void testCallableReference() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/callableReference.kt");
-            }
-
-            @Test
-            @TestMetadata("capturedSuperCall.kt")
-            public void testCapturedSuperCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt");
-            }
-
-            @Test
-            @TestMetadata("defaultArgs.kt")
-            public void testDefaultArgs() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt");
-            }
-
-            @Test
-            @TestMetadata("defaultArgsViaAnonymousObject.kt")
-            public void testDefaultArgsViaAnonymousObject() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/defaultArgsViaAnonymousObject.kt");
-            }
-
-            @Test
-            @TestMetadata("diamond.kt")
-            public void testDiamond() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/diamond.kt");
-            }
-
-            @Test
-            @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
-            public void testInheritedFunctionWithDefaultParameters() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inheritedFunctionWithDefaultParameters.kt");
-            }
-
-            @Test
-            @TestMetadata("inline.kt")
-            public void testInline() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inline.kt");
-            }
-
-            @Test
-            @TestMetadata("inlineProperty.kt")
-            public void testInlineProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt");
-            }
-
-            @Test
-            @TestMetadata("kt11969.kt")
-            public void testKt11969() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt11969.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243.kt")
-            public void testKt14243() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243_2.kt")
-            public void testKt14243_2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243_prop.kt")
-            public void testKt14243_prop() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt");
-            }
-
-            @Test
-            @TestMetadata("kt40920.kt")
-            public void testKt40920() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt40920.kt");
-            }
-
-            @Test
-            @TestMetadata("kt42674.kt")
-            public void testKt42674() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt42674.kt");
-            }
-
-            @Test
-            @TestMetadata("oneImplementation.kt")
-            public void testOneImplementation() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt");
-            }
-
-            @Test
-            @TestMetadata("oneImplementation2.kt")
-            public void testOneImplementation2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt");
-            }
-
-            @Test
-            @TestMetadata("privateDefaultFromDefaultImpl.kt")
-            public void testPrivateDefaultFromDefaultImpl() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt");
-            }
-
-            @Test
-            @TestMetadata("privateInDefaultImpls.kt")
-            public void testPrivateInDefaultImpls() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt");
-            }
-
-            @Test
-            @TestMetadata("simpleCall.kt")
-            public void testSimpleCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt");
-            }
-
-            @Test
-            @TestMetadata("simpleProperty.kt")
-            public void testSimpleProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt");
-            }
-
-            @Test
-            @TestMetadata("superCall.kt")
-            public void testSuperCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/superCall.kt");
-            }
-
-            @Test
-            @TestMetadata("suspendFunction.kt")
-            public void testSuspendFunction() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/suspendFunction.kt");
+            @TestMetadata("kt26360.kt")
+            public void testKt26360() throws Exception {
+                runTest("compiler/testData/codegen/box/jvm8/defaults/kt26360.kt");
             }
 
             @Nested
@@ -30307,6 +30027,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callStackTrace.kt");
                 }
 
+                @Test
+                @TestMetadata("callableReference.kt")
+                public void testCallableReference() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callableReference.kt");
+                }
+
+                @Test
+                @TestMetadata("capturedSuperCall.kt")
+                public void testCapturedSuperCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/capturedSuperCall.kt");
+                }
+
                 @Test
                 @TestMetadata("defaultArgs.kt")
                 public void testDefaultArgs() throws Exception {
@@ -30319,12 +30051,24 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @Test
+                @TestMetadata("deprecatedAnnotation.kt")
+                public void testDeprecatedAnnotation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedAnnotation.kt");
+                }
+
                 @Test
                 @TestMetadata("deprecatedDefaultMethod.kt")
                 public void testDeprecatedDefaultMethod() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedDefaultMethod.kt");
                 }
 
+                @Test
+                @TestMetadata("diamond.kt")
+                public void testDiamond() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/diamond.kt");
+                }
+
                 @Test
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
@@ -30343,12 +30087,30 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inheritedJvmDefault.kt");
                 }
 
+                @Test
+                @TestMetadata("inline.kt")
+                public void testInline() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inline.kt");
+                }
+
+                @Test
+                @TestMetadata("inlineProperty.kt")
+                public void testInlineProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inlineProperty.kt");
+                }
+
                 @Test
                 @TestMetadata("interfaceExtension.kt")
                 public void testInterfaceExtension() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/interfaceExtension.kt");
                 }
 
+                @Test
+                @TestMetadata("kt11969.kt")
+                public void testKt11969() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt11969.kt");
+                }
+
                 @Test
                 @TestMetadata("kt14243.kt")
                 public void testKt14243() throws Exception {
@@ -30361,6 +30123,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_2.kt");
                 }
 
+                @Test
+                @TestMetadata("kt14243_prop.kt")
+                public void testKt14243_prop() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_prop.kt");
+                }
+
+                @Test
+                @TestMetadata("kt40920.kt")
+                public void testKt40920() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt40920.kt");
+                }
+
                 @Test
                 @TestMetadata("kt42674.kt")
                 public void testKt42674() throws Exception {
@@ -30373,6 +30147,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/localDelegatedProperties.kt");
                 }
 
+                @Test
+                @TestMetadata("oneImplementation.kt")
+                public void testOneImplementation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation.kt");
+                }
+
+                @Test
+                @TestMetadata("oneImplementation2.kt")
+                public void testOneImplementation2() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation2.kt");
+                }
+
                 @Test
                 @TestMetadata("privateFunInInterface.kt")
                 public void testPrivateFunInInterface() throws Exception {
@@ -30444,112 +30230,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Compatibility {
-                @Test
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("bridge.kt")
-                public void testBridge() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt");
-                }
-
-                @Test
-                @TestMetadata("bridge2.kt")
-                public void testBridge2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt");
-                }
-
-                @Test
-                @TestMetadata("bridge3.kt")
-                public void testBridge3() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties.kt")
-                public void testBridgeWithProperties() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties2.kt")
-                public void testBridgeWithProperties2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties3.kt")
-                public void testBridgeWithProperties3() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt");
-                }
-
-                @Test
-                @TestMetadata("defaultArgs.kt")
-                public void testDefaultArgs() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt");
-                }
-
-                @Test
-                @TestMetadata("defaultArgsViaAnonymousObject.kt")
-                public void testDefaultArgsViaAnonymousObject() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgsViaAnonymousObject.kt");
-                }
-
-                @Test
-                @TestMetadata("deprecatedAnnotation.kt")
-                public void testDeprecatedAnnotation() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedAnnotation.kt");
-                }
-
-                @Test
-                @TestMetadata("deprecatedDefaultMethod.kt")
-                public void testDeprecatedDefaultMethod() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt");
-                }
-
-                @Test
-                @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
-                public void testInheritedFunctionWithDefaultParameters() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedFunctionWithDefaultParameters.kt");
-                }
-
-                @Test
-                @TestMetadata("inheritedJvmDefault.kt")
-                public void testInheritedJvmDefault() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt");
-                }
-
-                @Test
-                @TestMetadata("interfaceExtension.kt")
-                public void testInterfaceExtension() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/interfaceExtension.kt");
-                }
-
-                @Test
-                @TestMetadata("kt42674.kt")
-                public void testKt42674() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/kt42674.kt");
-                }
-
-                @Test
-                @TestMetadata("propertyAnnotation.kt")
-                public void testPropertyAnnotation() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleFunction.kt")
-                public void testSimpleFunction() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
             @TestDataPath("$PROJECT_ROOT")
@@ -30564,18 +30244,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 public void testJavaDefaultMethod() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/javaDefaultMethod.kt");
                 }
-
-                @Test
-                @TestMetadata("simple.kt")
-                public void testSimple() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleProperty.kt")
-                public void testSimpleProperty() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt");
-                }
             }
 
             @Nested
@@ -30671,6 +30339,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithProperties3.kt");
                 }
 
+                @Test
+                @TestMetadata("callableReference.kt")
+                public void testCallableReference() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/callableReference.kt");
+                }
+
+                @Test
+                @TestMetadata("capturedSuperCall.kt")
+                public void testCapturedSuperCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/capturedSuperCall.kt");
+                }
+
                 @Test
                 @TestMetadata("defaultArgs.kt")
                 public void testDefaultArgs() throws Exception {
@@ -30683,6 +30363,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @Test
+                @TestMetadata("diamond.kt")
+                public void testDiamond() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/diamond.kt");
+                }
+
                 @Test
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
@@ -30701,12 +30387,30 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inheritedJvmDefault.kt");
                 }
 
+                @Test
+                @TestMetadata("inline.kt")
+                public void testInline() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inline.kt");
+                }
+
+                @Test
+                @TestMetadata("inlineProperty.kt")
+                public void testInlineProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inlineProperty.kt");
+                }
+
                 @Test
                 @TestMetadata("interfaceExtension.kt")
                 public void testInterfaceExtension() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/interfaceExtension.kt");
                 }
 
+                @Test
+                @TestMetadata("kt11969.kt")
+                public void testKt11969() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt11969.kt");
+                }
+
                 @Test
                 @TestMetadata("kt14243.kt")
                 public void testKt14243() throws Exception {
@@ -30719,6 +30423,12 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_2.kt");
                 }
 
+                @Test
+                @TestMetadata("kt14243_prop.kt")
+                public void testKt14243_prop() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_prop.kt");
+                }
+
                 @Test
                 @TestMetadata("kt40920.kt")
                 public void testKt40920() throws Exception {
@@ -30749,6 +30459,18 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/localDelegatedProperties2.kt");
                 }
 
+                @Test
+                @TestMetadata("oneImplementation.kt")
+                public void testOneImplementation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation.kt");
+                }
+
+                @Test
+                @TestMetadata("oneImplementation2.kt")
+                public void testOneImplementation2() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation2.kt");
+                }
+
                 @Test
                 @TestMetadata("privateFunInInterface.kt")
                 public void testPrivateFunInInterface() throws Exception {
@@ -30876,34 +30598,6 @@ public class IrBlackBoxCodegenTestGenerated extends AbstractIrBlackBoxCodegenTes
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-            @TestDataPath("$PROJECT_ROOT")
-            public class NoDelegation {
-                @Test
-                public void testAllFilesPresentInNoDelegation() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInClass.kt")
-                public void testNoDelegationToDefaultMethodInClass() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt");
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInInterface.kt")
-                public void testNoDelegationToDefaultMethodInInterface() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt");
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInInterface2.kt")
-                public void testNoDelegationToDefaultMethodInInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
             @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
index 78b6e9bfd53..35b99f6b5a0 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxCodegenWithIrInlinerTestGenerated.java
@@ -8063,6 +8063,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
                 }
 
+                @Test
+                @TestMetadata("callStackTrace.kt")
+                public void testCallStackTrace() throws Exception {
+                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/callStackTrace.kt");
+                }
+
                 @Test
                 @TestMetadata("superCall.kt")
                 public void testSuperCall() throws Exception {
@@ -8075,12 +8081,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt");
                 }
 
-                @Test
-                @TestMetadata("superCallFromInterface2.kt")
-                public void testSuperCallFromInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt");
-                }
-
                 @Test
                 @TestMetadata("superPropAccess.kt")
                 public void testSuperPropAccess() throws Exception {
@@ -8093,12 +8093,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt");
                 }
 
-                @Test
-                @TestMetadata("superPropAccessFromInterface2.kt")
-                public void testSuperPropAccessFromInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt");
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility")
                 @TestDataPath("$PROJECT_ROOT")
@@ -8229,28 +8223,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     public void testNewAndOldSchemes3() throws Exception {
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt");
                     }
-
-                    @Test
-                    @TestMetadata("newSchemeWithJvmDefault.kt")
-                    public void testNewSchemeWithJvmDefault() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt");
-                    }
-                }
-
-                @Nested
-                @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls")
-                @TestDataPath("$PROJECT_ROOT")
-                public class NoDefaultImpls {
-                    @Test
-                    public void testAllFilesPresentInNoDefaultImpls() throws Exception {
-                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                    }
-
-                    @Test
-                    @TestMetadata("superPropAccessFromInterface.kt")
-                    public void testSuperPropAccessFromInterface() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls/superPropAccessFromInterface.kt");
-                    }
                 }
             }
 
@@ -11591,12 +11563,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     public void testDisable() throws Exception {
                         runTest("compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/disable.kt");
                     }
-
-                    @Test
-                    @TestMetadata("enable.kt")
-                    public void testEnable() throws Exception {
-                        runTest("compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/enable.kt");
-                    }
                 }
             }
 
@@ -24745,18 +24711,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/all-compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
                 }
 
-                @Test
-                @TestMetadata("compatibility.kt")
-                public void testCompatibility() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibility.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
-                @Test
-                @TestMetadata("compatibilityGeneric.kt")
-                public void testCompatibilityGeneric() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
                 @Test
                 @TestMetadata("default.kt")
                 public void testDefault() throws Exception {
@@ -24803,18 +24757,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/all-compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
                 }
 
-                @Test
-                @TestMetadata("compatibility.kt")
-                public void testCompatibility() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibility.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
-                @Test
-                @TestMetadata("compatibilityGeneric.kt")
-                public void testCompatibilityGeneric() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
                 @Test
                 @TestMetadata("default.kt")
                 public void testDefault() throws Exception {
@@ -25822,42 +25764,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                 runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultAllPropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
             }
 
-            @Test
-            @TestMetadata("jvmDefaultEnable.kt")
-            public void testJvmDefaultEnable() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnable.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnableGeneric.kt")
-            public void testJvmDefaultEnableGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePrimaryProperty.kt")
-            public void testJvmDefaultEnablePrimaryProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryProperty.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePrimaryPropertyGeneric.kt")
-            public void testJvmDefaultEnablePrimaryPropertyGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryPropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnableProperty.kt")
-            public void testJvmDefaultEnableProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableProperty.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @Test
-            @TestMetadata("jvmDefaultEnablePropertyGeneric.kt")
-            public void testJvmDefaultEnablePropertyGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
             @Test
             @TestMetadata("jvmDefaultGeneric.kt")
             public void testJvmDefaultGeneric() throws Exception {
@@ -30005,71 +29911,11 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
         @TestMetadata("compiler/testData/codegen/box/jvm8/defaults")
         @TestDataPath("$PROJECT_ROOT")
         public class Defaults {
-            @Test
-            @TestMetadata("26360.kt")
-            public void test26360() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/26360.kt");
-            }
-
-            @Test
-            @TestMetadata("accessor.kt")
-            public void testAccessor() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessor.kt");
-            }
-
-            @Test
-            @TestMetadata("accessorFromCompanion.kt")
-            public void testAccessorFromCompanion() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt");
-            }
-
-            @Test
-            @TestMetadata("accessorsFromDefaultImpls.kt")
-            public void testAccessorsFromDefaultImpls() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt");
-            }
-
             @Test
             public void testAllFilesPresentInDefaults() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
             }
 
-            @Test
-            @TestMetadata("bridgeInClass.kt")
-            public void testBridgeInClass() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterface.kt")
-            public void testBridgeInInterface() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterface2.kt")
-            public void testBridgeInInterface2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterfaceWithProperties.kt")
-            public void testBridgeInInterfaceWithProperties() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeInInterfaceWithProperties2.kt")
-            public void testBridgeInInterfaceWithProperties2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt");
-            }
-
-            @Test
-            @TestMetadata("bridgeWithJava.kt")
-            public void testBridgeWithJava() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt");
-            }
-
             @Test
             @TestMetadata("builtInsInherited.kt")
             public void testBuiltInsInherited() throws Exception {
@@ -30077,135 +29923,9 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
             }
 
             @Test
-            @TestMetadata("callableReference.kt")
-            public void testCallableReference() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/callableReference.kt");
-            }
-
-            @Test
-            @TestMetadata("capturedSuperCall.kt")
-            public void testCapturedSuperCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt");
-            }
-
-            @Test
-            @TestMetadata("defaultArgs.kt")
-            public void testDefaultArgs() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt");
-            }
-
-            @Test
-            @TestMetadata("defaultArgsViaAnonymousObject.kt")
-            public void testDefaultArgsViaAnonymousObject() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/defaultArgsViaAnonymousObject.kt");
-            }
-
-            @Test
-            @TestMetadata("diamond.kt")
-            public void testDiamond() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/diamond.kt");
-            }
-
-            @Test
-            @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
-            public void testInheritedFunctionWithDefaultParameters() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inheritedFunctionWithDefaultParameters.kt");
-            }
-
-            @Test
-            @TestMetadata("inline.kt")
-            public void testInline() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inline.kt");
-            }
-
-            @Test
-            @TestMetadata("inlineProperty.kt")
-            public void testInlineProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt");
-            }
-
-            @Test
-            @TestMetadata("kt11969.kt")
-            public void testKt11969() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt11969.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243.kt")
-            public void testKt14243() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243_2.kt")
-            public void testKt14243_2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt");
-            }
-
-            @Test
-            @TestMetadata("kt14243_prop.kt")
-            public void testKt14243_prop() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt");
-            }
-
-            @Test
-            @TestMetadata("kt40920.kt")
-            public void testKt40920() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt40920.kt");
-            }
-
-            @Test
-            @TestMetadata("kt42674.kt")
-            public void testKt42674() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt42674.kt");
-            }
-
-            @Test
-            @TestMetadata("oneImplementation.kt")
-            public void testOneImplementation() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt");
-            }
-
-            @Test
-            @TestMetadata("oneImplementation2.kt")
-            public void testOneImplementation2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt");
-            }
-
-            @Test
-            @TestMetadata("privateDefaultFromDefaultImpl.kt")
-            public void testPrivateDefaultFromDefaultImpl() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt");
-            }
-
-            @Test
-            @TestMetadata("privateInDefaultImpls.kt")
-            public void testPrivateInDefaultImpls() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt");
-            }
-
-            @Test
-            @TestMetadata("simpleCall.kt")
-            public void testSimpleCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt");
-            }
-
-            @Test
-            @TestMetadata("simpleProperty.kt")
-            public void testSimpleProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt");
-            }
-
-            @Test
-            @TestMetadata("superCall.kt")
-            public void testSuperCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/superCall.kt");
-            }
-
-            @Test
-            @TestMetadata("suspendFunction.kt")
-            public void testSuspendFunction() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/suspendFunction.kt");
+            @TestMetadata("kt26360.kt")
+            public void testKt26360() throws Exception {
+                runTest("compiler/testData/codegen/box/jvm8/defaults/kt26360.kt");
             }
 
             @Nested
@@ -30307,6 +30027,18 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callStackTrace.kt");
                 }
 
+                @Test
+                @TestMetadata("callableReference.kt")
+                public void testCallableReference() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callableReference.kt");
+                }
+
+                @Test
+                @TestMetadata("capturedSuperCall.kt")
+                public void testCapturedSuperCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/capturedSuperCall.kt");
+                }
+
                 @Test
                 @TestMetadata("defaultArgs.kt")
                 public void testDefaultArgs() throws Exception {
@@ -30319,12 +30051,24 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @Test
+                @TestMetadata("deprecatedAnnotation.kt")
+                public void testDeprecatedAnnotation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedAnnotation.kt");
+                }
+
                 @Test
                 @TestMetadata("deprecatedDefaultMethod.kt")
                 public void testDeprecatedDefaultMethod() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedDefaultMethod.kt");
                 }
 
+                @Test
+                @TestMetadata("diamond.kt")
+                public void testDiamond() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/diamond.kt");
+                }
+
                 @Test
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
@@ -30343,12 +30087,30 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inheritedJvmDefault.kt");
                 }
 
+                @Test
+                @TestMetadata("inline.kt")
+                public void testInline() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inline.kt");
+                }
+
+                @Test
+                @TestMetadata("inlineProperty.kt")
+                public void testInlineProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inlineProperty.kt");
+                }
+
                 @Test
                 @TestMetadata("interfaceExtension.kt")
                 public void testInterfaceExtension() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/interfaceExtension.kt");
                 }
 
+                @Test
+                @TestMetadata("kt11969.kt")
+                public void testKt11969() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt11969.kt");
+                }
+
                 @Test
                 @TestMetadata("kt14243.kt")
                 public void testKt14243() throws Exception {
@@ -30361,6 +30123,18 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_2.kt");
                 }
 
+                @Test
+                @TestMetadata("kt14243_prop.kt")
+                public void testKt14243_prop() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_prop.kt");
+                }
+
+                @Test
+                @TestMetadata("kt40920.kt")
+                public void testKt40920() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt40920.kt");
+                }
+
                 @Test
                 @TestMetadata("kt42674.kt")
                 public void testKt42674() throws Exception {
@@ -30373,6 +30147,18 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/localDelegatedProperties.kt");
                 }
 
+                @Test
+                @TestMetadata("oneImplementation.kt")
+                public void testOneImplementation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation.kt");
+                }
+
+                @Test
+                @TestMetadata("oneImplementation2.kt")
+                public void testOneImplementation2() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation2.kt");
+                }
+
                 @Test
                 @TestMetadata("privateFunInInterface.kt")
                 public void testPrivateFunInInterface() throws Exception {
@@ -30444,112 +30230,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Compatibility {
-                @Test
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("bridge.kt")
-                public void testBridge() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt");
-                }
-
-                @Test
-                @TestMetadata("bridge2.kt")
-                public void testBridge2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt");
-                }
-
-                @Test
-                @TestMetadata("bridge3.kt")
-                public void testBridge3() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties.kt")
-                public void testBridgeWithProperties() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties2.kt")
-                public void testBridgeWithProperties2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt");
-                }
-
-                @Test
-                @TestMetadata("bridgeWithProperties3.kt")
-                public void testBridgeWithProperties3() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt");
-                }
-
-                @Test
-                @TestMetadata("defaultArgs.kt")
-                public void testDefaultArgs() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt");
-                }
-
-                @Test
-                @TestMetadata("defaultArgsViaAnonymousObject.kt")
-                public void testDefaultArgsViaAnonymousObject() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgsViaAnonymousObject.kt");
-                }
-
-                @Test
-                @TestMetadata("deprecatedAnnotation.kt")
-                public void testDeprecatedAnnotation() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedAnnotation.kt");
-                }
-
-                @Test
-                @TestMetadata("deprecatedDefaultMethod.kt")
-                public void testDeprecatedDefaultMethod() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt");
-                }
-
-                @Test
-                @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
-                public void testInheritedFunctionWithDefaultParameters() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedFunctionWithDefaultParameters.kt");
-                }
-
-                @Test
-                @TestMetadata("inheritedJvmDefault.kt")
-                public void testInheritedJvmDefault() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt");
-                }
-
-                @Test
-                @TestMetadata("interfaceExtension.kt")
-                public void testInterfaceExtension() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/interfaceExtension.kt");
-                }
-
-                @Test
-                @TestMetadata("kt42674.kt")
-                public void testKt42674() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/kt42674.kt");
-                }
-
-                @Test
-                @TestMetadata("propertyAnnotation.kt")
-                public void testPropertyAnnotation() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleFunction.kt")
-                public void testSimpleFunction() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
             @TestDataPath("$PROJECT_ROOT")
@@ -30564,18 +30244,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                 public void testJavaDefaultMethod() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/javaDefaultMethod.kt");
                 }
-
-                @Test
-                @TestMetadata("simple.kt")
-                public void testSimple() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleProperty.kt")
-                public void testSimpleProperty() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt");
-                }
             }
 
             @Nested
@@ -30671,6 +30339,18 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithProperties3.kt");
                 }
 
+                @Test
+                @TestMetadata("callableReference.kt")
+                public void testCallableReference() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/callableReference.kt");
+                }
+
+                @Test
+                @TestMetadata("capturedSuperCall.kt")
+                public void testCapturedSuperCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/capturedSuperCall.kt");
+                }
+
                 @Test
                 @TestMetadata("defaultArgs.kt")
                 public void testDefaultArgs() throws Exception {
@@ -30683,6 +30363,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @Test
+                @TestMetadata("diamond.kt")
+                public void testDiamond() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/diamond.kt");
+                }
+
                 @Test
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
@@ -30701,12 +30387,30 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inheritedJvmDefault.kt");
                 }
 
+                @Test
+                @TestMetadata("inline.kt")
+                public void testInline() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inline.kt");
+                }
+
+                @Test
+                @TestMetadata("inlineProperty.kt")
+                public void testInlineProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inlineProperty.kt");
+                }
+
                 @Test
                 @TestMetadata("interfaceExtension.kt")
                 public void testInterfaceExtension() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/interfaceExtension.kt");
                 }
 
+                @Test
+                @TestMetadata("kt11969.kt")
+                public void testKt11969() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt11969.kt");
+                }
+
                 @Test
                 @TestMetadata("kt14243.kt")
                 public void testKt14243() throws Exception {
@@ -30719,6 +30423,12 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_2.kt");
                 }
 
+                @Test
+                @TestMetadata("kt14243_prop.kt")
+                public void testKt14243_prop() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_prop.kt");
+                }
+
                 @Test
                 @TestMetadata("kt40920.kt")
                 public void testKt40920() throws Exception {
@@ -30749,6 +30459,18 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/localDelegatedProperties2.kt");
                 }
 
+                @Test
+                @TestMetadata("oneImplementation.kt")
+                public void testOneImplementation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation.kt");
+                }
+
+                @Test
+                @TestMetadata("oneImplementation2.kt")
+                public void testOneImplementation2() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation2.kt");
+                }
+
                 @Test
                 @TestMetadata("privateFunInInterface.kt")
                 public void testPrivateFunInInterface() throws Exception {
@@ -30876,34 +30598,6 @@ public class IrBlackBoxCodegenWithIrInlinerTestGenerated extends AbstractIrBlack
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-            @TestDataPath("$PROJECT_ROOT")
-            public class NoDelegation {
-                @Test
-                public void testAllFilesPresentInNoDelegation() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInClass.kt")
-                public void testNoDelegationToDefaultMethodInClass() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt");
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInInterface.kt")
-                public void testNoDelegationToDefaultMethodInInterface() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt");
-                }
-
-                @Test
-                @TestMetadata("noDelegationToDefaultMethodInInterface2.kt")
-                public void testNoDelegationToDefaultMethodInInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
             @TestDataPath("$PROJECT_ROOT")
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxModernJdkCodegenTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxModernJdkCodegenTestGenerated.java
index 505417f1841..36b82a330e9 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxModernJdkCodegenTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBlackBoxModernJdkCodegenTestGenerated.java
@@ -395,9 +395,9 @@ public class IrBlackBoxModernJdkCodegenTestGenerated extends AbstractIrBlackBoxC
             }
 
             @Test
-            @TestMetadata("propertiesOverridesEnableJvmDefault.kt")
-            public void testPropertiesOverridesEnableJvmDefault() throws Exception {
-                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesEnableJvmDefault.kt");
+            @TestMetadata("propertiesOverridesAllJvmDefault.kt")
+            public void testPropertiesOverridesAllJvmDefault() throws Exception {
+                runTest("compiler/testData/codegen/boxModernJdk/testsWithJava17/records/propertiesOverridesAllJvmDefault.kt");
             }
 
             @Test
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeListingTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeListingTestGenerated.java
index fcc5b3708d8..968594a40c2 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeListingTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeListingTestGenerated.java
@@ -1560,12 +1560,6 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
             public void testJvmDefaultAll() throws Exception {
                 runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultAll.kt");
             }
-
-            @Test
-            @TestMetadata("jvmDefaultEnable.kt")
-            public void testJvmDefaultEnable() throws Exception {
-                runTest("compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultEnable.kt");
-            }
         }
 
         @Nested
@@ -1917,22 +1911,6 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Enable {
-                @Test
-                public void testAllFilesPresentInEnable() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("interfaceProperty.kt")
-                public void testInterfaceProperty() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeListing/jvm8/defaults/enable/interfaceProperty.kt");
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl")
             @TestDataPath("$PROJECT_ROOT")
@@ -1947,6 +1925,12 @@ public class IrBytecodeListingTestGenerated extends AbstractIrBytecodeListingTes
                 public void testInterfaceProperty() throws Exception {
                     runTest("compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/interfaceProperty.kt");
                 }
+
+                @Test
+                @TestMetadata("privateAccessorNaming.kt")
+                public void testPrivateAccessorNaming() throws Exception {
+                    runTest("compiler/testData/codegen/bytecodeListing/jvm8/defaults/noDefaultImpl/privateAccessorNaming.kt");
+                }
             }
         }
     }
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java
index 8cfe593d5f5..9309a25007b 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/IrBytecodeTextTestGenerated.java
@@ -3916,12 +3916,6 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
             runTest("compiler/testData/codegen/bytecodeText/inlineClasses/interfaceDefaultImplStubs.kt");
         }
 
-        @Test
-        @TestMetadata("interfaceJvmDefaultImplStubs.kt")
-        public void testInterfaceJvmDefaultImplStubs() throws Exception {
-            runTest("compiler/testData/codegen/bytecodeText/inlineClasses/interfaceJvmDefaultImplStubs.kt");
-        }
-
         @Test
         @TestMetadata("isCheckForInlineClass.kt")
         public void testIsCheckForInlineClass() throws Exception {
@@ -4482,46 +4476,6 @@ public class IrBytecodeTextTestGenerated extends AbstractIrBytecodeTextTest {
                     runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/allCompatibility/simpleProperty.kt");
                 }
             }
-
-            @Nested
-            @TestMetadata("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Compatibility {
-                @Test
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
-                }
-
-                @Test
-                @TestMetadata("defaultArgs.kt")
-                public void testDefaultArgs() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/defaultArgs.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleDiamond.kt")
-                public void testSimpleDiamond() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleDiamond.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleFunction.kt")
-                public void testSimpleFunction() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunction.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleFunctionWithAbstractOverride.kt")
-                public void testSimpleFunctionWithAbstractOverride() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleFunctionWithAbstractOverride.kt");
-                }
-
-                @Test
-                @TestMetadata("simpleProperty.kt")
-                public void testSimpleProperty() throws Exception {
-                    runTest("compiler/testData/codegen/bytecodeText/jvm8/jvmDefault/compatibility/simpleProperty.kt");
-                }
-            }
         }
     }
 
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmIrAgainstOldBoxTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmIrAgainstOldBoxTestGenerated.java
index 1dac9253df6..6b5b595c408 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmIrAgainstOldBoxTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmIrAgainstOldBoxTestGenerated.java
@@ -757,6 +757,12 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true);
             }
 
+            @Test
+            @TestMetadata("callStackTrace.kt")
+            public void testCallStackTrace() throws Exception {
+                runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/callStackTrace.kt");
+            }
+
             @Test
             @TestMetadata("superCall.kt")
             public void testSuperCall() throws Exception {
@@ -769,12 +775,6 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt");
             }
 
-            @Test
-            @TestMetadata("superCallFromInterface2.kt")
-            public void testSuperCallFromInterface2() throws Exception {
-                runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt");
-            }
-
             @Test
             @TestMetadata("superPropAccess.kt")
             public void testSuperPropAccess() throws Exception {
@@ -787,12 +787,6 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt");
             }
 
-            @Test
-            @TestMetadata("superPropAccessFromInterface2.kt")
-            public void testSuperPropAccessFromInterface2() throws Exception {
-                runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt");
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility")
             @TestDataPath("$PROJECT_ROOT")
@@ -923,28 +917,6 @@ public class JvmIrAgainstOldBoxTestGenerated extends AbstractJvmIrAgainstOldBoxT
                 public void testNewAndOldSchemes3() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt");
                 }
-
-                @Test
-                @TestMetadata("newSchemeWithJvmDefault.kt")
-                public void testNewSchemeWithJvmDefault() throws Exception {
-                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt");
-                }
-            }
-
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls")
-            @TestDataPath("$PROJECT_ROOT")
-            public class NoDefaultImpls {
-                @Test
-                public void testAllFilesPresentInNoDefaultImpls() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_IR_AGAINST_OLD, true);
-                }
-
-                @Test
-                @TestMetadata("superPropAccessFromInterface.kt")
-                public void testSuperPropAccessFromInterface() throws Exception {
-                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls/superPropAccessFromInterface.kt");
-                }
             }
         }
 
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmOldAgainstIrBoxTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmOldAgainstIrBoxTestGenerated.java
index 89ccbd7f8a4..d8abb5b912c 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmOldAgainstIrBoxTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/codegen/JvmOldAgainstIrBoxTestGenerated.java
@@ -751,6 +751,12 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true);
             }
 
+            @Test
+            @TestMetadata("callStackTrace.kt")
+            public void testCallStackTrace() throws Exception {
+                runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/callStackTrace.kt");
+            }
+
             @Test
             @TestMetadata("superCall.kt")
             public void testSuperCall() throws Exception {
@@ -763,12 +769,6 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt");
             }
 
-            @Test
-            @TestMetadata("superCallFromInterface2.kt")
-            public void testSuperCallFromInterface2() throws Exception {
-                runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt");
-            }
-
             @Test
             @TestMetadata("superPropAccess.kt")
             public void testSuperPropAccess() throws Exception {
@@ -781,12 +781,6 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
                 runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt");
             }
 
-            @Test
-            @TestMetadata("superPropAccessFromInterface2.kt")
-            public void testSuperPropAccessFromInterface2() throws Exception {
-                runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt");
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility")
             @TestDataPath("$PROJECT_ROOT")
@@ -917,28 +911,6 @@ public class JvmOldAgainstIrBoxTestGenerated extends AbstractJvmOldAgainstIrBoxT
                 public void testNewAndOldSchemes3() throws Exception {
                     runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt");
                 }
-
-                @Test
-                @TestMetadata("newSchemeWithJvmDefault.kt")
-                public void testNewSchemeWithJvmDefault() throws Exception {
-                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt");
-                }
-            }
-
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls")
-            @TestDataPath("$PROJECT_ROOT")
-            public class NoDefaultImpls {
-                @Test
-                public void testAllFilesPresentInNoDefaultImpls() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_MULTI_MODULE_OLD_AGAINST_IR, true);
-                }
-
-                @Test
-                @TestMetadata("superPropAccessFromInterface.kt")
-                public void testSuperPropAccessFromInterface() throws Exception {
-                    runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls/superPropAccessFromInterface.kt");
-                }
             }
         }
 
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
index ede645c6deb..69dbeda365a 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/cli/CliTestGenerated.java
@@ -840,16 +840,6 @@ public class CliTestGenerated extends AbstractCliTest {
             runTest("compiler/testData/cli/jvm/jvmDefaultAll.args");
         }
 
-        @TestMetadata("jvmDefaultCompatibility.args")
-        public void testJvmDefaultCompatibility() throws Exception {
-            runTest("compiler/testData/cli/jvm/jvmDefaultCompatibility.args");
-        }
-
-        @TestMetadata("jvmDefaultEnable.args")
-        public void testJvmDefaultEnable() throws Exception {
-            runTest("compiler/testData/cli/jvm/jvmDefaultEnable.args");
-        }
-
         @TestMetadata("jvmIrByDefault1_4.args")
         public void testJvmIrByDefault1_4() throws Exception {
             runTest("compiler/testData/cli/jvm/jvmIrByDefault1_4.args");
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
index a11589e28d4..dc9dfe3ff06 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/LightAnalysisModeTestGenerated.java
@@ -8991,11 +8991,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     public void testDisable() throws Exception {
                         runTest("compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/disable.kt");
                     }
-
-                    @TestMetadata("enable.kt")
-                    public void testEnable() throws Exception {
-                        runTest("compiler/testData/codegen/box/coroutines/featureIntersection/jvmDefault/kt46007/enable.kt");
-                    }
                 }
             }
 
@@ -19810,16 +19805,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/all-compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
                 }
 
-                @TestMetadata("compatibility.kt")
-                public void ignoreCompatibility() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibility.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
-                @TestMetadata("compatibilityGeneric.kt")
-                public void ignoreCompatibilityGeneric() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
                 @TestMetadata("default.kt")
                 public void ignoreDefault() throws Exception {
                     runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/defaultWithDefaultParameter/default.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
@@ -19867,16 +19852,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/all-compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
                 }
 
-                @TestMetadata("compatibility.kt")
-                public void ignoreCompatibility() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibility.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
-                @TestMetadata("compatibilityGeneric.kt")
-                public void ignoreCompatibilityGeneric() throws Exception {
-                    runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/compatibilityGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-                }
-
                 @TestMetadata("default.kt")
                 public void ignoreDefault() throws Exception {
                     runTest("compiler/testData/codegen/box/inlineClasses/defaultParameterValues/overrideFunctionWithDefaultParameter/default.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
@@ -20803,36 +20778,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultAllPropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
             }
 
-            @TestMetadata("jvmDefaultEnable.kt")
-            public void testJvmDefaultEnable() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnable.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @TestMetadata("jvmDefaultEnableGeneric.kt")
-            public void testJvmDefaultEnableGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @TestMetadata("jvmDefaultEnablePrimaryProperty.kt")
-            public void testJvmDefaultEnablePrimaryProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryProperty.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @TestMetadata("jvmDefaultEnablePrimaryPropertyGeneric.kt")
-            public void testJvmDefaultEnablePrimaryPropertyGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePrimaryPropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @TestMetadata("jvmDefaultEnableProperty.kt")
-            public void testJvmDefaultEnableProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnableProperty.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
-            @TestMetadata("jvmDefaultEnablePropertyGeneric.kt")
-            public void testJvmDefaultEnablePropertyGeneric() throws Exception {
-                runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultEnablePropertyGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
-            }
-
             @TestMetadata("jvmDefaultGeneric.kt")
             public void testJvmDefaultGeneric() throws Exception {
                 runTest("compiler/testData/codegen/box/inlineClasses/jvm8DefaultInterfaceMethods/jvmDefaultGeneric.kt", TransformersFunctions.getReplaceOptionalJvmInlineAnnotationWithReal());
@@ -24179,173 +24124,18 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
             }
 
-            @TestMetadata("26360.kt")
-            public void test26360() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/26360.kt");
-            }
-
-            @TestMetadata("accessor.kt")
-            public void testAccessor() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessor.kt");
-            }
-
-            @TestMetadata("accessorFromCompanion.kt")
-            public void testAccessorFromCompanion() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessorFromCompanion.kt");
-            }
-
-            @TestMetadata("accessorsFromDefaultImpls.kt")
-            public void testAccessorsFromDefaultImpls() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/accessorsFromDefaultImpls.kt");
-            }
-
             public void testAllFilesPresentInDefaults() throws Exception {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
             }
 
-            @TestMetadata("bridgeInClass.kt")
-            public void testBridgeInClass() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInClass.kt");
-            }
-
-            @TestMetadata("bridgeInInterface.kt")
-            public void testBridgeInInterface() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface.kt");
-            }
-
-            @TestMetadata("bridgeInInterface2.kt")
-            public void testBridgeInInterface2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterface2.kt");
-            }
-
-            @TestMetadata("bridgeInInterfaceWithProperties.kt")
-            public void testBridgeInInterfaceWithProperties() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties.kt");
-            }
-
-            @TestMetadata("bridgeInInterfaceWithProperties2.kt")
-            public void testBridgeInInterfaceWithProperties2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeInInterfaceWithProperties2.kt");
-            }
-
-            @TestMetadata("bridgeWithJava.kt")
-            public void testBridgeWithJava() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/bridgeWithJava.kt");
-            }
-
             @TestMetadata("builtInsInherited.kt")
             public void testBuiltInsInherited() throws Exception {
                 runTest("compiler/testData/codegen/box/jvm8/defaults/builtInsInherited.kt");
             }
 
-            @TestMetadata("callableReference.kt")
-            public void testCallableReference() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/callableReference.kt");
-            }
-
-            @TestMetadata("capturedSuperCall.kt")
-            public void testCapturedSuperCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/capturedSuperCall.kt");
-            }
-
-            @TestMetadata("defaultArgs.kt")
-            public void testDefaultArgs() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/defaultArgs.kt");
-            }
-
-            @TestMetadata("defaultArgsViaAnonymousObject.kt")
-            public void testDefaultArgsViaAnonymousObject() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/defaultArgsViaAnonymousObject.kt");
-            }
-
-            @TestMetadata("diamond.kt")
-            public void testDiamond() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/diamond.kt");
-            }
-
-            @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
-            public void testInheritedFunctionWithDefaultParameters() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inheritedFunctionWithDefaultParameters.kt");
-            }
-
-            @TestMetadata("inline.kt")
-            public void testInline() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inline.kt");
-            }
-
-            @TestMetadata("inlineProperty.kt")
-            public void testInlineProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/inlineProperty.kt");
-            }
-
-            @TestMetadata("kt11969.kt")
-            public void testKt11969() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt11969.kt");
-            }
-
-            @TestMetadata("kt14243.kt")
-            public void testKt14243() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243.kt");
-            }
-
-            @TestMetadata("kt14243_2.kt")
-            public void testKt14243_2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243_2.kt");
-            }
-
-            @TestMetadata("kt14243_prop.kt")
-            public void testKt14243_prop() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt14243_prop.kt");
-            }
-
-            @TestMetadata("kt40920.kt")
-            public void testKt40920() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt40920.kt");
-            }
-
-            @TestMetadata("kt42674.kt")
-            public void testKt42674() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/kt42674.kt");
-            }
-
-            @TestMetadata("oneImplementation.kt")
-            public void testOneImplementation() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/oneImplementation.kt");
-            }
-
-            @TestMetadata("oneImplementation2.kt")
-            public void testOneImplementation2() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/oneImplementation2.kt");
-            }
-
-            @TestMetadata("privateDefaultFromDefaultImpl.kt")
-            public void testPrivateDefaultFromDefaultImpl() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/privateDefaultFromDefaultImpl.kt");
-            }
-
-            @TestMetadata("privateInDefaultImpls.kt")
-            public void testPrivateInDefaultImpls() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/privateInDefaultImpls.kt");
-            }
-
-            @TestMetadata("simpleCall.kt")
-            public void testSimpleCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/simpleCall.kt");
-            }
-
-            @TestMetadata("simpleProperty.kt")
-            public void testSimpleProperty() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/simpleProperty.kt");
-            }
-
-            @TestMetadata("superCall.kt")
-            public void testSuperCall() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/superCall.kt");
-            }
-
-            @TestMetadata("suspendFunction.kt")
-            public void testSuspendFunction() throws Exception {
-                runTest("compiler/testData/codegen/box/jvm8/defaults/suspendFunction.kt");
+            @TestMetadata("kt26360.kt")
+            public void testKt26360() throws Exception {
+                runTest("compiler/testData/codegen/box/jvm8/defaults/kt26360.kt");
             }
 
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/allCompatibility")
@@ -24445,6 +24235,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callStackTrace.kt");
                 }
 
+                @TestMetadata("callableReference.kt")
+                public void testCallableReference() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/callableReference.kt");
+                }
+
+                @TestMetadata("capturedSuperCall.kt")
+                public void testCapturedSuperCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/capturedSuperCall.kt");
+                }
+
                 @TestMetadata("defaultArgs.kt")
                 public void testDefaultArgs() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/defaultArgs.kt");
@@ -24455,11 +24255,21 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @TestMetadata("deprecatedAnnotation.kt")
+                public void testDeprecatedAnnotation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedAnnotation.kt");
+                }
+
                 @TestMetadata("deprecatedDefaultMethod.kt")
                 public void testDeprecatedDefaultMethod() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/deprecatedDefaultMethod.kt");
                 }
 
+                @TestMetadata("diamond.kt")
+                public void testDiamond() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/diamond.kt");
+                }
+
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/funInterface.kt");
@@ -24475,11 +24285,26 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inheritedJvmDefault.kt");
                 }
 
+                @TestMetadata("inline.kt")
+                public void testInline() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inline.kt");
+                }
+
+                @TestMetadata("inlineProperty.kt")
+                public void testInlineProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/inlineProperty.kt");
+                }
+
                 @TestMetadata("interfaceExtension.kt")
                 public void testInterfaceExtension() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/interfaceExtension.kt");
                 }
 
+                @TestMetadata("kt11969.kt")
+                public void testKt11969() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt11969.kt");
+                }
+
                 @TestMetadata("kt14243.kt")
                 public void testKt14243() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243.kt");
@@ -24490,6 +24315,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_2.kt");
                 }
 
+                @TestMetadata("kt14243_prop.kt")
+                public void testKt14243_prop() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt14243_prop.kt");
+                }
+
+                @TestMetadata("kt40920.kt")
+                public void testKt40920() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt40920.kt");
+                }
+
                 @TestMetadata("kt42674.kt")
                 public void testKt42674() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/kt42674.kt");
@@ -24500,6 +24335,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/localDelegatedProperties.kt");
                 }
 
+                @TestMetadata("oneImplementation.kt")
+                public void testOneImplementation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation.kt");
+                }
+
+                @TestMetadata("oneImplementation2.kt")
+                public void testOneImplementation2() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/oneImplementation2.kt");
+                }
+
                 @TestMetadata("privateFunInInterface.kt")
                 public void testPrivateFunInInterface() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/allCompatibility/privateFunInInterface.kt");
@@ -24554,99 +24399,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 }
             }
 
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class Compatibility extends AbstractLightAnalysisModeTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
-                }
-
-                @TestMetadata("bridge.kt")
-                public void testBridge() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge.kt");
-                }
-
-                @TestMetadata("bridge2.kt")
-                public void testBridge2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge2.kt");
-                }
-
-                @TestMetadata("bridge3.kt")
-                public void testBridge3() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridge3.kt");
-                }
-
-                @TestMetadata("bridgeWithProperties.kt")
-                public void testBridgeWithProperties() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties.kt");
-                }
-
-                @TestMetadata("bridgeWithProperties2.kt")
-                public void testBridgeWithProperties2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties2.kt");
-                }
-
-                @TestMetadata("bridgeWithProperties3.kt")
-                public void testBridgeWithProperties3() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/bridgeWithProperties3.kt");
-                }
-
-                @TestMetadata("defaultArgs.kt")
-                public void testDefaultArgs() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgs.kt");
-                }
-
-                @TestMetadata("defaultArgsViaAnonymousObject.kt")
-                public void testDefaultArgsViaAnonymousObject() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/defaultArgsViaAnonymousObject.kt");
-                }
-
-                @TestMetadata("deprecatedAnnotation.kt")
-                public void testDeprecatedAnnotation() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedAnnotation.kt");
-                }
-
-                @TestMetadata("deprecatedDefaultMethod.kt")
-                public void testDeprecatedDefaultMethod() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/deprecatedDefaultMethod.kt");
-                }
-
-                @TestMetadata("inheritedFunctionWithDefaultParameters.kt")
-                public void testInheritedFunctionWithDefaultParameters() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedFunctionWithDefaultParameters.kt");
-                }
-
-                @TestMetadata("inheritedJvmDefault.kt")
-                public void testInheritedJvmDefault() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/inheritedJvmDefault.kt");
-                }
-
-                @TestMetadata("interfaceExtension.kt")
-                public void testInterfaceExtension() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/interfaceExtension.kt");
-                }
-
-                @TestMetadata("kt42674.kt")
-                public void testKt42674() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/kt42674.kt");
-                }
-
-                @TestMetadata("propertyAnnotation.kt")
-                public void testPropertyAnnotation() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/propertyAnnotation.kt");
-                }
-
-                @TestMetadata("simpleFunction.kt")
-                public void testSimpleFunction() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/compatibility/simpleFunction.kt");
-                }
-            }
-
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
@@ -24663,16 +24415,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 public void testJavaDefaultMethod() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/javaDefaultMethod.kt");
                 }
-
-                @TestMetadata("simple.kt")
-                public void testSimple() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/simple.kt");
-                }
-
-                @TestMetadata("simpleProperty.kt")
-                public void testSimpleProperty() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/delegationBy/simpleProperty.kt");
-                }
             }
 
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls")
@@ -24767,6 +24509,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/bridgeWithProperties3.kt");
                 }
 
+                @TestMetadata("callableReference.kt")
+                public void testCallableReference() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/callableReference.kt");
+                }
+
+                @TestMetadata("capturedSuperCall.kt")
+                public void testCapturedSuperCall() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/capturedSuperCall.kt");
+                }
+
                 @TestMetadata("defaultArgs.kt")
                 public void testDefaultArgs() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/defaultArgs.kt");
@@ -24777,6 +24529,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/defaultArgsViaAnonymousObject.kt");
                 }
 
+                @TestMetadata("diamond.kt")
+                public void testDiamond() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/diamond.kt");
+                }
+
                 @TestMetadata("funInterface.kt")
                 public void testFunInterface() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/funInterface.kt");
@@ -24792,11 +24549,26 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inheritedJvmDefault.kt");
                 }
 
+                @TestMetadata("inline.kt")
+                public void testInline() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inline.kt");
+                }
+
+                @TestMetadata("inlineProperty.kt")
+                public void testInlineProperty() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/inlineProperty.kt");
+                }
+
                 @TestMetadata("interfaceExtension.kt")
                 public void testInterfaceExtension() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/interfaceExtension.kt");
                 }
 
+                @TestMetadata("kt11969.kt")
+                public void testKt11969() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt11969.kt");
+                }
+
                 @TestMetadata("kt14243.kt")
                 public void testKt14243() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243.kt");
@@ -24807,6 +24579,11 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_2.kt");
                 }
 
+                @TestMetadata("kt14243_prop.kt")
+                public void testKt14243_prop() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt14243_prop.kt");
+                }
+
                 @TestMetadata("kt40920.kt")
                 public void testKt40920() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/kt40920.kt");
@@ -24827,6 +24604,16 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/localDelegatedProperties2.kt");
                 }
 
+                @TestMetadata("oneImplementation.kt")
+                public void testOneImplementation() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation.kt");
+                }
+
+                @TestMetadata("oneImplementation2.kt")
+                public void testOneImplementation2() throws Exception {
+                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/oneImplementation2.kt");
+                }
+
                 @TestMetadata("privateFunInInterface.kt")
                 public void testPrivateFunInInterface() throws Exception {
                     runTest("compiler/testData/codegen/box/jvm8/defaults/noDefaultImpls/privateFunInInterface.kt");
@@ -24942,34 +24729,6 @@ public class LightAnalysisModeTestGenerated extends AbstractLightAnalysisModeTes
                 }
             }
 
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class NoDelegation extends AbstractLightAnalysisModeTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInNoDelegation() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
-                }
-
-                @TestMetadata("noDelegationToDefaultMethodInClass.kt")
-                public void testNoDelegationToDefaultMethodInClass() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInClass.kt");
-                }
-
-                @TestMetadata("noDelegationToDefaultMethodInInterface.kt")
-                public void testNoDelegationToDefaultMethodInInterface() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface.kt");
-                }
-
-                @TestMetadata("noDelegationToDefaultMethodInInterface2.kt")
-                public void testNoDelegationToDefaultMethodInInterface2() throws Exception {
-                    runTest("compiler/testData/codegen/box/jvm8/defaults/noDelegation/noDelegationToDefaultMethodInInterface2.kt");
-                }
-            }
-
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java
index 567959c0f4f..a3d80165628 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java
@@ -777,56 +777,31 @@ public class WriteFlagsTestGenerated extends AbstractWriteFlagsTest {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/writeFlags/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
             }
 
-            @TestMetadata("defaultMethod.kt")
-            public void testDefaultMethod() throws Exception {
-                runTest("compiler/testData/writeFlags/jvm8/defaults/defaultMethod.kt");
-            }
-
-            @TestMetadata("defaultProperty.kt")
-            public void testDefaultProperty() throws Exception {
-                runTest("compiler/testData/writeFlags/jvm8/defaults/defaultProperty.kt");
-            }
-
-            @TestMetadata("onlyJvmDefaultsOnInterface.kt")
-            public void testOnlyJvmDefaultsOnInterface() throws Exception {
-                runTest("compiler/testData/writeFlags/jvm8/defaults/onlyJvmDefaultsOnInterface.kt");
-            }
-
-            @TestMetadata("privateAccessorNaming.kt")
-            public void testPrivateAccessorNaming() throws Exception {
-                runTest("compiler/testData/writeFlags/jvm8/defaults/privateAccessorNaming.kt");
-            }
-
-            @TestMetadata("propertyAnnotation.kt")
-            public void testPropertyAnnotation() throws Exception {
-                runTest("compiler/testData/writeFlags/jvm8/defaults/propertyAnnotation.kt");
-            }
-
-            @TestMetadata("compiler/testData/writeFlags/jvm8/defaults/compatibility")
+            @TestMetadata("compiler/testData/writeFlags/jvm8/defaults/all-compatibility")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
-            public static class Compatibility extends AbstractWriteFlagsTest {
+            public static class All_compatibility extends AbstractWriteFlagsTest {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM, testDataFilePath);
                 }
 
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/writeFlags/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
+                public void testAllFilesPresentInAll_compatibility() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/writeFlags/jvm8/defaults/all-compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
                 }
 
                 @TestMetadata("defaultImplementations.kt")
                 public void testDefaultImplementations() throws Exception {
-                    runTest("compiler/testData/writeFlags/jvm8/defaults/compatibility/defaultImplementations.kt");
+                    runTest("compiler/testData/writeFlags/jvm8/defaults/all-compatibility/defaultImplementations.kt");
                 }
 
                 @TestMetadata("propertyAccessors.kt")
                 public void testPropertyAccessors() throws Exception {
-                    runTest("compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAccessors.kt");
+                    runTest("compiler/testData/writeFlags/jvm8/defaults/all-compatibility/propertyAccessors.kt");
                 }
 
                 @TestMetadata("propertyAnnotation.kt")
                 public void testPropertyAnnotation() throws Exception {
-                    runTest("compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAnnotation.kt");
+                    runTest("compiler/testData/writeFlags/jvm8/defaults/all-compatibility/propertyAnnotation.kt");
                 }
             }
         }
diff --git a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrWriteFlagsTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrWriteFlagsTestGenerated.java
index c70d82bd40b..0d5c548f7a2 100644
--- a/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrWriteFlagsTestGenerated.java
+++ b/compiler/tests-gen/org/jetbrains/kotlin/codegen/ir/IrWriteFlagsTestGenerated.java
@@ -777,56 +777,31 @@ public class IrWriteFlagsTestGenerated extends AbstractIrWriteFlagsTest {
                 KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/writeFlags/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
             }
 
-            @TestMetadata("defaultMethod.kt")
-            public void testDefaultMethod() throws Exception {
-                runTest("compiler/testData/writeFlags/jvm8/defaults/defaultMethod.kt");
-            }
-
-            @TestMetadata("defaultProperty.kt")
-            public void testDefaultProperty() throws Exception {
-                runTest("compiler/testData/writeFlags/jvm8/defaults/defaultProperty.kt");
-            }
-
-            @TestMetadata("onlyJvmDefaultsOnInterface.kt")
-            public void testOnlyJvmDefaultsOnInterface() throws Exception {
-                runTest("compiler/testData/writeFlags/jvm8/defaults/onlyJvmDefaultsOnInterface.kt");
-            }
-
-            @TestMetadata("privateAccessorNaming.kt")
-            public void testPrivateAccessorNaming() throws Exception {
-                runTest("compiler/testData/writeFlags/jvm8/defaults/privateAccessorNaming.kt");
-            }
-
-            @TestMetadata("propertyAnnotation.kt")
-            public void testPropertyAnnotation() throws Exception {
-                runTest("compiler/testData/writeFlags/jvm8/defaults/propertyAnnotation.kt");
-            }
-
-            @TestMetadata("compiler/testData/writeFlags/jvm8/defaults/compatibility")
+            @TestMetadata("compiler/testData/writeFlags/jvm8/defaults/all-compatibility")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
-            public static class Compatibility extends AbstractIrWriteFlagsTest {
+            public static class All_compatibility extends AbstractIrWriteFlagsTest {
                 private void runTest(String testDataFilePath) throws Exception {
                     KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath);
                 }
 
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/writeFlags/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
+                public void testAllFilesPresentInAll_compatibility() throws Exception {
+                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/writeFlags/jvm8/defaults/all-compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
                 }
 
                 @TestMetadata("defaultImplementations.kt")
                 public void testDefaultImplementations() throws Exception {
-                    runTest("compiler/testData/writeFlags/jvm8/defaults/compatibility/defaultImplementations.kt");
+                    runTest("compiler/testData/writeFlags/jvm8/defaults/all-compatibility/defaultImplementations.kt");
                 }
 
                 @TestMetadata("propertyAccessors.kt")
                 public void testPropertyAccessors() throws Exception {
-                    runTest("compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAccessors.kt");
+                    runTest("compiler/testData/writeFlags/jvm8/defaults/all-compatibility/propertyAccessors.kt");
                 }
 
                 @TestMetadata("propertyAnnotation.kt")
                 public void testPropertyAnnotation() throws Exception {
-                    runTest("compiler/testData/writeFlags/jvm8/defaults/compatibility/propertyAnnotation.kt");
+                    runTest("compiler/testData/writeFlags/jvm8/defaults/all-compatibility/propertyAnnotation.kt");
                 }
             }
         }
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
index 2e217ee8446..405c33836f4 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/JsCodegenBoxTestGenerated.java
@@ -21740,16 +21740,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Compatibility {
-                @Test
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
             @TestDataPath("$PROJECT_ROOT")
@@ -21800,16 +21790,6 @@ public class JsCodegenBoxTestGenerated extends AbstractJsCodegenBoxTest {
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-            @TestDataPath("$PROJECT_ROOT")
-            public class NoDelegation {
-                @Test
-                public void testAllFilesPresentInNoDelegation() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS, true);
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
             @TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
index 1d85f87510f..28f44235e1f 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsCodegenBoxTestGenerated.java
@@ -21878,16 +21878,6 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Compatibility {
-                @Test
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
             @TestDataPath("$PROJECT_ROOT")
@@ -21938,16 +21928,6 @@ public class FirJsCodegenBoxTestGenerated extends AbstractFirJsCodegenBoxTest {
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-            @TestDataPath("$PROJECT_ROOT")
-            public class NoDelegation {
-                @Test
-                public void testAllFilesPresentInNoDelegation() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
             @TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
index b5d9772c91d..4b780a91301 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsCodegenBoxTestGenerated.java
@@ -21878,16 +21878,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Compatibility {
-                @Test
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
             @TestDataPath("$PROJECT_ROOT")
@@ -21938,16 +21928,6 @@ public class IrJsCodegenBoxTestGenerated extends AbstractIrJsCodegenBoxTest {
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-            @TestDataPath("$PROJECT_ROOT")
-            public class NoDelegation {
-                @Test
-                public void testAllFilesPresentInNoDelegation() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
             @TestDataPath("$PROJECT_ROOT")
diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
index e02d01dc7e5..f88de20f396 100644
--- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
+++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/IrJsES6CodegenBoxTestGenerated.java
@@ -21878,16 +21878,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            public class Compatibility {
-                @Test
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
             @TestDataPath("$PROJECT_ROOT")
@@ -21938,16 +21928,6 @@ public class IrJsES6CodegenBoxTestGenerated extends AbstractIrJsES6CodegenBoxTes
                 }
             }
 
-            @Nested
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-            @TestDataPath("$PROJECT_ROOT")
-            public class NoDelegation {
-                @Test
-                public void testAllFilesPresentInNoDelegation() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
-                }
-            }
-
             @Nested
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
             @TestDataPath("$PROJECT_ROOT")
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java
index fa6147fd2ff..8e802d6db1d 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestGenerated.java
@@ -6086,6 +6086,12 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
                     }
 
+                    @Test
+                    @TestMetadata("callStackTrace.kt")
+                    public void testCallStackTrace() throws Exception {
+                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/callStackTrace.kt");
+                    }
+
                     @Test
                     @TestMetadata("superCall.kt")
                     public void testSuperCall() throws Exception {
@@ -6098,12 +6104,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt");
                     }
 
-                    @Test
-                    @TestMetadata("superCallFromInterface2.kt")
-                    public void testSuperCallFromInterface2() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt");
-                    }
-
                     @Test
                     @TestMetadata("superPropAccess.kt")
                     public void testSuperPropAccess() throws Exception {
@@ -6116,12 +6116,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt");
                     }
 
-                    @Test
-                    @TestMetadata("superPropAccessFromInterface2.kt")
-                    public void testSuperPropAccessFromInterface2() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt");
-                    }
-
                     @Nested
                     @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility")
                     @TestDataPath("$PROJECT_ROOT")
@@ -6252,32 +6246,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
                         public void testNewAndOldSchemes3() throws Exception {
                             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt");
                         }
-
-                        @Test
-                        @TestMetadata("newSchemeWithJvmDefault.kt")
-                        public void testNewSchemeWithJvmDefault() throws Exception {
-                            runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt");
-                        }
-                    }
-
-                    @Nested
-                    @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls")
-                    @TestDataPath("$PROJECT_ROOT")
-                    @Tag("codegenK2")
-                    @Tag("firCodegen")
-                    @UseExtTestCaseGroupProvider()
-                    @FirPipeline()
-                    public class NoDefaultImpls {
-                        @Test
-                        public void testAllFilesPresentInNoDefaultImpls() throws Exception {
-                            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                        }
-
-                        @Test
-                        @TestMetadata("superPropAccessFromInterface.kt")
-                        public void testSuperPropAccessFromInterface() throws Exception {
-                            runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls/superPropAccessFromInterface.kt");
-                        }
                     }
                 }
 
@@ -25124,20 +25092,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
                     }
                 }
 
-                @Nested
-                @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-                @TestDataPath("$PROJECT_ROOT")
-                @Tag("codegenK2")
-                @Tag("firCodegen")
-                @UseExtTestCaseGroupProvider()
-                @FirPipeline()
-                public class Compatibility {
-                    @Test
-                    public void testAllFilesPresentInCompatibility() throws Exception {
-                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                    }
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
                 @TestDataPath("$PROJECT_ROOT")
@@ -25208,20 +25162,6 @@ public class FirNativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTe
                     }
                 }
 
-                @Nested
-                @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-                @TestDataPath("$PROJECT_ROOT")
-                @Tag("codegenK2")
-                @Tag("firCodegen")
-                @UseExtTestCaseGroupProvider()
-                @FirPipeline()
-                public class NoDelegation {
-                    @Test
-                    public void testAllFilesPresentInNoDelegation() throws Exception {
-                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                    }
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
                 @TestDataPath("$PROJECT_ROOT")
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java
index f3560c711d3..da91e1a38a9 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/FirNativeCodegenBoxTestNoPLGenerated.java
@@ -6216,6 +6216,12 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
                     }
 
+                    @Test
+                    @TestMetadata("callStackTrace.kt")
+                    public void testCallStackTrace() throws Exception {
+                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/callStackTrace.kt");
+                    }
+
                     @Test
                     @TestMetadata("superCall.kt")
                     public void testSuperCall() throws Exception {
@@ -6228,12 +6234,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt");
                     }
 
-                    @Test
-                    @TestMetadata("superCallFromInterface2.kt")
-                    public void testSuperCallFromInterface2() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt");
-                    }
-
                     @Test
                     @TestMetadata("superPropAccess.kt")
                     public void testSuperPropAccess() throws Exception {
@@ -6246,12 +6246,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt");
                     }
 
-                    @Test
-                    @TestMetadata("superPropAccessFromInterface2.kt")
-                    public void testSuperPropAccessFromInterface2() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt");
-                    }
-
                     @Nested
                     @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility")
                     @TestDataPath("$PROJECT_ROOT")
@@ -6388,34 +6382,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
                         public void testNewAndOldSchemes3() throws Exception {
                             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt");
                         }
-
-                        @Test
-                        @TestMetadata("newSchemeWithJvmDefault.kt")
-                        public void testNewSchemeWithJvmDefault() throws Exception {
-                            runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt");
-                        }
-                    }
-
-                    @Nested
-                    @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls")
-                    @TestDataPath("$PROJECT_ROOT")
-                    @Tag("codegenK2")
-                    @Tag("firCodegen")
-                    @UseExtTestCaseGroupProvider()
-                    @FirPipeline()
-                    @UsePartialLinkage(mode = Mode.DISABLED)
-                    @Tag("no-partial-linkage-may-be-skipped")
-                    public class NoDefaultImpls {
-                        @Test
-                        public void testAllFilesPresentInNoDefaultImpls() throws Exception {
-                            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                        }
-
-                        @Test
-                        @TestMetadata("superPropAccessFromInterface.kt")
-                        public void testSuperPropAccessFromInterface() throws Exception {
-                            runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls/superPropAccessFromInterface.kt");
-                        }
                     }
                 }
 
@@ -25644,22 +25610,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
                     }
                 }
 
-                @Nested
-                @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-                @TestDataPath("$PROJECT_ROOT")
-                @Tag("codegenK2")
-                @Tag("firCodegen")
-                @UseExtTestCaseGroupProvider()
-                @FirPipeline()
-                @UsePartialLinkage(mode = Mode.DISABLED)
-                @Tag("no-partial-linkage-may-be-skipped")
-                public class Compatibility {
-                    @Test
-                    public void testAllFilesPresentInCompatibility() throws Exception {
-                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                    }
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
                 @TestDataPath("$PROJECT_ROOT")
@@ -25740,22 +25690,6 @@ public class FirNativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenB
                     }
                 }
 
-                @Nested
-                @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-                @TestDataPath("$PROJECT_ROOT")
-                @Tag("codegenK2")
-                @Tag("firCodegen")
-                @UseExtTestCaseGroupProvider()
-                @FirPipeline()
-                @UsePartialLinkage(mode = Mode.DISABLED)
-                @Tag("no-partial-linkage-may-be-skipped")
-                public class NoDelegation {
-                    @Test
-                    public void testAllFilesPresentInNoDelegation() throws Exception {
-                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                    }
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
                 @TestDataPath("$PROJECT_ROOT")
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
index 4b26a0a85e1..51110ce361e 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestGenerated.java
@@ -6021,6 +6021,12 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
                     }
 
+                    @Test
+                    @TestMetadata("callStackTrace.kt")
+                    public void testCallStackTrace() throws Exception {
+                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/callStackTrace.kt");
+                    }
+
                     @Test
                     @TestMetadata("superCall.kt")
                     public void testSuperCall() throws Exception {
@@ -6033,12 +6039,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt");
                     }
 
-                    @Test
-                    @TestMetadata("superCallFromInterface2.kt")
-                    public void testSuperCallFromInterface2() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt");
-                    }
-
                     @Test
                     @TestMetadata("superPropAccess.kt")
                     public void testSuperPropAccess() throws Exception {
@@ -6051,12 +6051,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt");
                     }
 
-                    @Test
-                    @TestMetadata("superPropAccessFromInterface2.kt")
-                    public void testSuperPropAccessFromInterface2() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt");
-                    }
-
                     @Nested
                     @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility")
                     @TestDataPath("$PROJECT_ROOT")
@@ -6184,31 +6178,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
                         public void testNewAndOldSchemes3() throws Exception {
                             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt");
                         }
-
-                        @Test
-                        @TestMetadata("newSchemeWithJvmDefault.kt")
-                        public void testNewSchemeWithJvmDefault() throws Exception {
-                            runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt");
-                        }
-                    }
-
-                    @Nested
-                    @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls")
-                    @TestDataPath("$PROJECT_ROOT")
-                    @Tag("codegen")
-                    @Tag("k1Codegen")
-                    @UseExtTestCaseGroupProvider()
-                    public class NoDefaultImpls {
-                        @Test
-                        public void testAllFilesPresentInNoDefaultImpls() throws Exception {
-                            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                        }
-
-                        @Test
-                        @TestMetadata("superPropAccessFromInterface.kt")
-                        public void testSuperPropAccessFromInterface() throws Exception {
-                            runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls/superPropAccessFromInterface.kt");
-                        }
                     }
                 }
 
@@ -24864,19 +24833,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
                     }
                 }
 
-                @Nested
-                @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-                @TestDataPath("$PROJECT_ROOT")
-                @Tag("codegen")
-                @Tag("k1Codegen")
-                @UseExtTestCaseGroupProvider()
-                public class Compatibility {
-                    @Test
-                    public void testAllFilesPresentInCompatibility() throws Exception {
-                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                    }
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
                 @TestDataPath("$PROJECT_ROOT")
@@ -24942,19 +24898,6 @@ public class NativeCodegenBoxTestGenerated extends AbstractNativeCodegenBoxTest
                     }
                 }
 
-                @Nested
-                @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-                @TestDataPath("$PROJECT_ROOT")
-                @Tag("codegen")
-                @Tag("k1Codegen")
-                @UseExtTestCaseGroupProvider()
-                public class NoDelegation {
-                    @Test
-                    public void testAllFilesPresentInNoDelegation() throws Exception {
-                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                    }
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
                 @TestDataPath("$PROJECT_ROOT")
diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java
index e26b4a8012c..7f3da3995c2 100644
--- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java
+++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/blackboxtest/NativeCodegenBoxTestNoPLGenerated.java
@@ -6151,6 +6151,12 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
                         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
                     }
 
+                    @Test
+                    @TestMetadata("callStackTrace.kt")
+                    public void testCallStackTrace() throws Exception {
+                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/callStackTrace.kt");
+                    }
+
                     @Test
                     @TestMetadata("superCall.kt")
                     public void testSuperCall() throws Exception {
@@ -6163,12 +6169,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface.kt");
                     }
 
-                    @Test
-                    @TestMetadata("superCallFromInterface2.kt")
-                    public void testSuperCallFromInterface2() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superCallFromInterface2.kt");
-                    }
-
                     @Test
                     @TestMetadata("superPropAccess.kt")
                     public void testSuperPropAccess() throws Exception {
@@ -6181,12 +6181,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
                         runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface.kt");
                     }
 
-                    @Test
-                    @TestMetadata("superPropAccessFromInterface2.kt")
-                    public void testSuperPropAccessFromInterface2() throws Exception {
-                        runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/superPropAccessFromInterface2.kt");
-                    }
-
                     @Nested
                     @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/allCompatibility")
                     @TestDataPath("$PROJECT_ROOT")
@@ -6320,33 +6314,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
                         public void testNewAndOldSchemes3() throws Exception {
                             runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newAndOldSchemes3.kt");
                         }
-
-                        @Test
-                        @TestMetadata("newSchemeWithJvmDefault.kt")
-                        public void testNewSchemeWithJvmDefault() throws Exception {
-                            runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/interop/newSchemeWithJvmDefault.kt");
-                        }
-                    }
-
-                    @Nested
-                    @TestMetadata("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls")
-                    @TestDataPath("$PROJECT_ROOT")
-                    @Tag("codegen")
-                    @Tag("k1Codegen")
-                    @UseExtTestCaseGroupProvider()
-                    @UsePartialLinkage(mode = Mode.DISABLED)
-                    @Tag("no-partial-linkage-may-be-skipped")
-                    public class NoDefaultImpls {
-                        @Test
-                        public void testAllFilesPresentInNoDefaultImpls() throws Exception {
-                            KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                        }
-
-                        @Test
-                        @TestMetadata("superPropAccessFromInterface.kt")
-                        public void testSuperPropAccessFromInterface() throws Exception {
-                            runTest("compiler/testData/codegen/box/compileKotlinAgainstKotlin/jvm8/defaults/noDefaultImpls/superPropAccessFromInterface.kt");
-                        }
                     }
                 }
 
@@ -25384,21 +25351,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
                     }
                 }
 
-                @Nested
-                @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-                @TestDataPath("$PROJECT_ROOT")
-                @Tag("codegen")
-                @Tag("k1Codegen")
-                @UseExtTestCaseGroupProvider()
-                @UsePartialLinkage(mode = Mode.DISABLED)
-                @Tag("no-partial-linkage-may-be-skipped")
-                public class Compatibility {
-                    @Test
-                    public void testAllFilesPresentInCompatibility() throws Exception {
-                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                    }
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
                 @TestDataPath("$PROJECT_ROOT")
@@ -25474,21 +25426,6 @@ public class NativeCodegenBoxTestNoPLGenerated extends AbstractNativeCodegenBoxT
                     }
                 }
 
-                @Nested
-                @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-                @TestDataPath("$PROJECT_ROOT")
-                @Tag("codegen")
-                @Tag("k1Codegen")
-                @UseExtTestCaseGroupProvider()
-                @UsePartialLinkage(mode = Mode.DISABLED)
-                @Tag("no-partial-linkage-may-be-skipped")
-                public class NoDelegation {
-                    @Test
-                    public void testAllFilesPresentInNoDelegation() throws Exception {
-                        KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.NATIVE, true);
-                    }
-                }
-
                 @Nested
                 @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
                 @TestDataPath("$PROJECT_ROOT")
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.kt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.kt
deleted file mode 100644
index 5f68e3deb23..00000000000
--- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-// !JVM_DEFAULT_MODE: disable
-// EXPECTED_ERROR: (kotlin:20:5) modifier private not allowed here
-
-interface Foo {
-    fun foo() {
-        System.out.println("foo")
-    }
-
-    @JvmDefault
-    fun foo2(a: Int) {
-        System.out.println("foo2")
-    }
-
-    fun bar()
-
-    private fun privateMethodWithDefault() {
-        System.out.println("privateMethodWithDefault")
-    }
-
-    @JvmDefault
-    private fun privateMethodWithDefault2() {
-        System.out.println("privateMethodWithDefault2")
-    }
-}
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.txt
deleted file mode 100644
index e3fcd9f2777..00000000000
--- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-@kotlin.Metadata()
-public abstract interface Foo {
-
-    public abstract void foo();
-
-    @kotlin.jvm.JvmDefault()
-    public default void foo2(int a) {
-    }
-
-    public abstract void bar();
-
-    @kotlin.jvm.JvmDefault()
-    private void privateMethodWithDefault2() {
-    }
-
-    @kotlin.Metadata()
-    public static final class DefaultImpls {
-
-        public DefaultImpls() {
-            super();
-        }
-
-        public static void foo(@org.jetbrains.annotations.NotNull()
-        Foo $this) {
-        }
-
-        private static void privateMethodWithDefault(Foo $this) {
-        }
-    }
-}
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.kt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.kt
deleted file mode 100644
index d87e348f596..00000000000
--- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-// !JVM_DEFAULT_MODE: enable
-// EXPECTED_ERROR: (kotlin:20:5) modifier private not allowed here
-
-interface Foo {
-    fun foo() {
-        System.out.println("foo")
-    }
-
-    @JvmDefault
-    fun foo2(a: Int) {
-        System.out.println("foo2")
-    }
-
-    fun bar()
-
-    private fun privateMethodWithDefault() {
-        System.out.println("privateMethodWithDefault")
-    }
-
-    @JvmDefault
-    private fun privateMethodWithDefault2() {
-        System.out.println("privateMethodWithDefault2")
-    }
-}
diff --git a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.txt b/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.txt
deleted file mode 100644
index e3fcd9f2777..00000000000
--- a/plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-@kotlin.Metadata()
-public abstract interface Foo {
-
-    public abstract void foo();
-
-    @kotlin.jvm.JvmDefault()
-    public default void foo2(int a) {
-    }
-
-    public abstract void bar();
-
-    @kotlin.jvm.JvmDefault()
-    private void privateMethodWithDefault2() {
-    }
-
-    @kotlin.Metadata()
-    public static final class DefaultImpls {
-
-        public DefaultImpls() {
-            super();
-        }
-
-        public static void foo(@org.jetbrains.annotations.NotNull()
-        Foo $this) {
-        }
-
-        private static void privateMethodWithDefault(Foo $this) {
-        }
-    }
-}
diff --git a/plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/ClassFileToSourceStubConverterTestGenerated.java b/plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/ClassFileToSourceStubConverterTestGenerated.java
index 4c52b34e128..221cb953326 100644
--- a/plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/ClassFileToSourceStubConverterTestGenerated.java
+++ b/plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/ClassFileToSourceStubConverterTestGenerated.java
@@ -331,18 +331,6 @@ public class ClassFileToSourceStubConverterTestGenerated extends AbstractClassFi
         runTest("plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAllCompatibility.kt");
     }
 
-    @Test
-    @TestMetadata("jvmDefaultDisable.kt")
-    public void testJvmDefaultDisable() throws Exception {
-        runTest("plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.kt");
-    }
-
-    @Test
-    @TestMetadata("jvmDefaultEnable.kt")
-    public void testJvmDefaultEnable() throws Exception {
-        runTest("plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.kt");
-    }
-
     @Test
     @TestMetadata("jvmOverloads.kt")
     public void testJvmOverloads() throws Exception {
diff --git a/plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/IrClassFileToSourceStubConverterTestGenerated.java b/plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/IrClassFileToSourceStubConverterTestGenerated.java
index 999f37cec68..e4d81707143 100644
--- a/plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/IrClassFileToSourceStubConverterTestGenerated.java
+++ b/plugins/kapt3/kapt3-compiler/tests-gen/org/jetbrains/kotlin/kapt3/test/runners/IrClassFileToSourceStubConverterTestGenerated.java
@@ -331,18 +331,6 @@ public class IrClassFileToSourceStubConverterTestGenerated extends AbstractIrCla
         runTest("plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultAllCompatibility.kt");
     }
 
-    @Test
-    @TestMetadata("jvmDefaultDisable.kt")
-    public void testJvmDefaultDisable() throws Exception {
-        runTest("plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultDisable.kt");
-    }
-
-    @Test
-    @TestMetadata("jvmDefaultEnable.kt")
-    public void testJvmDefaultEnable() throws Exception {
-        runTest("plugins/kapt3/kapt3-compiler/testData/converter/jvmDefaultEnable.kt");
-    }
-
     @Test
     @TestMetadata("jvmOverloads.kt")
     public void testJvmOverloads() throws Exception {
diff --git a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java
index 6d592a5b769..6bb2f0650c0 100644
--- a/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java
+++ b/wasm/wasm.tests/tests-gen/org/jetbrains/kotlin/wasm/test/IrCodegenBoxWasmTestGenerated.java
@@ -19347,19 +19347,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
                 }
             }
 
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/compatibility")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class Compatibility extends AbstractIrCodegenBoxWasmTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInCompatibility() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/compatibility"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-                }
-            }
-
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/delegationBy")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)
@@ -19425,19 +19412,6 @@ public class IrCodegenBoxWasmTestGenerated extends AbstractIrCodegenBoxWasmTest
                 }
             }
 
-            @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/noDelegation")
-            @TestDataPath("$PROJECT_ROOT")
-            @RunWith(JUnit3RunnerWithInners.class)
-            public static class NoDelegation extends AbstractIrCodegenBoxWasmTest {
-                private void runTest(String testDataFilePath) throws Exception {
-                    KotlinTestUtils.runTest0(this::doTest, TargetBackend.WASM, testDataFilePath);
-                }
-
-                public void testAllFilesPresentInNoDelegation() throws Exception {
-                    KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/codegen/box/jvm8/defaults/noDelegation"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.WASM, true);
-                }
-            }
-
             @TestMetadata("compiler/testData/codegen/box/jvm8/defaults/nonDefaultInheritance")
             @TestDataPath("$PROJECT_ROOT")
             @RunWith(JUnit3RunnerWithInners.class)