diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
index 7bd1a1cc4fa..f780e217655 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
@@ -16877,12 +16877,6 @@ public class DiagnosisCompilerTestFE10TestdataTestGenerated extends AbstractDiag
                     runTest("compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitution.kt");
                 }
 
-                @Test
-                @TestMetadata("kt32189returnTypeWithTypealiasSubtitutionOldInference.kt")
-                public void testKt32189returnTypeWithTypealiasSubtitutionOldInference() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitutionOldInference.kt");
-                }
-
                 @Test
                 @TestMetadata("kt6081SubstituteIntoClassCorrectly.kt")
                 public void testKt6081SubstituteIntoClassCorrectly() throws Exception {
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.kt
index cb8ce6df121..3a1b012becd 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/callableReferences/fromBasicDiagnosticTests/eagerResolveOfSingleCallableReference.kt
@@ -1,4 +1,3 @@
-// !LANGUAGE: -NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 open class A
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
index aed18274fa9..ef8e49f861e 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
@@ -16877,12 +16877,6 @@ public class FirOldFrontendDiagnosticsTestGenerated extends AbstractFirDiagnosti
                     runTest("compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitution.kt");
                 }
 
-                @Test
-                @TestMetadata("kt32189returnTypeWithTypealiasSubtitutionOldInference.kt")
-                public void testKt32189returnTypeWithTypealiasSubtitutionOldInference() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitutionOldInference.kt");
-                }
-
                 @Test
                 @TestMetadata("kt6081SubstituteIntoClassCorrectly.kt")
                 public void testKt6081SubstituteIntoClassCorrectly() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
index b61052cecb3..b318b6d1d5e 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
@@ -16877,12 +16877,6 @@ public class FirOldFrontendDiagnosticsWithLightTreeTestGenerated extends Abstrac
                     runTest("compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitution.kt");
                 }
 
