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 c8de0cf8425..a0b7e185262 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
@@ -21044,30 +21044,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
         runTest("compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclarationDisabled.kt");
       }
 
-      @Test
-      @TestMetadata("changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt")
-      public void testChangingNullabilityOfOrdinaryClassIsBinaryCompatibleChange() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt");
-      }
-
-      @Test
-      @TestMetadata("constructorsJvmSignaturesClash.kt")
-      public void testConstructorsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("delegatedPropertyInInlineClass.kt")
       public void testDelegatedPropertyInInlineClass() {
         runTest("compiler/testData/diagnostics/tests/inlineClasses/delegatedPropertyInInlineClass.kt");
       }
 
-      @Test
-      @TestMetadata("functionsJvmSignaturesClash.kt")
-      public void testFunctionsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/functionsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("functionsJvmSignaturesConflictOnInheritance.kt")
       public void testFunctionsJvmSignaturesConflictOnInheritance() {
@@ -40258,12 +40240,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
         runTest("compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.kt");
       }
 
-      @Test
-      @TestMetadata("constructorsJvmSignaturesClash.kt")
-      public void testConstructorsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("defaultParameters.kt")
       public void testDefaultParameters() {
@@ -40276,12 +40252,6 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
         runTest("compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.kt");
       }
 
-      @Test
-      @TestMetadata("functionsJvmSignaturesClash.kt")
-      public void testFunctionsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("functionsJvmSignaturesConflictOnInheritance.kt")
       public void testFunctionsJvmSignaturesConflictOnInheritance() {
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 79b3c0c4d2e..71dace03012 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
@@ -21044,30 +21044,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
         runTest("compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclarationDisabled.kt");
       }
 
-      @Test
-      @TestMetadata("changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt")
-      public void testChangingNullabilityOfOrdinaryClassIsBinaryCompatibleChange() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt");
-      }
-
-      @Test
-      @TestMetadata("constructorsJvmSignaturesClash.kt")
-      public void testConstructorsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("delegatedPropertyInInlineClass.kt")
       public void testDelegatedPropertyInInlineClass() {
         runTest("compiler/testData/diagnostics/tests/inlineClasses/delegatedPropertyInInlineClass.kt");
       }
 
-      @Test
-      @TestMetadata("functionsJvmSignaturesClash.kt")
-      public void testFunctionsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/functionsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("functionsJvmSignaturesConflictOnInheritance.kt")
       public void testFunctionsJvmSignaturesConflictOnInheritance() {
@@ -40258,12 +40240,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
         runTest("compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.kt");
       }
 
-      @Test
-      @TestMetadata("constructorsJvmSignaturesClash.kt")
-      public void testConstructorsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("defaultParameters.kt")
       public void testDefaultParameters() {
@@ -40276,12 +40252,6 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
         runTest("compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.kt");
       }
 
-      @Test
-      @TestMetadata("functionsJvmSignaturesClash.kt")
-      public void testFunctionsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("functionsJvmSignaturesConflictOnInheritance.kt")
       public void testFunctionsJvmSignaturesConflictOnInheritance() {
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 a57e9f6ec71..dda1a0411f0 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
@@ -21038,30 +21038,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
         runTest("compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclarationDisabled.kt");
       }
 
-      @Test
-      @TestMetadata("changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt")
-      public void testChangingNullabilityOfOrdinaryClassIsBinaryCompatibleChange() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt");
-      }
-
-      @Test
-      @TestMetadata("constructorsJvmSignaturesClash.kt")
-      public void testConstructorsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("delegatedPropertyInInlineClass.kt")
       public void testDelegatedPropertyInInlineClass() {
         runTest("compiler/testData/diagnostics/tests/inlineClasses/delegatedPropertyInInlineClass.kt");
       }
 
-      @Test
-      @TestMetadata("functionsJvmSignaturesClash.kt")
-      public void testFunctionsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/functionsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("functionsJvmSignaturesConflictOnInheritance.kt")
       public void testFunctionsJvmSignaturesConflictOnInheritance() {
@@ -37824,12 +37806,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
         runTest("compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.kt");
       }
 
-      @Test
-      @TestMetadata("constructorsJvmSignaturesClash.kt")
-      public void testConstructorsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("defaultParameters.kt")
       public void testDefaultParameters() {
@@ -37842,12 +37818,6 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
         runTest("compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.kt");
       }
 
-      @Test
-      @TestMetadata("functionsJvmSignaturesClash.kt")
-      public void testFunctionsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("functionsJvmSignaturesConflictOnInheritance.kt")
       public void testFunctionsJvmSignaturesConflictOnInheritance() {
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 7afef91eac9..abc16ff3759 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
@@ -21044,30 +21044,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
         runTest("compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclarationDisabled.kt");
       }
 
