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 2eaca26a956..37467fbcc44 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
@@ -11959,12 +11959,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
           runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt");
         }
 
-        @Test
-        @TestMetadata("require.kt")
-        public void testRequire() {
-          runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt");
-        }
-
         @Test
         @TestMetadata("traitFunctionOverriddenByProperty.kt")
         public void testTraitFunctionOverriddenByProperty() {
@@ -12268,12 +12262,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
         public void testTrait() {
           runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt");
         }
-
-        @Test
-        @TestMetadata("withErrorTypes.kt")
-        public void testWithErrorTypes() {
-          runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.kt");
-        }
       }
 
       @Nested
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 10e0a9d506c..62eabc1f7ba 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
@@ -11959,12 +11959,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
           runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt");
         }
 
-        @Test
-        @TestMetadata("require.kt")
-        public void testRequire() {
-          runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt");
-        }
-
         @Test
         @TestMetadata("traitFunctionOverriddenByProperty.kt")
         public void testTraitFunctionOverriddenByProperty() {
@@ -12268,12 +12262,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
         public void testTrait() {
           runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt");
         }
-
-        @Test
-        @TestMetadata("withErrorTypes.kt")
-        public void testWithErrorTypes() {
-          runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.kt");
-        }
       }
 
       @Nested
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 ec736c5c84e..367158a588b 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
@@ -11953,12 +11953,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
           runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt");
         }
 
-        @Test
-        @TestMetadata("require.kt")
-        public void testRequire() {
-          runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt");
-        }
-
         @Test
         @TestMetadata("traitFunctionOverriddenByProperty.kt")
         public void testTraitFunctionOverriddenByProperty() {
@@ -12262,12 +12256,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
         public void testTrait() {
           runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt");
         }
-
-        @Test
-        @TestMetadata("withErrorTypes.kt")
-        public void testWithErrorTypes() {
-          runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.kt");
-        }
       }
 
       @Nested
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 851bc85f14e..c8c0242ebdd 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
@@ -11959,12 +11959,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
           runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt");
         }
 
-        @Test
-        @TestMetadata("require.kt")
-        public void testRequire() {
-          runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt");
-        }
-
         @Test
         @TestMetadata("traitFunctionOverriddenByProperty.kt")
         public void testTraitFunctionOverriddenByProperty() {
@@ -12268,12 +12262,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
         public void testTrait() {
           runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt");
         }
-
-        @Test
-        @TestMetadata("withErrorTypes.kt")
-        public void testWithErrorTypes() {
-          runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.kt");
-        }
       }
 
       @Nested
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.fir.kt
deleted file mode 100644
index 494896d97d6..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.fir.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-open class C {
-    val x = 1
-}
-
-interface Tr : <!INTERFACE_WITH_SUPERCLASS!>C<!> {
-    fun getX() = 1
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt
deleted file mode 100644
index a5d3de05b1c..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-open class C {
-    val x = 1
-}
-
-interface Tr : <!INTERFACE_WITH_SUPERCLASS!>C<!> {
-    <!ACCIDENTAL_OVERRIDE!>fun getX()<!> = 1
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.txt
deleted file mode 100644
index baeb81090de..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-package
-
-public open class C {
-    public constructor C()
-    public final val x: kotlin.Int = 1
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public interface Tr : C {
-    public final override /*1*/ /*fake_override*/ val x: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open fun getX(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.fir.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.fir.kt
deleted file mode 100644
index f0601703d23..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.fir.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-interface T {
-    val x: <!UNRESOLVED_REFERENCE!>ErrorType<!>
-    fun getX(): <!UNRESOLVED_REFERENCE!>ErrorType1<!>
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.kt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.kt
deleted file mode 100644
index 590b43d196c..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-interface T {
-    <!CONFLICTING_JVM_DECLARATIONS!>val x: <!UNRESOLVED_REFERENCE!>ErrorType<!><!>
-    <!CONFLICTING_JVM_DECLARATIONS!>fun getX(): <!UNRESOLVED_REFERENCE!>ErrorType1<!><!>
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.txt b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.txt
deleted file mode 100644
index 8e2d8f9d94a..00000000000
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-package
-
-public interface T {
-    public abstract val x: [Error type: Unresolved type for ErrorType]
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public abstract fun getX(): [Error type: Unresolved type for ErrorType1]
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
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 1afcd244096..6ac12a0faa1 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
@@ -11959,12 +11959,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
           runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.kt");
         }
 
-        @Test
-        @TestMetadata("require.kt")
-        public void testRequire() {
-          runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/require.kt");
-        }
-
         @Test
         @TestMetadata("traitFunctionOverriddenByProperty.kt")
         public void testTraitFunctionOverriddenByProperty() {
@@ -12268,12 +12262,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
         public void testTrait() {
           runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/trait.kt");
         }
-
-        @Test
-        @TestMetadata("withErrorTypes.kt")
-        public void testWithErrorTypes() {
-          runTest("compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/withErrorTypes.kt");
-        }
       }
 
       @Nested