-                @Test
-                @TestMetadata("kt32189returnTypeWithTypealiasSubtitutionOldInference.kt")
-                public void testKt32189returnTypeWithTypealiasSubtitutionOldInference() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitutionOldInference.kt");
-                }
-
                 @Test
                 @TestMetadata("kt6081SubstituteIntoClassCorrectly.kt")
                 public void testKt6081SubstituteIntoClassCorrectly() throws Exception {
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/eagerResolveOfSingleCallableReference.fir.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/eagerResolveOfSingleCallableReference.fir.kt
index 653866f6135..f9ae7036a96 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/eagerResolveOfSingleCallableReference.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/eagerResolveOfSingleCallableReference.fir.kt
@@ -1,4 +1,3 @@
-// !LANGUAGE: -NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 open class A
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/eagerResolveOfSingleCallableReference.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/eagerResolveOfSingleCallableReference.kt
index 02cc0659099..45956b1ed24 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/eagerResolveOfSingleCallableReference.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/eagerResolveOfSingleCallableReference.kt
@@ -1,4 +1,3 @@
-// !LANGUAGE: -NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 open class A
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/lessSpecificTypeForArgumentCallWithExactAnnotation.fir.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/lessSpecificTypeForArgumentCallWithExactAnnotation.fir.kt
index ec17aa6181f..cb9a0ce05c1 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/lessSpecificTypeForArgumentCallWithExactAnnotation.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/lessSpecificTypeForArgumentCallWithExactAnnotation.fir.kt
@@ -1,4 +1,3 @@
-// !LANGUAGE: -NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/lessSpecificTypeForArgumentCallWithExactAnnotation.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/lessSpecificTypeForArgumentCallWithExactAnnotation.kt
index 0d324dec1e2..f7ab5e96486 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/lessSpecificTypeForArgumentCallWithExactAnnotation.kt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/lessSpecificTypeForArgumentCallWithExactAnnotation.kt
@@ -1,4 +1,3 @@
-// !LANGUAGE: -NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 interface A
@@ -12,6 +11,6 @@ fun foo(a: Any) {}
 
 fun test(b: B, c: C) {
     foo(
-        <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.Any")!>select(b, c)<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("A")!>select(b, c)<!>
     )
 }
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/postponedCompletionWithExactAnnotation.fir.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/postponedCompletionWithExactAnnotation.fir.kt
index 151ff162527..4491ba6b8e5 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/postponedCompletionWithExactAnnotation.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/postponedCompletionWithExactAnnotation.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !LANGUAGE: -NewInference
 
 interface ISample
 
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/postponedCompletionWithExactAnnotation.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/postponedCompletionWithExactAnnotation.kt
index 769df3b93eb..609f7ee9715 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/postponedCompletionWithExactAnnotation.kt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/postponedCompletionWithExactAnnotation.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !LANGUAGE: -NewInference
 
 interface ISample
 
@@ -11,13 +10,13 @@ fun <K> elvisExact(x: K?, y: K): @kotlin.internal.Exact K = y
 fun <T : Number> materialize(): T? = TODO()
 
 fun test(nullableSample: ISample, any: Any) {
-    <!DEBUG_INFO_EXPRESSION_TYPE("ISample")!>elvisSimple(
+    <!DEBUG_INFO_EXPRESSION_TYPE("ISample?")!>elvisSimple(
         nullableSample,
-        <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>materialize<!>()
+        materialize()
     )<!>
 
     elvisSimple(
-        <!DEBUG_INFO_EXPRESSION_TYPE("ISample")!>elvisSimple(nullableSample, <!TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS!>materialize<!>())<!>,
+        <!DEBUG_INFO_EXPRESSION_TYPE("ISample?")!>elvisSimple(nullableSample, materialize())<!>,
         any
     )
 
diff --git a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/selectFromCovariantAndContravariantTypes.diag.txt b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/selectFromCovariantAndContravariantTypes.diag.txt
index e56b3ad6895..93c4040d184 100644
--- a/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/selectFromCovariantAndContravariantTypes.diag.txt
+++ b/compiler/testData/diagnostics/tests/inference/emptyIntersectionTypes/selectFromCovariantAndContravariantTypes.diag.txt
@@ -1,12 +1,12 @@
-/selectFromCovariantAndContravariantTypes.kt:11:22: warning: parameter 'y' is never used
+/selectFromCovariantAndContravariantTypes.kt:10:22: warning: parameter 'y' is never used
 fun <K> select(x: K, y: K): K = x
                      ^
-/selectFromCovariantAndContravariantTypes.kt:12:19: warning: parameter 'x' is never used
+/selectFromCovariantAndContravariantTypes.kt:11:19: warning: parameter 'x' is never used
 fun <V> genericIn(x: In<V>) {}
                   ^
-/selectFromCovariantAndContravariantTypes.kt:13:20: warning: parameter 'x' is never used
+/selectFromCovariantAndContravariantTypes.kt:12:20: warning: parameter 'x' is never used
 fun <V> genericOut(x: Out<V>) {}
                    ^
-/selectFromCovariantAndContravariantTypes.kt:16:5: warning: type argument for a type parameter V can't be inferred because it has incompatible upper bounds: A, B (multiple incompatible classes). This will become an error in Kotlin 1.9
+/selectFromCovariantAndContravariantTypes.kt:15:5: warning: type argument for a type parameter V can't be inferred because it has incompatible upper bounds: A, B (multiple incompatible classes). This will become an error in Kotlin 1.9
     genericIn(select(a, b))
     ^
diff --git a/compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitutionOldInference.fir.kt b/compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitutionOldInference.fir.kt
deleted file mode 100644
index b610eb5ffe2..00000000000
--- a/compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitutionOldInference.fir.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-// !LANGUAGE: -NewInference
-// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-
-class B {
-    class Builder
-}
-
-typealias ApplyRestrictions = B.Builder.() -> B.Builder
-
-fun applyRestrictions1(): ApplyRestrictions = TODO()
-fun applyRestrictions2() = applyRestrictions1()
-fun <K> applyRestrictions3(e: K) = applyRestrictions1()
-
-fun buildB() {
-    val a1 = applyRestrictions1()
-    val a2 = applyRestrictions2()
-    val a3 = applyRestrictions3("foo")
-
-    B.Builder().a1()
-    B.Builder().a2()
-    B.Builder().a3()
-}
diff --git a/compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitutionOldInference.kt b/compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitutionOldInference.kt
deleted file mode 100644
index 924cbc007bc..00000000000
--- a/compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitutionOldInference.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-// !LANGUAGE: -NewInference
-// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-
-class B {
-    class Builder
-}
-
-typealias ApplyRestrictions = B.Builder.() -> B.Builder
-
-fun applyRestrictions1(): ApplyRestrictions = TODO()
-fun applyRestrictions2() = applyRestrictions1()
-fun <K> applyRestrictions3(e: K) = applyRestrictions1()
-
-fun buildB() {
-    val a1 = applyRestrictions1()
-    val a2 = applyRestrictions2()
-    val a3 = applyRestrictions3("foo")
-
-    B.Builder().a1()
-    B.Builder().a2()
-    B.Builder().<!UNRESOLVED_REFERENCE!>a3<!>()
-}
diff --git a/compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitutionOldInference.txt b/compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitutionOldInference.txt
deleted file mode 100644
index 1bef2a6997b..00000000000
--- a/compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitutionOldInference.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-package
-
-public fun applyRestrictions1(): ApplyRestrictions /* = B.Builder.() -> B.Builder */
-public fun applyRestrictions2(): ApplyRestrictions /* = B.Builder.() -> B.Builder */
-public fun </*0*/ K> applyRestrictions3(/*0*/ e: K): ApplyRestrictions /* = B.Builder.() -> B.Builder */
-public fun buildB(): kotlin.Unit
-
-public final class B {
-    public 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
-    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
-
-    public final class Builder {
-        public constructor Builder()
-        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 typealias ApplyRestrictions = B.Builder.() -> B.Builder
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/flexibilityInCommonSuperTypeCalculation.fir.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/flexibilityInCommonSuperTypeCalculation.fir.kt
index e8d8a8bb02d..e05627fb0ca 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/flexibilityInCommonSuperTypeCalculation.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/flexibilityInCommonSuperTypeCalculation.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNSUPPORTED -UNUSED_EXPRESSION -DEBUG_INFO_SMARTCAST -USELESS_CAST -UNUSED_PARAMETER -UNCHECKED_CAST -CAST_NEVER_SUCCEEDS -UNUSED_VARIABLE -UNREACHABLE_CODE -DEBUG_INFO_CONSTANT
-// !LANGUAGE: -NewInference
 // SKIP_TXT
 
 // FILE: Test.java
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/flexibilityInCommonSuperTypeCalculation.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/flexibilityInCommonSuperTypeCalculation.kt
index 22ea1790c38..e773180497c 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/flexibilityInCommonSuperTypeCalculation.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/flexibilityInCommonSuperTypeCalculation.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNSUPPORTED -UNUSED_EXPRESSION -DEBUG_INFO_SMARTCAST -USELESS_CAST -UNUSED_PARAMETER -UNCHECKED_CAST -CAST_NEVER_SUCCEEDS -UNUSED_VARIABLE -UNREACHABLE_CODE -DEBUG_INFO_CONSTANT
-// !LANGUAGE: -NewInference
 // SKIP_TXT
 
 // FILE: Test.java
@@ -107,7 +106,7 @@ fun case_8() {
     val x3 = Test.id(A(null))
 
     val result_1 = select(x1, x2, x3)
-    <!DEBUG_INFO_EXPRESSION_TYPE("A<out kotlin.Any?>?")!>result_1<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("A<out {Comparable<*>? & java.io.Serializable?}>?")!>result_1<!>
 }
 
 fun case_9() {
@@ -116,7 +115,7 @@ fun case_9() {
     val x3 = A(Test.id(A('s')))
 
     val result_1 = select(x1, x2, x3)
-    <!DEBUG_INFO_EXPRESSION_TYPE("A<out A<out kotlin.Any>?>")!>result_1<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("A<out A<out {Comparable<*> & java.io.Serializable}>?>")!>result_1<!>
 }
 
 fun case_10() {
@@ -166,18 +165,18 @@ fun <T> case_11(y: T) {
 
         <!DEBUG_INFO_EXPRESSION_TYPE("(T..T?)")!>x1<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("T?")!>x2<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("(T..T?)")!>x3<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("T")!>y<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("(T & Any..T?)")!>x3<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("T & T & Any")!>y<!>
 
-        <!DEBUG_INFO_EXPRESSION_TYPE("A<T>")!>result_1<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("A<(T..T?)>")!>result_2<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("A<(T..T?)>")!>result_3<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("A<out (T..T?)>")!>result_1<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("A<out T?>")!>result_2<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("A<(T & Any..T?)>")!>result_3<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("A<T>")!>result_4<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("A<(T..T?)>")!>result_5<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("A<(T..T?)>")!>result_6<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("A<(T & Any..T?)>")!>result_6<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("A<T>")!>result_7<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("A<T>")!>result_8<!>
-        <!DEBUG_INFO_EXPRESSION_TYPE("A<(T..T?)>")!>result_9<!>
+        <!DEBUG_INFO_EXPRESSION_TYPE("A<(T & Any..T?)>")!>result_9<!>
 
         <!DEBUG_INFO_EXPRESSION_TYPE("(T..T?)")!>result_10<!>
         <!DEBUG_INFO_EXPRESSION_TYPE("T?")!>result_11<!>
@@ -207,7 +206,7 @@ fun case_12() {
 
     <!DEBUG_INFO_EXPRESSION_TYPE("(kotlin.collections.MutableList<(kotlin.Int..kotlin.Int?)>..kotlin.collections.List<(kotlin.Int..kotlin.Int?)>?)")!>result_1<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("(kotlin.collections.MutableList<kotlin.Int>..kotlin.collections.List<kotlin.Int>?)")!>result_2<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.List<kotlin.Int>?")!>result_3<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.List<(kotlin.Int..kotlin.Int?)>?")!>result_3<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.List<kotlin.Int>?")!>result_4<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("A<(kotlin.collections.MutableList<(kotlin.Int..kotlin.Int?)>..kotlin.collections.List<(kotlin.Int..kotlin.Int?)>?)>")!>result_5<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("A<kotlin.collections.MutableList<kotlin.Int>>")!>result_6<!>
@@ -241,8 +240,8 @@ fun case_13() {
     <!DEBUG_INFO_EXPRESSION_TYPE("dynamic")!>result_5<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("dynamic")!>result_6<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("A<(kotlin.collections.MutableList<(kotlin.Int..kotlin.Int?)>..kotlin.collections.List<(kotlin.Int..kotlin.Int?)>?)>")!>result_7<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("A<dynamic>")!>result_8<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("A<dynamic>")!>result_9<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("A<(kotlin.collections.MutableList<(kotlin.Int..kotlin.Int?)>..kotlin.collections.List<(kotlin.Int..kotlin.Int?)>?)>")!>result_8<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("A<(kotlin.collections.MutableList<(kotlin.Int..kotlin.Int?)>..kotlin.collections.List<(kotlin.Int..kotlin.Int?)>?)>")!>result_9<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("A<kotlin.collections.MutableList<kotlin.Int>>")!>result_10<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("A<kotlin.collections.List<kotlin.Int>?>")!>result_11<!>
     <!DEBUG_INFO_EXPRESSION_TYPE("A<dynamic>")!>result_12<!>
@@ -262,12 +261,12 @@ fun case_14() {
     val result_7 = select(A(x3), A(x1), A(x2))
     val result_8 = select(A(x1), A(x3))
 
-    <!DEBUG_INFO_EXPRESSION_TYPE("(kotlin.collections.List<kotlin.Any?>..kotlin.collections.List<kotlin.Any?>?)")!>result_1<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("(kotlin.collections.List<kotlin.Any?>..kotlin.collections.List<kotlin.Any?>?)")!>result_2<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("kotlin.collections.List<kotlin.Any?>?")!>result_3<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("(kotlin.collections.MutableList<out kotlin.Any?>?..kotlin.collections.List<kotlin.Any?>?)")!>result_4<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("A<out (kotlin.collections.List<kotlin.Any?>..kotlin.collections.List<kotlin.Any?>?)>")!>result_5<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("A<out (kotlin.collections.List<kotlin.Any?>..kotlin.collections.List<kotlin.Any?>?)>")!>result_6<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("A<out kotlin.collections.List<kotlin.Any?>?>")!>result_7<!>
-    <!DEBUG_INFO_EXPRESSION_TYPE("A<out (kotlin.collections.MutableList<out kotlin.Any?>?..kotlin.collections.List<kotlin.Any?>?)>")!>result_8<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("(kotlin.collections.List<kotlin.Any?>..kotlin.collections.List<*>?)")!>result_1<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("(kotlin.collections.List<kotlin.Any?>..kotlin.collections.List<*>?)")!>result_2<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("(kotlin.collections.List<kotlin.Any?>?..kotlin.collections.List<*>?)")!>result_3<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("(kotlin.collections.MutableList<out kotlin.Any?>?..kotlin.collections.List<*>?)")!>result_4<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("A<out (kotlin.collections.List<kotlin.Any?>..kotlin.collections.List<*>?)>")!>result_5<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("A<out (kotlin.collections.List<kotlin.Any?>..kotlin.collections.List<*>?)>")!>result_6<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("A<out (kotlin.collections.List<kotlin.Any?>?..kotlin.collections.List<*>?)>")!>result_7<!>
+    <!DEBUG_INFO_EXPRESSION_TYPE("A<out (kotlin.collections.MutableList<out kotlin.Any?>?..kotlin.collections.List<*>?)>")!>result_8<!>
 }
diff --git a/compiler/testData/diagnostics/tests/namedArguments/mixedNamedPosition/oldInference.fir.kt b/compiler/testData/diagnostics/tests/namedArguments/mixedNamedPosition/oldInference.fir.kt
index 856d4c143c0..cd60b295afd 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/mixedNamedPosition/oldInference.fir.kt
+++ b/compiler/testData/diagnostics/tests/namedArguments/mixedNamedPosition/oldInference.fir.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: -NewInference +MixedNamedArgumentsInTheirOwnPosition
+// !LANGUAGE: +MixedNamedArgumentsInTheirOwnPosition
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // SKIP_TXT
 
diff --git a/compiler/testData/diagnostics/tests/namedArguments/mixedNamedPosition/oldInference.kt b/compiler/testData/diagnostics/tests/namedArguments/mixedNamedPosition/oldInference.kt
index b95d36b0942..938023d9d9b 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/mixedNamedPosition/oldInference.kt
+++ b/compiler/testData/diagnostics/tests/namedArguments/mixedNamedPosition/oldInference.kt
@@ -1,4 +1,4 @@
-// !LANGUAGE: -NewInference +MixedNamedArgumentsInTheirOwnPosition
+// !LANGUAGE: +MixedNamedArgumentsInTheirOwnPosition
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // SKIP_TXT
 
@@ -9,11 +9,11 @@ fun foo(
 ) {}
 
 fun main() {
-    foo(p1 = 1, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>"2"<!>, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>3.0<!><!NO_VALUE_FOR_PARAMETER, NO_VALUE_FOR_PARAMETER!>)<!>
-    foo(1, p2 = "2", <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>3.0<!><!NO_VALUE_FOR_PARAMETER!>)<!>
+    foo(p1 = 1, "2", 3.0)
+    foo(1, p2 = "2", 3.0)
     foo(1, "2", p3 = 3.0)
 
-    foo(p1 = 1, p2 = "2", <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>3.0<!><!NO_VALUE_FOR_PARAMETER!>)<!>
+    foo(p1 = 1, p2 = "2", 3.0)
 
     foo(1, p3 = 2.0, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>""<!><!NO_VALUE_FOR_PARAMETER!>)<!>
     foo(1, p3 = 2.0, <!MIXING_NAMED_AND_POSITIONED_ARGUMENTS!>3.0<!><!NO_VALUE_FOR_PARAMETER!>)<!>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.kt b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.kt
index 8870c5ea0dd..6fdd7a6cb0f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/factoryPattern/resolutionInOldInference.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !LANGUAGE: -NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_EXPRESSION
 // ISSUE: KT-11265
 
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 0f650c30ca2..c33713b71a4 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
@@ -16883,12 +16883,6 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
                     runTest("compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitution.kt");
                 }
 
-                @Test
-                @TestMetadata("kt32189returnTypeWithTypealiasSubtitutionOldInference.kt")
-                public void testKt32189returnTypeWithTypealiasSubtitutionOldInference() throws Exception {
-                    runTest("compiler/testData/diagnostics/tests/inference/substitutions/kt32189returnTypeWithTypealiasSubtitutionOldInference.kt");
-                }
-
                 @Test
                 @TestMetadata("kt6081SubstituteIntoClassCorrectly.kt")
                 public void testKt6081SubstituteIntoClassCorrectly() throws Exception {
diff --git a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/neg/1.1.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/neg/1.1.fir.kt
index 281adbbb2a7..4193f328df1 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/neg/1.1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/expressions/constant-literals/character-literals/p-1/neg/1.1.fir.kt
@@ -1,4 +1,3 @@
-// !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
diff --git a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/choosing-the-most-specific-candidate-from-the-overload-candidate-set/algorithm-of-msc-selection/p-14/neg/1.5.fir.kt b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/choosing-the-most-specific-candidate-from-the-overload-candidate-set/algorithm-of-msc-selection/p-14/neg/1.5.fir.kt
index 7102100ebc8..e0e7c74f189 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/choosing-the-most-specific-candidate-from-the-overload-candidate-set/algorithm-of-msc-selection/p-14/neg/1.5.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/choosing-the-most-specific-candidate-from-the-overload-candidate-set/algorithm-of-msc-selection/p-14/neg/1.5.fir.kt
@@ -1,4 +1,3 @@
-// !LANGUAGE: -NewInference
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
diff --git a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/choosing-the-most-specific-candidate-from-the-overload-candidate-set/algorithm-of-msc-selection/p-14/neg/1.5.kt b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/choosing-the-most-specific-candidate-from-the-overload-candidate-set/algorithm-of-msc-selection/p-14/neg/1.5.kt
index 243dab95b1d..d7e575f5d06 100644
--- a/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/choosing-the-most-specific-candidate-from-the-overload-candidate-set/algorithm-of-msc-selection/p-14/neg/1.5.kt
+++ b/compiler/tests-spec/testData/diagnostics/linked/overload-resolution/choosing-the-most-specific-candidate-from-the-overload-candidate-set/algorithm-of-msc-selection/p-14/neg/1.5.kt
@@ -1,4 +1,3 @@
-// !LANGUAGE: -NewInference
 // !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
 // SKIP_TXT
 
@@ -31,7 +30,7 @@ import testPackCase1.I4.Companion.foo
 class Case1() : I2, I1, I3, I4  {
 
     fun test() {
-       <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>(1)
+       <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER!>foo<!>(1)
     }
 }