-      @Test
-      @TestMetadata("changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt")
-      public void testChangingNullabilityOfOrdinaryClassIsBinaryCompatibleChange() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt");
-      }
-
-      @Test
-      @TestMetadata("constructorsJvmSignaturesClash.kt")
-      public void testConstructorsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("delegatedPropertyInInlineClass.kt")
       public void testDelegatedPropertyInInlineClass() {
         runTest("compiler/testData/diagnostics/tests/inlineClasses/delegatedPropertyInInlineClass.kt");
       }
 
-      @Test
-      @TestMetadata("functionsJvmSignaturesClash.kt")
-      public void testFunctionsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/functionsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("functionsJvmSignaturesConflictOnInheritance.kt")
       public void testFunctionsJvmSignaturesConflictOnInheritance() {
@@ -37962,12 +37944,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
         runTest("compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.kt");
       }
 
-      @Test
-      @TestMetadata("constructorsJvmSignaturesClash.kt")
-      public void testConstructorsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("defaultParameters.kt")
       public void testDefaultParameters() {
@@ -37980,12 +37956,6 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
         runTest("compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.kt");
       }
 
-      @Test
-      @TestMetadata("functionsJvmSignaturesClash.kt")
-      public void testFunctionsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("functionsJvmSignaturesConflictOnInheritance.kt")
       public void testFunctionsJvmSignaturesConflictOnInheritance() {
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java
index 437a7936f7f..0ea9ddebb45 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated.java
@@ -772,11 +772,41 @@ public class FirLightTreeDiagnosticsTestWithJvmIrBackendGenerated extends Abstra
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
       }
 
+      @Test
+      @TestMetadata("changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt")
+      public void testChangingNullabilityOfOrdinaryClassIsBinaryCompatibleChange() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt");
+      }
+
+      @Test
+      @TestMetadata("constructorsJvmSignaturesClash.kt")
+      public void testConstructorsJvmSignaturesClash() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/constructorsJvmSignaturesClash.kt");
+      }
+
+      @Test
+      @TestMetadata("constructorsJvmSignaturesClashInlineClass.kt")
+      public void testConstructorsJvmSignaturesClashInlineClass() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/constructorsJvmSignaturesClashInlineClass.kt");
+      }
+
       @Test
       @TestMetadata("declarationClash.kt")
       public void testDeclarationClash() {
         runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.kt");
       }
+
+      @Test
+      @TestMetadata("functionsJvmSignaturesClash.kt")
+      public void testFunctionsJvmSignaturesClash() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/functionsJvmSignaturesClash.kt");
+      }
+
+      @Test
+      @TestMetadata("functionsJvmSignaturesClashInlineClass.kt")
+      public void testFunctionsJvmSignaturesClashInlineClass() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/functionsJvmSignaturesClashInlineClass.kt");
+      }
     }
   }
 
diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java
index ede7c58b984..626f8c5db79 100644
--- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java
+++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiDiagnosticsTestWithJvmIrBackendGenerated.java
@@ -772,11 +772,41 @@ public class FirPsiDiagnosticsTestWithJvmIrBackendGenerated extends AbstractFirP
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses"), Pattern.compile("^(.+)\\.kt$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), true);
       }
 
+      @Test
+      @TestMetadata("changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt")
+      public void testChangingNullabilityOfOrdinaryClassIsBinaryCompatibleChange() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt");
+      }
+
+      @Test
+      @TestMetadata("constructorsJvmSignaturesClash.kt")
+      public void testConstructorsJvmSignaturesClash() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/constructorsJvmSignaturesClash.kt");
+      }
+
+      @Test
+      @TestMetadata("constructorsJvmSignaturesClashInlineClass.kt")
+      public void testConstructorsJvmSignaturesClashInlineClass() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/constructorsJvmSignaturesClashInlineClass.kt");
+      }
+
       @Test
       @TestMetadata("declarationClash.kt")
       public void testDeclarationClash() {
         runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.kt");
       }
+
+      @Test
+      @TestMetadata("functionsJvmSignaturesClash.kt")
+      public void testFunctionsJvmSignaturesClash() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/functionsJvmSignaturesClash.kt");
+      }
+
+      @Test
+      @TestMetadata("functionsJvmSignaturesClashInlineClass.kt")
+      public void testFunctionsJvmSignaturesClashInlineClass() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/functionsJvmSignaturesClashInlineClass.kt");
+      }
     }
   }
 
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.fir.kt b/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.fir.kt
deleted file mode 100644
index 2eed42e6983..00000000000
--- a/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.fir.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// !LANGUAGE: +InlineClasses, -JvmInlineValueClasses
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-inline class IC(val i: Int)
-
-fun foo(a: Any, ic: IC) {}
-fun foo(a: Any?, ic: IC) {}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt b/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt
deleted file mode 100644
index dbc3ded3bcc..00000000000
--- a/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-// !LANGUAGE: +InlineClasses, -JvmInlineValueClasses
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-inline class IC(val i: Int)
-
-<!CONFLICTING_JVM_DECLARATIONS!>fun foo(a: Any, ic: IC)<!> {}
-<!CONFLICTING_JVM_DECLARATIONS!>fun foo(a: Any?, ic: IC)<!> {}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.txt b/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.txt
deleted file mode 100644
index bf10ceb74b6..00000000000
--- a/compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-package
-
-public fun foo(/*0*/ a: kotlin.Any, /*1*/ ic: IC): kotlin.Unit
-public fun foo(/*0*/ a: kotlin.Any?, /*1*/ ic: IC): kotlin.Unit
-
-public final inline class IC {
-    public constructor IC(/*0*/ i: kotlin.Int)
-    public final val i: kotlin.Int
-    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.fir.kt b/compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.fir.kt
deleted file mode 100644
index d7f614de46d..00000000000
--- a/compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.fir.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// !LANGUAGE: +InlineClasses, -JvmInlineValueClasses
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-inline class X(val x: Int)
-inline class Z(val x: Int)
-
-class TestOk1(val a: Int, val b: Int) {
-    constructor(x: X) : this(x.x, 1)
-}
-
-class TestErr1(val a: Int) {
-    constructor(x: X) : this(x.x)
-}
-
-class TestErr2(val a: Int, val b: Int) {
-    constructor(x: X) : this(x.x, 1)
-    constructor(z: Z) : this(z.x, 2)
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.kt b/compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.kt
deleted file mode 100644
index cc81abd4d0f..00000000000
--- a/compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-// !LANGUAGE: +InlineClasses, -JvmInlineValueClasses
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-inline class X(val x: Int)
-inline class Z(val x: Int)
-
-class TestOk1(val a: Int, val b: Int) {
-    constructor(x: X) : this(x.x, 1)
-}
-
-class TestErr1(val a: Int) {
-    <!CONFLICTING_JVM_DECLARATIONS!>constructor(x: X)<!> : this(x.x)
-}
-
-class <!CONFLICTING_JVM_DECLARATIONS!>TestErr2(val a: Int, val b: Int)<!> {
-    <!CONFLICTING_JVM_DECLARATIONS!>constructor(x: X)<!> : this(x.x, 1)
-    <!CONFLICTING_JVM_DECLARATIONS!>constructor(z: Z)<!> : this(z.x, 2)
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.txt b/compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.txt
deleted file mode 100644
index ad532517a91..00000000000
--- a/compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-package
-
-public final class TestErr1 {
-    public constructor TestErr1(/*0*/ x: X)
-    public constructor TestErr1(/*0*/ a: kotlin.Int)
-    public final val a: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class TestErr2 {
-    public constructor TestErr2(/*0*/ x: X)
-    public constructor TestErr2(/*0*/ z: Z)
-    public constructor TestErr2(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int)
-    public final val a: kotlin.Int
-    public final val b: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final class TestOk1 {
-    public constructor TestOk1(/*0*/ x: X)
-    public constructor TestOk1(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int)
-    public final val a: kotlin.Int
-    public final val b: kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final inline class X {
-    public constructor X(/*0*/ x: kotlin.Int)
-    public final val x: kotlin.Int
-    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-}
-
-public final inline class Z {
-    public constructor Z(/*0*/ x: kotlin.Int)
-    public final val x: kotlin.Int
-    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/functionsJvmSignaturesClash.fir.kt b/compiler/testData/diagnostics/tests/inlineClasses/functionsJvmSignaturesClash.fir.kt
deleted file mode 100644
index 8a7d39aac8c..00000000000
--- a/compiler/testData/diagnostics/tests/inlineClasses/functionsJvmSignaturesClash.fir.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-// !LANGUAGE: +InlineClasses, -JvmInlineValueClasses
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-inline class X(val x: Int)
-inline class Z(val x: Int)
-inline class Str(val str: String)
-inline class Name(val name: String)
-inline class NStr(val str: String?)
-
-fun testSimple(x: X) {}
-fun testSimple(z: Z) {}
-
-fun testMixed(x: Int, y: Int) {}
-fun testMixed(x: X, y: Int) {}
-fun testMixed(x: Int, y: X) {}
-fun testMixed(x: X, y: X) {}
-
-fun testNewType(s: Str) {}
-fun testNewType(name: Name) {}
-
-fun testNullableVsNonNull1(s: Str) {}
-fun testNullableVsNonNull1(s: Str?) {}
-
-fun testNullableVsNonNull2(ns: NStr) {}
-fun testNullableVsNonNull2(ns: NStr?) {}
-
-fun testFunVsExt(x: X) {}
-fun X.testFunVsExt() {}
-
-fun testNonGenericVsGeneric(x: X, y: Number) {}
-fun <T : Number> testNonGenericVsGeneric(x: X, y: T) {}
-
-class C<TC : Number> {
-    fun testNonGenericVsGeneric(x: X, y: Number) {}
-    fun <T : Number> testNonGenericVsGeneric(x: X, y: T) {}
-    fun testNonGenericVsGeneric(x: X, y: TC) {}
-}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/functionsJvmSignaturesClash.txt b/compiler/testData/diagnostics/tests/inlineClasses/functionsJvmSignaturesClash.txt
deleted file mode 100644
index 84b7ae97e21..00000000000
--- a/compiler/testData/diagnostics/tests/inlineClasses/functionsJvmSignaturesClash.txt
+++ /dev/null
@@ -1,68 +0,0 @@
-package
-
-public fun testFunVsExt(/*0*/ x: X): kotlin.Unit
-public fun testMixed(/*0*/ x: X, /*1*/ y: X): kotlin.Unit
-public fun testMixed(/*0*/ x: X, /*1*/ y: kotlin.Int): kotlin.Unit
-public fun testMixed(/*0*/ x: kotlin.Int, /*1*/ y: X): kotlin.Unit
-public fun testMixed(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int): kotlin.Unit
-public fun testNewType(/*0*/ name: Name): kotlin.Unit
-public fun testNewType(/*0*/ s: Str): kotlin.Unit
-public fun </*0*/ T : kotlin.Number> testNonGenericVsGeneric(/*0*/ x: X, /*1*/ y: T): kotlin.Unit
-public fun testNonGenericVsGeneric(/*0*/ x: X, /*1*/ y: kotlin.Number): kotlin.Unit
-public fun testNullableVsNonNull1(/*0*/ s: Str): kotlin.Unit
-public fun testNullableVsNonNull1(/*0*/ s: Str?): kotlin.Unit
-public fun testNullableVsNonNull2(/*0*/ ns: NStr): kotlin.Unit
-public fun testNullableVsNonNull2(/*0*/ ns: NStr?): kotlin.Unit
-public fun testSimple(/*0*/ x: X): kotlin.Unit
-public fun testSimple(/*0*/ z: Z): kotlin.Unit
-public fun X.testFunVsExt(): kotlin.Unit
-
-public final class C</*0*/ TC : kotlin.Number> {
-    public constructor C</*0*/ TC : kotlin.Number>()
-    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 final fun </*0*/ T : kotlin.Number> testNonGenericVsGeneric(/*0*/ x: X, /*1*/ y: T): kotlin.Unit
-    public final fun testNonGenericVsGeneric(/*0*/ x: X, /*1*/ y: TC): kotlin.Unit
-    public final fun testNonGenericVsGeneric(/*0*/ x: X, /*1*/ y: kotlin.Number): kotlin.Unit
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-}
-
-public final inline class NStr {
-    public constructor NStr(/*0*/ str: kotlin.String?)
-    public final val str: kotlin.String?
-    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-}
-
-public final inline class Name {
-    public constructor Name(/*0*/ name: kotlin.String)
-    public final val name: kotlin.String
-    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-}
-
-public final inline class Str {
-    public constructor Str(/*0*/ str: kotlin.String)
-    public final val str: kotlin.String
-    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-}
-
-public final inline class X {
-    public constructor X(/*0*/ x: kotlin.Int)
-    public final val x: kotlin.Int
-    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-}
-
-public final inline class Z {
-    public constructor Z(/*0*/ x: kotlin.Int)
-    public final val x: kotlin.Int
-    public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-    public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-    public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-}
diff --git a/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.fir.kt b/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.fir.kt
deleted file mode 100644
index 6bb3a3c3366..00000000000
--- a/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.fir.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-// !SKIP_JAVAC
-// !LANGUAGE: +InlineClasses
-// ALLOW_KOTLIN_PACKAGE
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-package kotlin.jvm
-
-annotation class JvmInline
-
-@JvmInline
-value class X(val x: Int)
-@JvmInline
-value class Z(val x: Int)
-
-class TestOk1(val a: Int, val b: Int) {
-    constructor(x: X) : this(x.x, 1)
-}
-
-class TestErr1(val a: Int) {
-    constructor(x: X) : this(x.x)
-}
-
-class TestErr2(val a: Int, val b: Int) {
-    constructor(x: X) : this(x.x, 1)
-    constructor(z: Z) : this(z.x, 2)
-}
diff --git a/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.kt b/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.kt
deleted file mode 100644
index 57b48342fb0..00000000000
--- a/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-// !SKIP_JAVAC
-// !LANGUAGE: +InlineClasses
-// ALLOW_KOTLIN_PACKAGE
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-package kotlin.jvm
-
-annotation class JvmInline
-
-@JvmInline
-value class X(val x: Int)
-@JvmInline
-value class Z(val x: Int)
-
-class TestOk1(val a: Int, val b: Int) {
-    constructor(x: X) : this(x.x, 1)
-}
-
-class TestErr1(val a: Int) {
-    <!CONFLICTING_JVM_DECLARATIONS!>constructor(x: X)<!> : this(x.x)
-}
-
-class <!CONFLICTING_JVM_DECLARATIONS!>TestErr2(val a: Int, val b: Int)<!> {
-    <!CONFLICTING_JVM_DECLARATIONS!>constructor(x: X)<!> : this(x.x, 1)
-    <!CONFLICTING_JVM_DECLARATIONS!>constructor(z: Z)<!> : this(z.x, 2)
-}
diff --git a/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.txt b/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.txt
deleted file mode 100644
index a5ca3b1c84f..00000000000
--- a/compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-package
-
-package kotlin {
-
-    package kotlin.jvm {
-
-        public final annotation class JvmInline : kotlin.Annotation {
-            public constructor JvmInline()
-            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-
-        public final class TestErr1 {
-            public constructor TestErr1(/*0*/ a: kotlin.Int)
-            public constructor TestErr1(/*0*/ x: kotlin.jvm.X)
-            public final val a: kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-
-        public final class TestErr2 {
-            public constructor TestErr2(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int)
-            public constructor TestErr2(/*0*/ x: kotlin.jvm.X)
-            public constructor TestErr2(/*0*/ z: kotlin.jvm.Z)
-            public final val a: kotlin.Int
-            public final val b: kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-
-        public final class TestOk1 {
-            public constructor TestOk1(/*0*/ a: kotlin.Int, /*1*/ b: kotlin.Int)
-            public constructor TestOk1(/*0*/ x: kotlin.jvm.X)
-            public final val a: kotlin.Int
-            public final val b: kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-
-        @kotlin.jvm.JvmInline public final value class X {
-            public constructor X(/*0*/ x: kotlin.Int)
-            public final val x: kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-        }
-
-        @kotlin.jvm.JvmInline public final value class Z {
-            public constructor Z(/*0*/ x: kotlin.Int)
-            public final val x: kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-        }
-    }
-}
diff --git a/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.fir.kt b/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.fir.kt
deleted file mode 100644
index f4fe5d91ced..00000000000
--- a/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.fir.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-// !SKIP_JAVAC
-// !LANGUAGE: +InlineClasses
-// ALLOW_KOTLIN_PACKAGE
-// !DIAGNOSTICS: -UNUSED_PARAMETER
-
-package kotlin.jvm
-
-annotation class JvmInline
-
-@JvmInline
-value class X(val x: Int)
-@JvmInline
-value class Z(val x: Int)
-@JvmInline
-value class Str(val str: String)
-@JvmInline
-value class Name(val name: String)
-@JvmInline
-value class NStr(val str: String?)
-
-fun testSimple(x: X) {}
-fun testSimple(z: Z) {}
-
-fun testMixed(x: Int, y: Int) {}
-fun testMixed(x: X, y: Int) {}
-fun testMixed(x: Int, y: X) {}
-fun testMixed(x: X, y: X) {}
-
-fun testNewType(s: Str) {}
-fun testNewType(name: Name) {}
-
-fun testNullableVsNonNull1(s: Str) {}
-fun testNullableVsNonNull1(s: Str?) {}
-
-fun testNullableVsNonNull2(ns: NStr) {}
-fun testNullableVsNonNull2(ns: NStr?) {}
-
-fun testFunVsExt(x: X) {}
-fun X.testFunVsExt() {}
-
-fun testNonGenericVsGeneric(x: X, y: Number) {}
-fun <T : Number> testNonGenericVsGeneric(x: X, y: T) {}
-
-class C<TC : Number> {
-    fun testNonGenericVsGeneric(x: X, y: Number) {}
-    fun <T : Number> testNonGenericVsGeneric(x: X, y: T) {}
-    fun testNonGenericVsGeneric(x: X, y: TC) {}
-}
diff --git a/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.txt b/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.txt
deleted file mode 100644
index 40dd2b88326..00000000000
--- a/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.txt
+++ /dev/null
@@ -1,80 +0,0 @@
-package
-
-package kotlin {
-
-    package kotlin.jvm {
-        public fun testFunVsExt(/*0*/ x: kotlin.jvm.X): kotlin.Unit
-        public fun testMixed(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int): kotlin.Unit
-        public fun testMixed(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.jvm.X): kotlin.Unit
-        public fun testMixed(/*0*/ x: kotlin.jvm.X, /*1*/ y: kotlin.Int): kotlin.Unit
-        public fun testMixed(/*0*/ x: kotlin.jvm.X, /*1*/ y: kotlin.jvm.X): kotlin.Unit
-        public fun testNewType(/*0*/ name: kotlin.jvm.Name): kotlin.Unit
-        public fun testNewType(/*0*/ s: kotlin.jvm.Str): kotlin.Unit
-        public fun </*0*/ T : kotlin.Number> testNonGenericVsGeneric(/*0*/ x: kotlin.jvm.X, /*1*/ y: T): kotlin.Unit
-        public fun testNonGenericVsGeneric(/*0*/ x: kotlin.jvm.X, /*1*/ y: kotlin.Number): kotlin.Unit
-        public fun testNullableVsNonNull1(/*0*/ s: kotlin.jvm.Str): kotlin.Unit
-        public fun testNullableVsNonNull1(/*0*/ s: kotlin.jvm.Str?): kotlin.Unit
-        public fun testNullableVsNonNull2(/*0*/ ns: kotlin.jvm.NStr): kotlin.Unit
-        public fun testNullableVsNonNull2(/*0*/ ns: kotlin.jvm.NStr?): kotlin.Unit
-        public fun testSimple(/*0*/ x: kotlin.jvm.X): kotlin.Unit
-        public fun testSimple(/*0*/ z: kotlin.jvm.Z): kotlin.Unit
-        public fun kotlin.jvm.X.testFunVsExt(): kotlin.Unit
-
-        public final class C</*0*/ TC : kotlin.Number> {
-            public constructor C</*0*/ TC : kotlin.Number>()
-            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 final fun </*0*/ T : kotlin.Number> testNonGenericVsGeneric(/*0*/ x: kotlin.jvm.X, /*1*/ y: T): kotlin.Unit
-            public final fun testNonGenericVsGeneric(/*0*/ x: kotlin.jvm.X, /*1*/ y: TC): kotlin.Unit
-            public final fun testNonGenericVsGeneric(/*0*/ x: kotlin.jvm.X, /*1*/ y: kotlin.Number): kotlin.Unit
-            public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-        }
-
-        public final annotation class JvmInline : kotlin.Annotation {
-            public constructor JvmInline()
-            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
-        }
-
-        @kotlin.jvm.JvmInline public final value class NStr {
-            public constructor NStr(/*0*/ str: kotlin.String?)
-            public final val str: kotlin.String?
-            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-        }
-
-        @kotlin.jvm.JvmInline public final value class Name {
-            public constructor Name(/*0*/ name: kotlin.String)
-            public final val name: kotlin.String
-            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-        }
-
-        @kotlin.jvm.JvmInline public final value class Str {
-            public constructor Str(/*0*/ str: kotlin.String)
-            public final val str: kotlin.String
-            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-        }
-
-        @kotlin.jvm.JvmInline public final value class X {
-            public constructor X(/*0*/ x: kotlin.Int)
-            public final val x: kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-        }
-
-        @kotlin.jvm.JvmInline public final value class Z {
-            public constructor Z(/*0*/ x: kotlin.Int)
-            public final val x: kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
-            public open override /*1*/ /*synthesized*/ fun hashCode(): kotlin.Int
-            public open override /*1*/ /*synthesized*/ fun toString(): kotlin.String
-        }
-    }
-}
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt
new file mode 100644
index 00000000000..1f7608245de
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt
@@ -0,0 +1,8 @@
+// FIR_IDENTICAL
+// !LANGUAGE: +InlineClasses, -JvmInlineValueClasses
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+inline class IC(val i: Int)
+
+<!CONFLICTING_JVM_DECLARATIONS!>fun foo(a: Any, ic: IC) {}<!>
+<!CONFLICTING_JVM_DECLARATIONS!>fun foo(a: Any?, ic: IC) {}<!>
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/constructorsJvmSignaturesClash.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/constructorsJvmSignaturesClash.kt
new file mode 100644
index 00000000000..cdeb86dbba9
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/constructorsJvmSignaturesClash.kt
@@ -0,0 +1,26 @@
+// FIR_IDENTICAL
+// !LANGUAGE: +InlineClasses
+// ALLOW_KOTLIN_PACKAGE
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+package kotlin.jvm
+
+annotation class JvmInline
+
+@JvmInline
+value class X(val x: Int)
+@JvmInline
+value class Z(val x: Int)
+
+class TestOk1(val a: Int, val b: Int) {
+    constructor(x: X) : this(x.x, 1)
+}
+
+class TestErr1<!CONFLICTING_JVM_DECLARATIONS!>(val a: Int)<!> {
+    <!CONFLICTING_JVM_DECLARATIONS!>constructor(x: X) : this(x.x)<!>
+}
+
+<!CONFLICTING_JVM_DECLARATIONS!>class TestErr2(val a: Int, val b: Int) {
+    <!CONFLICTING_JVM_DECLARATIONS!>constructor(x: X) : this(x.x, 1)<!>
+    <!CONFLICTING_JVM_DECLARATIONS!>constructor(z: Z) : this(z.x, 2)<!>
+}<!>
diff --git a/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/constructorsJvmSignaturesClashInlineClass.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/constructorsJvmSignaturesClashInlineClass.kt
new file mode 100644
index 00000000000..780aef625df
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/constructorsJvmSignaturesClashInlineClass.kt
@@ -0,0 +1,19 @@
+// FIR_IDENTICAL
+// !LANGUAGE: +InlineClasses, -JvmInlineValueClasses
+// !DIAGNOSTICS: -UNUSED_PARAMETER
+
+inline class X(val x: Int)
+inline class Z(val x: Int)
+
+class TestOk1(val a: Int, val b: Int) {
+    constructor(x: X) : this(x.x, 1)
+}
+
+class TestErr1<!CONFLICTING_JVM_DECLARATIONS!>(val a: Int)<!> {
+    <!CONFLICTING_JVM_DECLARATIONS!>constructor(x: X) : this(x.x)<!>
+}
+
+<!CONFLICTING_JVM_DECLARATIONS!>class TestErr2(val a: Int, val b: Int) {
+    <!CONFLICTING_JVM_DECLARATIONS!>constructor(x: X) : this(x.x, 1)<!>
+    <!CONFLICTING_JVM_DECLARATIONS!>constructor(z: Z) : this(z.x, 2)<!>
+}<!>
diff --git a/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/functionsJvmSignaturesClash.kt
similarity index 80%
rename from compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/functionsJvmSignaturesClash.kt
index 43799673545..85bda543b5c 100644
--- a/compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.kt
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/functionsJvmSignaturesClash.kt
@@ -1,4 +1,4 @@
-// !SKIP_JAVAC
+// FIR_IDENTICAL
 // !LANGUAGE: +InlineClasses
 // ALLOW_KOTLIN_PACKAGE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
@@ -35,14 +35,14 @@ fun testNullableVsNonNull1(s: Str?) {}
 fun testNullableVsNonNull2(ns: NStr) {}
 fun testNullableVsNonNull2(ns: NStr?) {}
 
-<!CONFLICTING_JVM_DECLARATIONS!>fun testFunVsExt(x: X)<!> {}
-<!CONFLICTING_JVM_DECLARATIONS!>fun X.testFunVsExt()<!> {}
+<!CONFLICTING_JVM_DECLARATIONS!>fun testFunVsExt(x: X) {}<!>
+<!CONFLICTING_JVM_DECLARATIONS!>fun X.testFunVsExt() {}<!>
 
-<!CONFLICTING_JVM_DECLARATIONS!>fun testNonGenericVsGeneric(x: X, y: Number)<!> {}
-<!CONFLICTING_JVM_DECLARATIONS!>fun <T : Number> testNonGenericVsGeneric(x: X, y: T)<!> {}
+<!CONFLICTING_JVM_DECLARATIONS!>fun testNonGenericVsGeneric(x: X, y: Number) {}<!>
+<!CONFLICTING_JVM_DECLARATIONS!>fun <T : Number> testNonGenericVsGeneric(x: X, y: T) {}<!>
 
 class C<TC : Number> {
-    <!CONFLICTING_JVM_DECLARATIONS!>fun testNonGenericVsGeneric(x: X, y: Number)<!> {}
-    <!CONFLICTING_JVM_DECLARATIONS!>fun <T : Number> testNonGenericVsGeneric(x: X, y: T)<!> {}
-    <!CONFLICTING_JVM_DECLARATIONS!>fun testNonGenericVsGeneric(x: X, y: TC)<!> {}
+    <!CONFLICTING_JVM_DECLARATIONS!>fun testNonGenericVsGeneric(x: X, y: Number) {}<!>
+    <!CONFLICTING_JVM_DECLARATIONS!>fun <T : Number> testNonGenericVsGeneric(x: X, y: T) {}<!>
+    <!CONFLICTING_JVM_DECLARATIONS!>fun testNonGenericVsGeneric(x: X, y: TC) {}<!>
 }
diff --git a/compiler/testData/diagnostics/tests/inlineClasses/functionsJvmSignaturesClash.kt b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/functionsJvmSignaturesClashInlineClass.kt
similarity index 79%
rename from compiler/testData/diagnostics/tests/inlineClasses/functionsJvmSignaturesClash.kt
rename to compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/functionsJvmSignaturesClashInlineClass.kt
index bdd68fc1692..f3860cd6046 100644
--- a/compiler/testData/diagnostics/tests/inlineClasses/functionsJvmSignaturesClash.kt
+++ b/compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/functionsJvmSignaturesClashInlineClass.kt
@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 // !LANGUAGE: +InlineClasses, -JvmInlineValueClasses
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
@@ -24,14 +25,14 @@ fun testNullableVsNonNull1(s: Str?) {}
 fun testNullableVsNonNull2(ns: NStr) {}
 fun testNullableVsNonNull2(ns: NStr?) {}
 
-<!CONFLICTING_JVM_DECLARATIONS!>fun testFunVsExt(x: X)<!> {}
-<!CONFLICTING_JVM_DECLARATIONS!>fun X.testFunVsExt()<!> {}
+<!CONFLICTING_JVM_DECLARATIONS!>fun testFunVsExt(x: X) {}<!>
+<!CONFLICTING_JVM_DECLARATIONS!>fun X.testFunVsExt() {}<!>
 
-<!CONFLICTING_JVM_DECLARATIONS!>fun testNonGenericVsGeneric(x: X, y: Number)<!> {}
-<!CONFLICTING_JVM_DECLARATIONS!>fun <T : Number> testNonGenericVsGeneric(x: X, y: T)<!> {}
+<!CONFLICTING_JVM_DECLARATIONS!>fun testNonGenericVsGeneric(x: X, y: Number) {}<!>
+<!CONFLICTING_JVM_DECLARATIONS!>fun <T : Number> testNonGenericVsGeneric(x: X, y: T) {}<!>
 
 class C<TC : Number> {
-    <!CONFLICTING_JVM_DECLARATIONS!>fun testNonGenericVsGeneric(x: X, y: Number)<!> {}
-    <!CONFLICTING_JVM_DECLARATIONS!>fun <T : Number> testNonGenericVsGeneric(x: X, y: T)<!> {}
-    <!CONFLICTING_JVM_DECLARATIONS!>fun testNonGenericVsGeneric(x: X, y: TC)<!> {}
-}
\ No newline at end of file
+    <!CONFLICTING_JVM_DECLARATIONS!>fun testNonGenericVsGeneric(x: X, y: Number) {}<!>
+    <!CONFLICTING_JVM_DECLARATIONS!>fun <T : Number> testNonGenericVsGeneric(x: X, y: T) {}<!>
+    <!CONFLICTING_JVM_DECLARATIONS!>fun testNonGenericVsGeneric(x: X, y: TC) {}<!>
+}
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 081c99a41f7..88b66120ae9 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
@@ -21044,30 +21044,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
         runTest("compiler/testData/diagnostics/tests/inlineClasses/basicInlineClassDeclarationDisabled.kt");
       }
 
-      @Test
-      @TestMetadata("changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt")
-      public void testChangingNullabilityOfOrdinaryClassIsBinaryCompatibleChange() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt");
-      }
-
-      @Test
-      @TestMetadata("constructorsJvmSignaturesClash.kt")
-      public void testConstructorsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/constructorsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("delegatedPropertyInInlineClass.kt")
       public void testDelegatedPropertyInInlineClass() {
         runTest("compiler/testData/diagnostics/tests/inlineClasses/delegatedPropertyInInlineClass.kt");
       }
 
-      @Test
-      @TestMetadata("functionsJvmSignaturesClash.kt")
-      public void testFunctionsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/inlineClasses/functionsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("functionsJvmSignaturesConflictOnInheritance.kt")
       public void testFunctionsJvmSignaturesConflictOnInheritance() {
@@ -40258,12 +40240,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
         runTest("compiler/testData/diagnostics/tests/valueClasses/basicValueClassDeclarationDisabled.kt");
       }
 
-      @Test
-      @TestMetadata("constructorsJvmSignaturesClash.kt")
-      public void testConstructorsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/valueClasses/constructorsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("defaultParameters.kt")
       public void testDefaultParameters() {
@@ -40276,12 +40252,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
         runTest("compiler/testData/diagnostics/tests/valueClasses/delegatedPropertyInValueClass.kt");
       }
 
-      @Test
-      @TestMetadata("functionsJvmSignaturesClash.kt")
-      public void testFunctionsJvmSignaturesClash() {
-        runTest("compiler/testData/diagnostics/tests/valueClasses/functionsJvmSignaturesClash.kt");
-      }
-
       @Test
       @TestMetadata("functionsJvmSignaturesConflictOnInheritance.kt")
       public void testFunctionsJvmSignaturesConflictOnInheritance() {
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java
index 782d2540c0b..8b7abebfe4b 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticsTestWithJvmIrBackendGenerated.java
@@ -773,11 +773,41 @@ public class DiagnosticsTestWithJvmIrBackendGenerated extends AbstractDiagnostic
         KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses"), Pattern.compile("^(.+)\\.kts?$"), Pattern.compile("^(.+)\\.(reversed|fir|ll)\\.kts?$"), TargetBackend.JVM_IR, true);
       }
 
+      @Test
+      @TestMetadata("changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt")
+      public void testChangingNullabilityOfOrdinaryClassIsBinaryCompatibleChange() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/changingNullabilityOfOrdinaryClassIsBinaryCompatibleChange.kt");
+      }
+
+      @Test
+      @TestMetadata("constructorsJvmSignaturesClash.kt")
+      public void testConstructorsJvmSignaturesClash() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/constructorsJvmSignaturesClash.kt");
+      }
+
+      @Test
+      @TestMetadata("constructorsJvmSignaturesClashInlineClass.kt")
+      public void testConstructorsJvmSignaturesClashInlineClass() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/constructorsJvmSignaturesClashInlineClass.kt");
+      }
+
       @Test
       @TestMetadata("declarationClash.kt")
       public void testDeclarationClash() {
         runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/declarationClash.kt");
       }
+
+      @Test
+      @TestMetadata("functionsJvmSignaturesClash.kt")
+      public void testFunctionsJvmSignaturesClash() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/functionsJvmSignaturesClash.kt");
+      }
+
+      @Test
+      @TestMetadata("functionsJvmSignaturesClashInlineClass.kt")
+      public void testFunctionsJvmSignaturesClashInlineClass() {
+        runTest("compiler/testData/diagnostics/testsWithJvmBackend/duplicateJvmSignature/valueClasses/functionsJvmSignaturesClashInlineClass.kt");
+      }
     }
   }