diff --git a/compiler/fir/analysis-tests/testData/resolve/inference/lambdasReturns.kt b/compiler/fir/analysis-tests/testData/resolve/inference/lambdasReturns.kt
index 665e02bed0b..fb8ecfcd37a 100644
--- a/compiler/fir/analysis-tests/testData/resolve/inference/lambdasReturns.kt
+++ b/compiler/fir/analysis-tests/testData/resolve/inference/lambdasReturns.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 fun <R> myRun(b: () -> R): R = b()
 
diff --git a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/typeArguments.kt b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/typeArguments.kt
index 53ab6c86e4d..fd3542996a7 100644
--- a/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/typeArguments.kt
+++ b/compiler/testData/diagnostics/foreignAnnotationsTests/java8Tests/jsr305/typeArguments.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // RENDER_PACKAGE: test
 // SOURCE_RETENTION_ANNOTATIONS
 // WITH_RUNTIME
diff --git a/compiler/testData/diagnostics/nonStableParameterNames/test.kt b/compiler/testData/diagnostics/nonStableParameterNames/test.kt
index 9170ae58d19..7a4bbbe157c 100644
--- a/compiler/testData/diagnostics/nonStableParameterNames/test.kt
+++ b/compiler/testData/diagnostics/nonStableParameterNames/test.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +NewInference
 // MODULE: m1-common
 // FILE: test.kt
diff --git a/compiler/testData/diagnostics/tests/AutoCreatedIt.fir.kt b/compiler/testData/diagnostics/tests/AutoCreatedIt.fir.kt
index c151676b279..a0359bbde12 100644
--- a/compiler/testData/diagnostics/tests/AutoCreatedIt.fir.kt
+++ b/compiler/testData/diagnostics/tests/AutoCreatedIt.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun text() {
     "direct:a" to "mock:a"
     "direct:a" on {it.body == "<hello/>"} to "mock:a"
diff --git a/compiler/testData/diagnostics/tests/AutoCreatedIt.kt b/compiler/testData/diagnostics/tests/AutoCreatedIt.kt
index 881d52f82f1..8a91f608b6d 100644
--- a/compiler/testData/diagnostics/tests/AutoCreatedIt.kt
+++ b/compiler/testData/diagnostics/tests/AutoCreatedIt.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun text() {
     "direct:a" to "mock:a"
     "direct:a" on {it.body == "<hello/>"} to "mock:a"
diff --git a/compiler/testData/diagnostics/tests/Basic.fir.kt b/compiler/testData/diagnostics/tests/Basic.fir.kt
index d1734fa60bb..34de9ab9b50 100644
--- a/compiler/testData/diagnostics/tests/Basic.fir.kt
+++ b/compiler/testData/diagnostics/tests/Basic.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(u : Unit) : Int = 1
 
 fun test() : Int {
diff --git a/compiler/testData/diagnostics/tests/Basic.kt b/compiler/testData/diagnostics/tests/Basic.kt
index dcd68b62155..45e6bad774c 100644
--- a/compiler/testData/diagnostics/tests/Basic.kt
+++ b/compiler/testData/diagnostics/tests/Basic.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(u : Unit) : Int = 1
 
 fun test() : Int {
diff --git a/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.fir.kt b/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.fir.kt
index 3086aed6ca3..5b81b2a8b17 100644
--- a/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.fir.kt
+++ b/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class A() {
     override fun equals(other : Any?) : Boolean = false
 }
diff --git a/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.kt b/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.kt
index 24cc9eb00f7..135111a7019 100644
--- a/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.kt
+++ b/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class A() {
     override fun equals(other : Any?) : Boolean = false
 }
diff --git a/compiler/testData/diagnostics/tests/Bounds.fir.kt b/compiler/testData/diagnostics/tests/Bounds.fir.kt
index 2ce05505b6c..8930a684628 100644
--- a/compiler/testData/diagnostics/tests/Bounds.fir.kt
+++ b/compiler/testData/diagnostics/tests/Bounds.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: a.kt
 package boundsWithSubstitutors
     open class A<T>
diff --git a/compiler/testData/diagnostics/tests/Bounds.kt b/compiler/testData/diagnostics/tests/Bounds.kt
index d91a22dc5c3..2efca46f280 100644
--- a/compiler/testData/diagnostics/tests/Bounds.kt
+++ b/compiler/testData/diagnostics/tests/Bounds.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: a.kt
 package boundsWithSubstitutors
     open class A<T>
diff --git a/compiler/testData/diagnostics/tests/CompareToWithErrorType.fir.kt b/compiler/testData/diagnostics/tests/CompareToWithErrorType.fir.kt
index fec2b30356a..e67fb979fb2 100644
--- a/compiler/testData/diagnostics/tests/CompareToWithErrorType.fir.kt
+++ b/compiler/testData/diagnostics/tests/CompareToWithErrorType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun test() {
   if (<!UNRESOLVED_REFERENCE!>x<!> > 0) {
 
diff --git a/compiler/testData/diagnostics/tests/CompareToWithErrorType.kt b/compiler/testData/diagnostics/tests/CompareToWithErrorType.kt
index e77f1473e88..9896a869e34 100644
--- a/compiler/testData/diagnostics/tests/CompareToWithErrorType.kt
+++ b/compiler/testData/diagnostics/tests/CompareToWithErrorType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun test() {
   if (<!UNRESOLVED_REFERENCE!>x<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>><!> 0) {
 
diff --git a/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.fir.kt b/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.fir.kt
index 4e96a72204b..359e3ced476 100644
--- a/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.fir.kt
+++ b/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 val x = ""
 
 fun bar(x : Int = "", y : Int = x, z : String = y) {
diff --git a/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.kt b/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.kt
index 6296df3218a..5ae410941ce 100644
--- a/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.kt
+++ b/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 val x = ""
 
 fun bar(x : Int = <!TYPE_MISMATCH!>""<!>, y : Int = x, z : String = <!TYPE_MISMATCH!>y<!>) {
diff --git a/compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.fir.kt b/compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.fir.kt
index 199638af940..eb8df0587ce 100644
--- a/compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.fir.kt
+++ b/compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class Example {
diff --git a/compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.kt b/compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.kt
index c39ee97049a..6d714fe9908 100644
--- a/compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.kt
+++ b/compiler/testData/diagnostics/tests/DeprecatedUnaryOperatorConventions.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class Example {
diff --git a/compiler/testData/diagnostics/tests/EnumEntryAsType.fir.kt b/compiler/testData/diagnostics/tests/EnumEntryAsType.fir.kt
index a904de616fe..9c4a71a3c1a 100644
--- a/compiler/testData/diagnostics/tests/EnumEntryAsType.fir.kt
+++ b/compiler/testData/diagnostics/tests/EnumEntryAsType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 enum class Color {
diff --git a/compiler/testData/diagnostics/tests/EnumEntryAsType.kt b/compiler/testData/diagnostics/tests/EnumEntryAsType.kt
index ff475d00452..eafd23d7bc7 100644
--- a/compiler/testData/diagnostics/tests/EnumEntryAsType.kt
+++ b/compiler/testData/diagnostics/tests/EnumEntryAsType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 enum class Color {
diff --git a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.fir.kt b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.fir.kt
index b2f78d008b9..f6a8f07798a 100644
--- a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.fir.kt
+++ b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.fir.kt
@@ -1,5 +1,4 @@
 // COMPARE_WITH_LIGHT_TREE
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 package foo
diff --git a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
index 8676b9e0f23..f09c9082616 100644
--- a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
+++ b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.kt
@@ -1,5 +1,4 @@
 // COMPARE_WITH_LIGHT_TREE
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 package foo
diff --git a/compiler/testData/diagnostics/tests/FunctionReturnTypes.fir.kt b/compiler/testData/diagnostics/tests/FunctionReturnTypes.fir.kt
index 73ce3f42863..e2a946d630d 100644
--- a/compiler/testData/diagnostics/tests/FunctionReturnTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/FunctionReturnTypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNREACHABLE_CODE
 
 fun none() {}
diff --git a/compiler/testData/diagnostics/tests/FunctionReturnTypes.kt b/compiler/testData/diagnostics/tests/FunctionReturnTypes.kt
index 464d2d06ac5..a3227ad6bd3 100644
--- a/compiler/testData/diagnostics/tests/FunctionReturnTypes.kt
+++ b/compiler/testData/diagnostics/tests/FunctionReturnTypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNREACHABLE_CODE
 
 fun none() {}
diff --git a/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.fir.kt b/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.fir.kt
index fae4df97b96..5fa0c8d6f4d 100644
--- a/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.fir.kt
+++ b/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 fun test() = 3
diff --git a/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.kt b/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.kt
index 2b99daf752b..6628cb9d72f 100644
--- a/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.kt
+++ b/compiler/testData/diagnostics/tests/InvokeAndRecursiveResolve.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 fun test() = 3
diff --git a/compiler/testData/diagnostics/tests/Nullability.fir.kt b/compiler/testData/diagnostics/tests/Nullability.fir.kt
index 4fa6157c966..8d5ec364e26 100644
--- a/compiler/testData/diagnostics/tests/Nullability.fir.kt
+++ b/compiler/testData/diagnostics/tests/Nullability.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 fun test() {
diff --git a/compiler/testData/diagnostics/tests/Nullability.kt b/compiler/testData/diagnostics/tests/Nullability.kt
index f6d21f2d4ed..3889d2be13c 100644
--- a/compiler/testData/diagnostics/tests/Nullability.kt
+++ b/compiler/testData/diagnostics/tests/Nullability.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 fun test() {
diff --git a/compiler/testData/diagnostics/tests/PackageQualified.fir.kt b/compiler/testData/diagnostics/tests/PackageQualified.fir.kt
index 7c2d34bd022..e00b599540d 100644
--- a/compiler/testData/diagnostics/tests/PackageQualified.fir.kt
+++ b/compiler/testData/diagnostics/tests/PackageQualified.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: a.kt
 
 
diff --git a/compiler/testData/diagnostics/tests/PackageQualified.kt b/compiler/testData/diagnostics/tests/PackageQualified.kt
index 040208dbdf0..489e40cebc6 100644
--- a/compiler/testData/diagnostics/tests/PackageQualified.kt
+++ b/compiler/testData/diagnostics/tests/PackageQualified.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: a.kt
 
 
diff --git a/compiler/testData/diagnostics/tests/QualifiedExpressions.fir.kt b/compiler/testData/diagnostics/tests/QualifiedExpressions.fir.kt
index 78e08ab5865..3dcdcf9b0cd 100644
--- a/compiler/testData/diagnostics/tests/QualifiedExpressions.fir.kt
+++ b/compiler/testData/diagnostics/tests/QualifiedExpressions.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package qualified_expressions
 
 fun test(s: IntRange?) {
diff --git a/compiler/testData/diagnostics/tests/QualifiedExpressions.kt b/compiler/testData/diagnostics/tests/QualifiedExpressions.kt
index 899bd895035..969ef63c950 100644
--- a/compiler/testData/diagnostics/tests/QualifiedExpressions.kt
+++ b/compiler/testData/diagnostics/tests/QualifiedExpressions.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package qualified_expressions
 
 fun test(s: IntRange?) {
diff --git a/compiler/testData/diagnostics/tests/RecursiveTypeInference.fir.kt b/compiler/testData/diagnostics/tests/RecursiveTypeInference.fir.kt
index 93c53906a00..b6dd3c5d6d3 100644
--- a/compiler/testData/diagnostics/tests/RecursiveTypeInference.fir.kt
+++ b/compiler/testData/diagnostics/tests/RecursiveTypeInference.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 // FILE: a.kt
diff --git a/compiler/testData/diagnostics/tests/RecursiveTypeInference.kt b/compiler/testData/diagnostics/tests/RecursiveTypeInference.kt
index 45601ce7a15..c6927a7d29a 100644
--- a/compiler/testData/diagnostics/tests/RecursiveTypeInference.kt
+++ b/compiler/testData/diagnostics/tests/RecursiveTypeInference.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 // FILE: a.kt
diff --git a/compiler/testData/diagnostics/tests/ReserveYield.fir.kt b/compiler/testData/diagnostics/tests/ReserveYield.fir.kt
index 314f4435d9c..3716c8e4405 100644
--- a/compiler/testData/diagnostics/tests/ReserveYield.fir.kt
+++ b/compiler/testData/diagnostics/tests/ReserveYield.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION -UNREACHABLE_CODE -UNUSED_VARIABLE
 
 // FILE: 1.kt
diff --git a/compiler/testData/diagnostics/tests/ReserveYield.kt b/compiler/testData/diagnostics/tests/ReserveYield.kt
index a4ba561fe6f..c55b07f3b0d 100644
--- a/compiler/testData/diagnostics/tests/ReserveYield.kt
+++ b/compiler/testData/diagnostics/tests/ReserveYield.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_EXPRESSION -UNREACHABLE_CODE -UNUSED_VARIABLE
 
 // FILE: 1.kt
diff --git a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.fir.kt b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.fir.kt
index 782ff38e3aa..77e680a4f11 100644
--- a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.fir.kt
+++ b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // Fixpoint generic in Java: Enum<T extends Enum<T>>
 fun test(a : java.lang.annotation.RetentionPolicy) {
 
diff --git a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt
index dc63117b808..337e628f7b6 100644
--- a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt
+++ b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // Fixpoint generic in Java: Enum<T extends Enum<T>>
 fun test(a : java.lang.annotation.RetentionPolicy) {
 
diff --git a/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt b/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt
index 5f606da6594..784c31056d5 100644
--- a/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt
+++ b/compiler/testData/diagnostics/tests/ResolveToJava.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // SKIP_JAVAC
 // FULL_JDK
diff --git a/compiler/testData/diagnostics/tests/ResolveToJava.kt b/compiler/testData/diagnostics/tests/ResolveToJava.kt
index a4c7a166462..974cd4d6a9b 100644
--- a/compiler/testData/diagnostics/tests/ResolveToJava.kt
+++ b/compiler/testData/diagnostics/tests/ResolveToJava.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // SKIP_JAVAC
 // FULL_JDK
diff --git a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.fir.kt b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.fir.kt
index 240fd132847..55512d0cfd5 100644
--- a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.fir.kt
+++ b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun Int.gg() = null
 
 fun ff() {
diff --git a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.kt b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.kt
index e105ae0a135..fe6d5efeeed 100644
--- a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.kt
+++ b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun Int.gg() = null
 
 fun ff() {
diff --git a/compiler/testData/diagnostics/tests/SafeCallUnknownType.fir.kt b/compiler/testData/diagnostics/tests/SafeCallUnknownType.fir.kt
index b341e164a90..f3fe54b94e8 100644
--- a/compiler/testData/diagnostics/tests/SafeCallUnknownType.fir.kt
+++ b/compiler/testData/diagnostics/tests/SafeCallUnknownType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 import com.unknown
 
 fun ff() {
diff --git a/compiler/testData/diagnostics/tests/SafeCallUnknownType.kt b/compiler/testData/diagnostics/tests/SafeCallUnknownType.kt
index 2bb6f28c781..613cb02324c 100644
--- a/compiler/testData/diagnostics/tests/SafeCallUnknownType.kt
+++ b/compiler/testData/diagnostics/tests/SafeCallUnknownType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 import <!UNRESOLVED_REFERENCE!>com<!>.<!DEBUG_INFO_MISSING_UNRESOLVED!>unknown<!>
 
 fun ff() {
diff --git a/compiler/testData/diagnostics/tests/StarsInFunctionCalls.fir.kt b/compiler/testData/diagnostics/tests/StarsInFunctionCalls.fir.kt
index 00c3c14227e..854ee98e6fa 100644
--- a/compiler/testData/diagnostics/tests/StarsInFunctionCalls.fir.kt
+++ b/compiler/testData/diagnostics/tests/StarsInFunctionCalls.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <T> getT() {}
 fun <A, B> getTT() {}
diff --git a/compiler/testData/diagnostics/tests/StarsInFunctionCalls.kt b/compiler/testData/diagnostics/tests/StarsInFunctionCalls.kt
index da6c5b5ac38..136c64c41d4 100644
--- a/compiler/testData/diagnostics/tests/StarsInFunctionCalls.kt
+++ b/compiler/testData/diagnostics/tests/StarsInFunctionCalls.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <T> getT() {}
 fun <A, B> getTT() {}
diff --git a/compiler/testData/diagnostics/tests/TypeInference.fir.kt b/compiler/testData/diagnostics/tests/TypeInference.fir.kt
index 29dd29364f7..8348f80e5c5 100644
--- a/compiler/testData/diagnostics/tests/TypeInference.fir.kt
+++ b/compiler/testData/diagnostics/tests/TypeInference.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class C<T>() {
   fun foo() : T {}
 }
diff --git a/compiler/testData/diagnostics/tests/TypeInference.kt b/compiler/testData/diagnostics/tests/TypeInference.kt
index 147fe6fa2cc..ecb0a45bf27 100644
--- a/compiler/testData/diagnostics/tests/TypeInference.kt
+++ b/compiler/testData/diagnostics/tests/TypeInference.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class C<T>() {
   fun foo() : T {<!NO_RETURN_IN_FUNCTION_WITH_BLOCK_BODY!>}<!>
 }
diff --git a/compiler/testData/diagnostics/tests/Variance.fir.kt b/compiler/testData/diagnostics/tests/Variance.fir.kt
index 8178589aa1f..aede7126fba 100644
--- a/compiler/testData/diagnostics/tests/Variance.fir.kt
+++ b/compiler/testData/diagnostics/tests/Variance.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package variance
 
 abstract class Consumer<in T> {}
diff --git a/compiler/testData/diagnostics/tests/Variance.kt b/compiler/testData/diagnostics/tests/Variance.kt
index 5df6ddb09b7..15d19dfeb06 100644
--- a/compiler/testData/diagnostics/tests/Variance.kt
+++ b/compiler/testData/diagnostics/tests/Variance.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package variance
 
 abstract class Consumer<in T> {}
diff --git a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.fir.kt b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.fir.kt
index 6308b7f55af..50926c635e0 100644
--- a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 import java.util.ArrayList
 
 @<!NOT_AN_ANNOTATION_CLASS!>ArrayList<!><Int>(1, 1) fun b() {}
diff --git a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.kt b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.kt
index 409c262a427..8f133360364 100644
--- a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.kt
+++ b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 import java.util.ArrayList
 
 <!NOT_AN_ANNOTATION_CLASS{NI}!>@<!NONE_APPLICABLE{OI}!>ArrayList<!><Int>(<!TOO_MANY_ARGUMENTS{NI}!>1<!>, <!TOO_MANY_ARGUMENTS{NI}!>1<!>)<!> fun b() {}
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.fir.kt b/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.fir.kt
index a34cd9ef536..323f5e83ce2 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.fir.kt
@@ -1,6 +1,5 @@
 // !RENDER_DIAGNOSTICS_MESSAGES
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_ANONYMOUS_PARAMETER
-// !WITH_NEW_INFERENCE
 
 fun f1(x: String) {}
 fun f2(f: () -> Unit) {}
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.kt b/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.kt
index e9ce6a8f807..944951ae971 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.kt
+++ b/compiler/testData/diagnostics/tests/annotations/annotationRenderingInTypes.kt
@@ -1,6 +1,5 @@
 // !RENDER_DIAGNOSTICS_MESSAGES
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNUSED_ANONYMOUS_PARAMETER
-// !WITH_NEW_INFERENCE
 
 fun f1(x: String) {}
 fun f2(f: () -> Unit) {}
diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.fir.kt b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.fir.kt
index 8be3f456775..25f169f46c6 100644
--- a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.fir.kt
@@ -1,5 +1,4 @@
 // COMPARE_WITH_LIGHT_TREE
-// !WITH_NEW_INFERENCE
 fun foo(@<!UNRESOLVED_REFERENCE!>varargs<!> f : Int) {}
 
 var bar : Int = 1
diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt
index c80fce6eb25..de6b4caa25f 100644
--- a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt
+++ b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.kt
@@ -1,5 +1,4 @@
 // COMPARE_WITH_LIGHT_TREE
-// !WITH_NEW_INFERENCE
 fun foo(@<!UNRESOLVED_REFERENCE!>varargs<!> f : Int) {}
 
 var bar : Int = 1
diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.fir.kt b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.fir.kt
index ccde52c566b..39fd91f40ea 100644
--- a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.fir.kt
@@ -1,5 +1,4 @@
 // COMPARE_WITH_LIGHT_TREE
-// !WITH_NEW_INFERENCE
 @Target(AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION)
 @Retention(AnnotationRetention.SOURCE)
 annotation class test
diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt
index 50e1d48c1f4..124e098212e 100644
--- a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt
+++ b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.kt
@@ -1,5 +1,4 @@
 // COMPARE_WITH_LIGHT_TREE
-// !WITH_NEW_INFERENCE
 @Target(AnnotationTarget.VALUE_PARAMETER, AnnotationTarget.EXPRESSION)
 @Retention(AnnotationRetention.SOURCE)
 annotation class test
diff --git a/compiler/testData/diagnostics/tests/annotations/options/functions.fir.kt b/compiler/testData/diagnostics/tests/annotations/options/functions.fir.kt
index 75c730eb87c..0b514effb7f 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/functions.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/options/functions.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 @Target(AnnotationTarget.FUNCTION)
 annotation class FunAnn
 
diff --git a/compiler/testData/diagnostics/tests/annotations/options/functions.kt b/compiler/testData/diagnostics/tests/annotations/options/functions.kt
index 74cf26d1662..5d1a0dfa987 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/functions.kt
+++ b/compiler/testData/diagnostics/tests/annotations/options/functions.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 @Target(AnnotationTarget.FUNCTION)
 annotation class FunAnn
 
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/field.fir.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/field.fir.kt
index 0eeb8e03956..ffa9d4ec5f2 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/field.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/field.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 @Target(AnnotationTarget.FIELD) 
 annotation class Field
 
diff --git a/compiler/testData/diagnostics/tests/annotations/options/targets/field.kt b/compiler/testData/diagnostics/tests/annotations/options/targets/field.kt
index 43d09706892..82e14460c33 100644
--- a/compiler/testData/diagnostics/tests/annotations/options/targets/field.kt
+++ b/compiler/testData/diagnostics/tests/annotations/options/targets/field.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 @Target(AnnotationTarget.FIELD) 
 annotation class Field
 
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.fir.kt
index 8346964ae3e..3e7b3ab4e33 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // !RENDER_DIAGNOSTICS_MESSAGES
 
 @Target(AnnotationTarget.FUNCTION, AnnotationTarget.TYPE, AnnotationTarget.CLASS)
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.kt b/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.kt
index 5894bcfa7e2..ac01f082922 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/memberProjectedOut.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // !RENDER_DIAGNOSTICS_MESSAGES
 
 @Target(AnnotationTarget.FUNCTION, AnnotationTarget.TYPE, AnnotationTarget.CLASS)
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.fir.kt b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.fir.kt
index 12eee8e21eb..23e9343c986 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.fir.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.fir.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !RENDER_DIAGNOSTICS_MESSAGES
-// !WITH_NEW_INFERENCE
 
 @Target(AnnotationTarget.FUNCTION, AnnotationTarget.TYPE, AnnotationTarget.CLASS)
 annotation class A
diff --git a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.kt b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.kt
index 6cc078e1704..1d36df574a1 100644
--- a/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.kt
+++ b/compiler/testData/diagnostics/tests/annotations/rendering/typeMismatchDueToTypeProjections.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !RENDER_DIAGNOSTICS_MESSAGES
-// !WITH_NEW_INFERENCE
 
 @Target(AnnotationTarget.FUNCTION, AnnotationTarget.TYPE, AnnotationTarget.CLASS)
 annotation class A
diff --git a/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.fir.kt b/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.fir.kt
index 40937ce03de..d862d9c81e5 100644
--- a/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 package test
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.kt b/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.kt
index 99f905559f3..3da97d10970 100644
--- a/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/bound/reservedExpressionSyntax3.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 package test
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.fir.kt b/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.fir.kt
index 4c3d9378ae1..33608a65ca8 100644
--- a/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 import kotlin.reflect.KProperty1
diff --git a/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.kt b/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.kt
index 11074194cc9..7d33d7349a6 100644
--- a/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/constraintFromLHSWithCorrectDirection.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 import kotlin.reflect.KProperty1
diff --git a/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.fir.kt b/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.fir.kt
index 411505e1fcc..8f375237da6 100644
--- a/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 abstract class SubFunction : kotlin.Function0<Unit>
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.kt b/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.kt
index 6fea2363d82..dcb991c8b1d 100644
--- a/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/expectedTypeAsSubtypeOfFunctionType.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 abstract class SubFunction : kotlin.Function0<Unit>
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.kt b/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.kt
index 5de7282208f..ef1fa5e6a85 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/extensionToSupertype.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.fir.kt b/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.fir.kt
index 8961f52447d..b617f5044a4 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 class A<T, U : Any> {
     fun foo() = <!CALLABLE_REFERENCE_LHS_NOT_A_CLASS!>T::toString<!>
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.kt b/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.kt
index 84cd54098f3..8621ecaae83 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/lhsNotAClass.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 class A<T, U : Any> {
     fun foo() = <!CALLABLE_REFERENCE_LHS_NOT_A_CLASS!>T::<!UNRESOLVED_REFERENCE!>toString<!><!>
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/unresolved.fir.kt b/compiler/testData/diagnostics/tests/callableReference/function/unresolved.fir.kt
index fcdcc521530..241f87384cd 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/unresolved.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/unresolved.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION, -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 class A
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/function/unresolved.kt b/compiler/testData/diagnostics/tests/callableReference/function/unresolved.kt
index 571e46a8ca7..0a242d0617b 100644
--- a/compiler/testData/diagnostics/tests/callableReference/function/unresolved.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/function/unresolved.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION, -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 class A
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.fir.kt b/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.fir.kt
index 912f1d0586d..e56e0ef3837 100644
--- a/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun foo(a: String, b: Int = 5): String {
     return a + b
diff --git a/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.kt b/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.kt
index 45518d3a90c..334271c468d 100644
--- a/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/functionReferenceWithDefaultValueAsOtherFunctionType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun foo(a: String, b: Int = 5): String {
     return a + b
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.fir.kt b/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.fir.kt
index 60b75a40b50..61bce14c61d 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_VARIABLE, -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.kt b/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.kt
index bb292eca42b..2535ec64d81 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/argumentAndReturnExpectedType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_VARIABLE, -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.fir.kt b/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.fir.kt
index df2b4df88d9..efa93ce7aec 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE, -UNUSED_PARAMETER
 
 fun <T> takeFun(f: (T) -> Unit) {}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.kt b/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.kt
index 58ef4a7767f..9d6b98b366c 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/explicitTypeArguments.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE, -UNUSED_PARAMETER
 
 fun <T> takeFun(f: (T) -> Unit) {}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.fir.kt b/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.fir.kt
index 2723d83fbbb..416da3b8e88 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.kt b/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.kt
index 2589b80a8b3..6616f4dbc76 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/genericExtensionFunction.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.fir.kt b/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.fir.kt
index 84441117a43..5ffe2d86cc8 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.kt b/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.kt
index 7eea813263e..626ec1d80aa 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/genericFunctionsWithNullableTypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.fir.kt b/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.fir.kt
index 15a6e2081a9..1559fb0901c 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE, -UNUSED_PARAMETER
 
 fun foo(i: Int) {}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.kt b/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.kt
index 93c5b667a93..7ad636cc159 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/nestedCallWithOverload.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE, -UNUSED_PARAMETER
 
 fun foo(i: Int) {}
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.fir.kt b/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.fir.kt
index 300376e9f75..3d196b15c58 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.kt b/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.kt
index c4fd6422d5f..9fe46e1f2e3 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/resolutionGenericCallableWithNullableTypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/resolutionWithGenericCallable.fir.kt b/compiler/testData/diagnostics/tests/callableReference/generic/resolutionWithGenericCallable.fir.kt
index 4b0510c4ce5..3097f57b837 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/resolutionWithGenericCallable.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/resolutionWithGenericCallable.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
 fun test() {
diff --git a/compiler/testData/diagnostics/tests/callableReference/generic/resolutionWithGenericCallable.kt b/compiler/testData/diagnostics/tests/callableReference/generic/resolutionWithGenericCallable.kt
index b079ffde181..700b918ac7a 100644
--- a/compiler/testData/diagnostics/tests/callableReference/generic/resolutionWithGenericCallable.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/generic/resolutionWithGenericCallable.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
 fun test() {
diff --git a/compiler/testData/diagnostics/tests/callableReference/kt25433.kt b/compiler/testData/diagnostics/tests/callableReference/kt25433.kt
index 6dbefb55767..90904ce31be 100644
--- a/compiler/testData/diagnostics/tests/callableReference/kt25433.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/kt25433.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // Issue: KT-25433
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/kt34314.fir.kt b/compiler/testData/diagnostics/tests/callableReference/kt34314.fir.kt
index a469b2f6887..13a76aab14a 100644
--- a/compiler/testData/diagnostics/tests/callableReference/kt34314.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/kt34314.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 fun main() {
diff --git a/compiler/testData/diagnostics/tests/callableReference/kt34314.kt b/compiler/testData/diagnostics/tests/callableReference/kt34314.kt
index f4877956ae9..313a17415a1 100644
--- a/compiler/testData/diagnostics/tests/callableReference/kt34314.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/kt34314.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 fun main() {
diff --git a/compiler/testData/diagnostics/tests/callableReference/kt34314_lambda.fir.kt b/compiler/testData/diagnostics/tests/callableReference/kt34314_lambda.fir.kt
index d0439f4a526..2fbfaa4c63b 100644
--- a/compiler/testData/diagnostics/tests/callableReference/kt34314_lambda.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/kt34314_lambda.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 fun <T> materialize(): T = TODO()
diff --git a/compiler/testData/diagnostics/tests/callableReference/kt34314_lambda.kt b/compiler/testData/diagnostics/tests/callableReference/kt34314_lambda.kt
index e78751143f3..79128e96b1b 100644
--- a/compiler/testData/diagnostics/tests/callableReference/kt34314_lambda.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/kt34314_lambda.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 fun <T> materialize(): T = TODO()
diff --git a/compiler/testData/diagnostics/tests/callableReference/kt37530.fir.kt b/compiler/testData/diagnostics/tests/callableReference/kt37530.fir.kt
index 2b262f583e1..bc04a045dde 100644
--- a/compiler/testData/diagnostics/tests/callableReference/kt37530.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/kt37530.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 abstract class Abstract
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/kt37530.kt b/compiler/testData/diagnostics/tests/callableReference/kt37530.kt
index d0d956d8e77..368cdcca34e 100644
--- a/compiler/testData/diagnostics/tests/callableReference/kt37530.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/kt37530.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 abstract class Abstract
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/property/kt7945_unrelatedClass.fir.kt b/compiler/testData/diagnostics/tests/callableReference/property/kt7945_unrelatedClass.fir.kt
index baf3c7af422..f334a32c88f 100644
--- a/compiler/testData/diagnostics/tests/callableReference/property/kt7945_unrelatedClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/property/kt7945_unrelatedClass.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 import kotlin.reflect.KProperty1
diff --git a/compiler/testData/diagnostics/tests/callableReference/property/kt7945_unrelatedClass.kt b/compiler/testData/diagnostics/tests/callableReference/property/kt7945_unrelatedClass.kt
index 26f2448ab03..2354ecf0ba7 100644
--- a/compiler/testData/diagnostics/tests/callableReference/property/kt7945_unrelatedClass.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/property/kt7945_unrelatedClass.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 import kotlin.reflect.KProperty1
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.fir.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.fir.kt
index d64b9cc5222..acbc18786ab 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun <T> ofType(x: T): T = x
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.kt
index d92df4d486e..235b087b7f7 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/byGenericArgType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun <T> ofType(x: T): T = x
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.fir.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.fir.kt
index 6522f5d262c..88eb11bc693 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 import kotlin.reflect.KCallable
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.kt
index d0aad3d4df8..96d6a5a58df 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/intersectionTypeOverloadWithWrongParameter.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 import kotlin.reflect.KCallable
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.fir.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.fir.kt
index 1939aa09385..6196d6cb1e1 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.kt
index 3d76e660054..372ea53c07e 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/withGenericFun.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.fir.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.fir.kt
index 58b19cde969..37d2251db05 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -CONFLICTING_JVM_DECLARATIONS
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.kt b/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.kt
index 1a2118bfe41..f65d7a52752 100644
--- a/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/resolve/withPlaceholderTypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -CONFLICTING_JVM_DECLARATIONS
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/suspendCallableReference.kt b/compiler/testData/diagnostics/tests/callableReference/suspendCallableReference.kt
index b11587e76e2..e4c35bf6c6e 100644
--- a/compiler/testData/diagnostics/tests/callableReference/suspendCallableReference.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/suspendCallableReference.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // ISSUE: KT-32452
 
diff --git a/compiler/testData/diagnostics/tests/callableReference/typealiases.kt b/compiler/testData/diagnostics/tests/callableReference/typealiases.kt
index 187b27cc0ed..19faeb7c682 100644
--- a/compiler/testData/diagnostics/tests/callableReference/typealiases.kt
+++ b/compiler/testData/diagnostics/tests/callableReference/typealiases.kt
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // Issue: KT-31199
 
 typealias Global = String
diff --git a/compiler/testData/diagnostics/tests/cast/AsInBinaryUnary.fir.kt b/compiler/testData/diagnostics/tests/cast/AsInBinaryUnary.fir.kt
index 39a65c807bf..9ca7feee3e9 100644
--- a/compiler/testData/diagnostics/tests/cast/AsInBinaryUnary.fir.kt
+++ b/compiler/testData/diagnostics/tests/cast/AsInBinaryUnary.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 interface Base
diff --git a/compiler/testData/diagnostics/tests/cast/AsInBinaryUnary.kt b/compiler/testData/diagnostics/tests/cast/AsInBinaryUnary.kt
index e99f82e46bd..766d7ffb719 100644
--- a/compiler/testData/diagnostics/tests/cast/AsInBinaryUnary.kt
+++ b/compiler/testData/diagnostics/tests/cast/AsInBinaryUnary.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 interface Base
diff --git a/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.fir.kt b/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.fir.kt
index d1501325a99..8f44a246be4 100644
--- a/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.fir.kt
+++ b/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun runWithoutReturn(r: () -> Unit) = r()
diff --git a/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.kt b/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.kt
index c128ca9a2fd..3f049b5d0aa 100644
--- a/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.kt
+++ b/compiler/testData/diagnostics/tests/cast/AsInBlockWithReturnType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun runWithoutReturn(r: () -> Unit) = r()
diff --git a/compiler/testData/diagnostics/tests/cast/UselessSafeCast.fir.kt b/compiler/testData/diagnostics/tests/cast/UselessSafeCast.fir.kt
index 42e1df9622b..2e61dbfdc96 100644
--- a/compiler/testData/diagnostics/tests/cast/UselessSafeCast.fir.kt
+++ b/compiler/testData/diagnostics/tests/cast/UselessSafeCast.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
 fun test(x: Int?) {
diff --git a/compiler/testData/diagnostics/tests/cast/UselessSafeCast.kt b/compiler/testData/diagnostics/tests/cast/UselessSafeCast.kt
index e66a9efaa40..17d4d6122c7 100644
--- a/compiler/testData/diagnostics/tests/cast/UselessSafeCast.kt
+++ b/compiler/testData/diagnostics/tests/cast/UselessSafeCast.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
 fun test(x: Int?) {
diff --git a/compiler/testData/diagnostics/tests/cast/kt15161.fir.kt b/compiler/testData/diagnostics/tests/cast/kt15161.fir.kt
index 02d95115904..164d031d1b3 100644
--- a/compiler/testData/diagnostics/tests/cast/kt15161.fir.kt
+++ b/compiler/testData/diagnostics/tests/cast/kt15161.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class Array<E>(e: E) {
     val k = Array(1) {
         1 as Any
diff --git a/compiler/testData/diagnostics/tests/cast/kt15161.kt b/compiler/testData/diagnostics/tests/cast/kt15161.kt
index 41fad36bda1..e9ffbb9a7fb 100644
--- a/compiler/testData/diagnostics/tests/cast/kt15161.kt
+++ b/compiler/testData/diagnostics/tests/cast/kt15161.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class Array<E>(e: E) {
     val k = Array(1) {
         1 <!USELESS_CAST!>as Any<!>
diff --git a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.fir.kt b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.fir.kt
index 2d63d3da046..b85f3dbeed1 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.fir.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !LANGUAGE: +ProhibitAssigningSingleElementsToVarargsInNamedForm +AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 
diff --git a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt
index aeceae67b99..e8341da1a8d 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !LANGUAGE: +ProhibitAssigningSingleElementsToVarargsInNamedForm +AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 
diff --git a/compiler/testData/diagnostics/tests/checkArguments/arrayAccessSetTooManyArgs.fir.kt b/compiler/testData/diagnostics/tests/checkArguments/arrayAccessSetTooManyArgs.fir.kt
index f0c9d7d0646..0625de65475 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/arrayAccessSetTooManyArgs.fir.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/arrayAccessSetTooManyArgs.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A {
diff --git a/compiler/testData/diagnostics/tests/checkArguments/arrayAccessSetTooManyArgs.kt b/compiler/testData/diagnostics/tests/checkArguments/arrayAccessSetTooManyArgs.kt
index 01778b5843b..812b9bcf085 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/arrayAccessSetTooManyArgs.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/arrayAccessSetTooManyArgs.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A {
diff --git a/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.fir.kt b/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.fir.kt
index 7d0bef6f296..47cbec80c72 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.fir.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo1(b: Boolean, c: Int) {
     if (b && <!CONDITION_TYPE_MISMATCH!>c<!>) {}
     if (b || <!CONDITION_TYPE_MISMATCH!>c<!>) {}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.kt b/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.kt
index ef0b86b1202..9f15afaee8d 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo1(b: Boolean, c: Int) {
     if (b && <!TYPE_MISMATCH!>c<!>) {}
     if (b || <!TYPE_MISMATCH!>c<!>) {}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.fir.kt b/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.fir.kt
index 607f0b4265b..67ba488f8f7 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.fir.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-1897 When call cannot be resolved to any function, save information about types of arguments
 
 package a
diff --git a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.kt b/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.kt
index 0d2effdee2b..70ed46339a7 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-1897 When call cannot be resolved to any function, save information about types of arguments
 
 package a
diff --git a/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.fir.kt b/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.fir.kt
index 708ebb6df78..1010d82ea82 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.fir.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 fun foo() {}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.kt b/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.kt
index b7e9129f92f..e55a5893fd7 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/overloadedFunction.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 fun foo() {}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/twoLambdasFunction.fir.kt b/compiler/testData/diagnostics/tests/checkArguments/twoLambdasFunction.fir.kt
index 63edc50e3de..02e6782430c 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/twoLambdasFunction.fir.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/twoLambdasFunction.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 fun test(x: () -> Unit, y: () -> Unit) {
 
diff --git a/compiler/testData/diagnostics/tests/checkArguments/twoLambdasFunction.kt b/compiler/testData/diagnostics/tests/checkArguments/twoLambdasFunction.kt
index 7a376cca0a4..9248c467a62 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/twoLambdasFunction.kt
+++ b/compiler/testData/diagnostics/tests/checkArguments/twoLambdasFunction.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 fun test(x: () -> Unit, y: () -> Unit) {
 
diff --git a/compiler/testData/diagnostics/tests/checkType.fir.kt b/compiler/testData/diagnostics/tests/checkType.fir.kt
index 70bf2b6d137..d37f7b7a67e 100644
--- a/compiler/testData/diagnostics/tests/checkType.fir.kt
+++ b/compiler/testData/diagnostics/tests/checkType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/checkType.kt b/compiler/testData/diagnostics/tests/checkType.kt
index cb8cd2fa44b..7940dd064f5 100644
--- a/compiler/testData/diagnostics/tests/checkType.kt
+++ b/compiler/testData/diagnostics/tests/checkType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.fir.kt b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.fir.kt
index 532aac7e625..a8a8d997300 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.fir.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ArrayLiteralsInAnnotations
 
 annotation class Foo(val a: IntArray, val b: Array<String>, val c: FloatArray)
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.kt b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.kt
index ceef3df9972..4936d9c51cd 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotation.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ArrayLiteralsInAnnotations
 
 annotation class Foo(val a: IntArray, val b: Array<String>, val c: FloatArray)
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.fir.kt b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.fir.kt
index ed339f1d945..24f9aed62a2 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ArrayLiteralsInAnnotations +BareArrayClassLiteral
 
 import kotlin.reflect.KClass
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.kt b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.kt
index dd2544879a2..5342e7a0cbb 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/argumentsOfAnnotationWithKClass.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ArrayLiteralsInAnnotations +BareArrayClassLiteral
 
 import kotlin.reflect.KClass
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.fir.kt b/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.fir.kt
index c21f49ebfa5..a474cd486b8 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.fir.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_VARIABLE, -UNSUPPORTED
 
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.kt b/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.kt
index 07786079938..eeec3c94baf 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/basicCollectionLiterals.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_VARIABLE, -UNSUPPORTED
 
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsOutsideOfAnnotations.fir.kt b/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsOutsideOfAnnotations.fir.kt
index f6cf7cb82d8..9b0241c016f 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsOutsideOfAnnotations.fir.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsOutsideOfAnnotations.fir.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +NewInference
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 
 fun takeArray(array: Array<String>) {}
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsOutsideOfAnnotations.kt b/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsOutsideOfAnnotations.kt
index 7002f6fad0f..79955940594 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsOutsideOfAnnotations.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsOutsideOfAnnotations.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +NewInference
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 
 fun takeArray(array: Array<String>) {}
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.fir.kt b/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.fir.kt
index 6585f71592a..05eeca17669 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.fir.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ArrayLiteralsInAnnotations, +ProhibitAssigningSingleElementsToVarargsInNamedForm
 
 annotation class Ann1(vararg val a: String = [])
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.kt b/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.kt
index 977712b1360..24e9f0ac5fb 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/collectionLiteralsWithVarargs.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ArrayLiteralsInAnnotations, +ProhibitAssigningSingleElementsToVarargsInNamedForm
 
 annotation class Ann1(vararg val a: String = [])
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.fir.kt b/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.fir.kt
index 06b630c16f6..1e3d2ca23ed 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.fir.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ArrayLiteralsInAnnotations
 
 annotation class Foo(
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.kt b/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.kt
index 066ee75a200..e5e96268466 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/defaultValuesInAnnotation.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ArrayLiteralsInAnnotations
 
 annotation class Foo(
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.fir.kt b/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.fir.kt
index bad970ee226..1eef9de37b8 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.fir.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun test(): Array<Int> {
     [1, 2]
     [1, 2][0]
diff --git a/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.kt b/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.kt
index 81f8fb4128c..5dbd20eebac 100644
--- a/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.kt
+++ b/compiler/testData/diagnostics/tests/collectionLiterals/noCollectionLiterals.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun test(): Array<Int> {
     <!UNSUPPORTED!>[1, 2]<!>
     <!UNSUPPORTED!>[1, 2]<!>[0]
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.fir.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.fir.kt
index 361a995e876..9d8041460cc 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package uninitialized_reassigned_variables
 
 fun doSmth(s: String) {}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt
index 49aaab0a508..1c98b0be80a 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package uninitialized_reassigned_variables
 
 fun doSmth(<!UNUSED_PARAMETER!>s<!>: String) {}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/elvisNotProcessed.fir.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/elvisNotProcessed.fir.kt
index d1e29e10ced..251d777c148 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/elvisNotProcessed.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/elvisNotProcessed.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See KT-8277
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/elvisNotProcessed.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/elvisNotProcessed.kt
index b0c9a2b188f..fc05d4b0315 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/elvisNotProcessed.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/elvisNotProcessed.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See KT-8277
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.fir.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.fir.kt
index a2395d2332d..2a0bfcee7ae 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See KT-15566
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.kt
index d4efbab6dc9..a2c58cd474c 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/fieldAsClassDelegate.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See KT-15566
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.fir.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.fir.kt
index 324a2ca54f3..3e6469769df 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // AssertionError for nested ifs with lambdas and Nothing as results
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.kt
index e1635a535e2..d4e35c0e1a2 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt10805.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // AssertionError for nested ifs with lambdas and Nothing as results
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/nonLocalReturnUnreachable.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/nonLocalReturnUnreachable.kt
index d65b6ce01ee..88d53547daf 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/nonLocalReturnUnreachable.kt
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/nonLocalReturnUnreachable.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // See also KT-5198 / KT-10186
 
 inline fun doCall(f: () -> Unit) = f()
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ForLoopWithExtensionIteratorOnNullable.kt b/compiler/testData/diagnostics/tests/controlStructures/ForLoopWithExtensionIteratorOnNullable.kt
index 626cc350a99..57e938010ff 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ForLoopWithExtensionIteratorOnNullable.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ForLoopWithExtensionIteratorOnNullable.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // See also KT-7428
 class Container<K>(val k: K)
 // iterator() must be an extension, otherwise code will not compile
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt
index b52322eb1bf..a8c6a1734e6 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // See also KT-10896: Wrong inference of if / else result type
 
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.kt b/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.kt
index 70d7296007c..f392a3bf95f 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifElseIntersection.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // See also KT-10896: Wrong inference of if / else result type
 
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifInResultOfLambda.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/ifInResultOfLambda.fir.kt
index e646e6e5664..08d46d81584 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifInResultOfLambda.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifInResultOfLambda.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 val test1 = { if (true) 1 else "" }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifInResultOfLambda.kt b/compiler/testData/diagnostics/tests/controlStructures/ifInResultOfLambda.kt
index 81e9c4c25ad..8730c503721 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifInResultOfLambda.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifInResultOfLambda.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 val test1 = { if (true) <!IMPLICIT_CAST_TO_ANY{OI}!>1<!> else <!IMPLICIT_CAST_TO_ANY{OI}!>""<!> }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.fir.kt
index d5d7466d071..ded70b0c892 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 fun println() {}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.kt b/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.kt
index c622c657b29..0d77713af4f 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifToAnyDiscriminatingUsages.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 fun println() {}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifWhenWithoutElse.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/ifWhenWithoutElse.fir.kt
index 263daaaa536..1d6b11ecb1d 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifWhenWithoutElse.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifWhenWithoutElse.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun idAny(x: Any) = x
 fun <T> id(x: T) = x
 fun idUnit(x: Unit) = x
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ifWhenWithoutElse.kt b/compiler/testData/diagnostics/tests/controlStructures/ifWhenWithoutElse.kt
index ed88ad9c5a4..9a03f5e5193 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ifWhenWithoutElse.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/ifWhenWithoutElse.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun idAny(x: Any) = x
 fun <T> id(x: T) = x
 fun idUnit(x: Unit) = x
diff --git a/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.fir.kt
index bc9b8f49d94..d46b7841556 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 fun example() {
diff --git a/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.kt b/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.kt
index 2642a097384..87f5433a10c 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/improperElseInExpression.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 fun example() {
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt1075.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/kt1075.fir.kt
index 811be4565f0..3961040efeb 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt1075.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt1075.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package kt1075
 
 //KT-1075 No type check for 'in range' condition in 'when' expression
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt1075.kt b/compiler/testData/diagnostics/tests/controlStructures/kt1075.kt
index 5ec810f7df0..99514c908c0 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt1075.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt1075.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package kt1075
 
 //KT-1075 No type check for 'in range' condition in 'when' expression
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt4310.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/kt4310.fir.kt
index e2818f7c57a..861655d6ce9 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt4310.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt4310.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package f
 
 fun test(a: Boolean, b: Boolean): Int {
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt4310.kt b/compiler/testData/diagnostics/tests/controlStructures/kt4310.kt
index 61d0be8b5de..6cedf388b3c 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt4310.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt4310.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package f
 
 fun test(a: Boolean, b: Boolean): Int {
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt770.fir.kt351.fir.kt735_StatementType.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/kt770.fir.kt351.fir.kt735_StatementType.fir.kt
index 4ea964a1554..f3377aea151 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt770.fir.kt351.fir.kt735_StatementType.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt770.fir.kt351.fir.kt735_StatementType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNREACHABLE_CODE
 package kt770_351_735
 
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.fir.kt
index 69c11908581..7fa77626645 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNREACHABLE_CODE
 package kt770_351_735
 
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt
index 666c51ccf03..a64a5ada2dc 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt770.kt351.kt735_StatementType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNREACHABLE_CODE
 package kt770_351_735
 
diff --git a/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.fir.kt
index 070380b8332..0a7e678e8d7 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
 
 fun use(a: Any?) = a
diff --git a/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.kt b/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.kt
index 56c4ce766e4..10ee29495d2 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/lambdasInExclExclAndElvis.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
 
 fun use(a: Any?) = a
diff --git a/compiler/testData/diagnostics/tests/controlStructures/specialConstructsAndPlatformTypes.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/specialConstructsAndPlatformTypes.fir.kt
index 534dda0051e..80a2c9c035c 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/specialConstructsAndPlatformTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/specialConstructsAndPlatformTypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 import java.util.*;
 
diff --git a/compiler/testData/diagnostics/tests/controlStructures/specialConstructsAndPlatformTypes.kt b/compiler/testData/diagnostics/tests/controlStructures/specialConstructsAndPlatformTypes.kt
index 09c07f57eab..d75b6abfe43 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/specialConstructsAndPlatformTypes.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/specialConstructsAndPlatformTypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 import java.util.*;
 
diff --git a/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.fir.kt
index 0b61cce53ab..3e892382782 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 fun foo() : Int {
diff --git a/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.kt b/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.kt
index 99b44752f88..cbc3c9ad178 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 fun foo() : Int {
diff --git a/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.fir.kt
index f6e4e1acd21..e547a97883d 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // FILE: A.java
 public class A {
diff --git a/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.kt b/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.kt
index eb61e614c46..1a88b9283b5 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/typeInferenceForExclExcl.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // FILE: A.java
 public class A {
diff --git a/compiler/testData/diagnostics/tests/controlStructures/whenInResultOfLambda.fir.kt b/compiler/testData/diagnostics/tests/controlStructures/whenInResultOfLambda.fir.kt
index 13d81ebf4cd..6091bb406eb 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/whenInResultOfLambda.fir.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/whenInResultOfLambda.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 val test1 = { when (true) { true -> 1; else -> "" } }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/whenInResultOfLambda.kt b/compiler/testData/diagnostics/tests/controlStructures/whenInResultOfLambda.kt
index cbd87e68ebe..cdd6da5d9fb 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/whenInResultOfLambda.kt
+++ b/compiler/testData/diagnostics/tests/controlStructures/whenInResultOfLambda.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 val test1 = { when (true) { true -> <!IMPLICIT_CAST_TO_ANY{OI}!>1<!>; else -> <!IMPLICIT_CAST_TO_ANY{OI}!>""<!> } }
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.fir.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.fir.kt
index acd5a57f27b..679eab7d581 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.fir.kt
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-303 Stack overflow on a cyclic class hierarchy
 
 open class Foo() : Bar() {
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.kt b/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.kt
index 6a10987081e..15b21898cf2 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.kt
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-303 Stack overflow on a cyclic class hierarchy
 
 open class Foo() : <!CYCLIC_INHERITANCE_HIERARCHY!>Bar<!>() {
diff --git a/compiler/testData/diagnostics/tests/dataClasses/extensionComponentsOnNullable.fir.kt b/compiler/testData/diagnostics/tests/dataClasses/extensionComponentsOnNullable.fir.kt
index ea2b32291a8..5d9ca40b66c 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/extensionComponentsOnNullable.fir.kt
+++ b/compiler/testData/diagnostics/tests/dataClasses/extensionComponentsOnNullable.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class Data<T>(val x: T, val y: T)
 
 operator fun <T> Data<T>.component1() = x
diff --git a/compiler/testData/diagnostics/tests/dataClasses/extensionComponentsOnNullable.kt b/compiler/testData/diagnostics/tests/dataClasses/extensionComponentsOnNullable.kt
index 37949e24699..04aa688f891 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/extensionComponentsOnNullable.kt
+++ b/compiler/testData/diagnostics/tests/dataClasses/extensionComponentsOnNullable.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class Data<T>(val x: T, val y: T)
 
 operator fun <T> Data<T>.component1() = x
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.fir.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.fir.kt
index d78990199bb..c2d426a4eb8 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
 fun bar(x: Int): Int = x + 1
 
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.kt
index 2cb8c28f603..c0375b26d1e 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.kt
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
 fun bar(x: Int): Int = x + 1
 
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.fir.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.fir.kt
index ff96ed65c89..1497b189a2a 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun bar(x: Int): Int = x + 1
 
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.kt
index a3a056d3dff..1656ed5d3fc 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.kt
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun bar(x: Int): Int = x + 1
 
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.fir.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.fir.kt
index 636fe46bec9..232b824a451 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.fir.kt
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
 fun bar(x: Int): Int = x + 1
 
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.kt b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.kt
index be6571d2e0d..8b06180162d 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.kt
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
 fun bar(x: Int): Int = x + 1
 
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.kt b/compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.kt
index 27d2ca97ea2..80517795710 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 class A {
     operator fun component1() : Int = 1
     operator fun component2() : Int = 2
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.fir.kt
index 79f6bfec9b2..4729469fdc6 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 class MyClass {
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt
index 03abb77df1b..bcaab066105 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 class MyClass {
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/FolLoopTypeComponentTypeMismatch.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/FolLoopTypeComponentTypeMismatch.kt
index bd7ebbd32e9..a55ef785787 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/FolLoopTypeComponentTypeMismatch.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/FolLoopTypeComponentTypeMismatch.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 class A {
     operator fun component1() = 1
     operator fun component2() = 1.0
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.fir.kt
index 12829960c33..2b3da9eb8d8 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun useDeclaredVariables() {
     for ((a, b)<!SYNTAX!><!>) {
         a
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.kt
index ddeec533c23..adb30e0d0dc 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/ForLoopMissingLoopParameter.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun useDeclaredVariables() {
     for ((a, b)<!SYNTAX!><!>) {
         <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/underscore.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/underscore.fir.kt
index 9e0f87e8786..aa74bdbeacb 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/underscore.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/underscore.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 class A {
     operator fun component1() = 1
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/underscore.kt b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/underscore.kt
index 420d72a8858..a15173c8264 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/underscore.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/destructuringDeclarations/underscore.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 class A {
     operator fun component1() = 1
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.fir.kt
index 3d8c3592fb6..16e0e87f6f6 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.fir.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // !LANGUAGE: -ProhibitTypeParametersForLocalVariables
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.kt b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.kt
index 2e17cc98e51..34bf432c684 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // !LANGUAGE: -ProhibitTypeParametersForLocalVariables
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.fir.kt
index 331f065b8a4..088b15d736c 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.fir.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // !LANGUAGE: +ProhibitTypeParametersForLocalVariables
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.kt b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.kt
index 07574de6669..c6349bf1758 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // !LANGUAGE: +ProhibitTypeParametersForLocalVariables
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.fir.kt
index 4bb91b4a96b..df19536f6bc 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.fir.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER -UNUSED_VARIABLE
 // !CHECK_TYPE
 fun foo(block: () -> (() -> Int)) {}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.kt b/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.kt
index 8e5080bde90..52a7add926a 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.kt
+++ b/compiler/testData/diagnostics/tests/declarationChecks/namedFunAsLastExpressionInBlock.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER -UNUSED_VARIABLE
 // !CHECK_TYPE
 fun foo(block: () -> (() -> Int)) {}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.fir.kt
index 90cb338fe2e..8dc14e0c5b0 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package baz
 
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.kt
index 7ece8e9274a..0783efd2d35 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package baz
 
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.fir.kt
index 69aba9c1ce7..b2dffbb0989 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package foo
 
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.kt
index 2f324ff3368..0eaf8779c39 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package foo
 
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.fir.kt
index 1d97b123f33..cf7453650ad 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.kt
index 35f9b9fd1a3..f18f53b6e64 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethodInGenericClass.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.fir.kt
index eae33a570c1..bf6a346d35a 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.kt
index 79f128e42cf..dd4bb974523 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/genericMethods.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.fir.kt
index d24bc7c490f..1e9bfcf10c3 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: main.kt
 package test
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.kt
index 42617293537..171f126cf43 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/manyIncompleteCandidates.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: main.kt
 package test
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.fir.kt
index 649c18f12a0..a9081d1a357 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package foo
 
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.kt
index 6fc1c5db6be..7567a02eeee 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package foo
 
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.fir.kt
index d06461aa5d0..d22a9c3184c 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.kt b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.kt
index d45fa55448f..03e73314c98 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.fir.kt
index 88cc87b76c3..4e31f63ea74 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.kt b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.kt
index d52d6595da2..48a0d8f191f 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.fir.kt
index 4c8cf2d1d2b..b4a01b0f4e4 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 object CommonCase {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.kt
index 4ef9df38b8a..96abfb0a2ea 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/commonCaseForInference.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 object CommonCase {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.fir.kt
index 9e8b0bbc136..4532b1564ec 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 object T2 {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.kt
index 644faba331d..912cbd332ce 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/hostAndReceiver2.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 object T2 {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver1.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver1.fir.kt
index 492602db86f..5732f1daa4e 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver1.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver1.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 object Inference1 {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver1.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver1.kt
index 8684d3a2324..3307d9547ca 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver1.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver1.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 object Inference1 {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver2.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver2.fir.kt
index ab1e797532d..2dc1c992fea 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver2.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver2.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 object Inference2 {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver2.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver2.kt
index 5fc6f90c5a1..751afebbaa8 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver2.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/inferenceFromReceiver2.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 object Inference2 {
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/noOperatorModifierOnProvideDelegate.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/noOperatorModifierOnProvideDelegate.fir.kt
index 4623cf23593..b4c5584cbb1 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/noOperatorModifierOnProvideDelegate.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/noOperatorModifierOnProvideDelegate.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/noOperatorModifierOnProvideDelegate.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/noOperatorModifierOnProvideDelegate.kt
index fb1953e5a2d..4e036de80a9 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/noOperatorModifierOnProvideDelegate.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/noOperatorModifierOnProvideDelegate.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.fir.kt
index 5983c6ad6d7..5f274345629 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class Delegate<T>
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.kt
index 424554c9c73..1e52379b53e 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/setValue.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class Delegate<T>
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.fir.kt
index e4b9abf4c31..a18129f93a8 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !LANGUAGE: -OperatorProvideDelegate
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.kt b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.kt
index d1eb083a09d..9028f3f8d0d 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/provideDelegate/unsupportedOperatorProvideDelegate.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !LANGUAGE: -OperatorProvideDelegate
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.fir.kt
index a18a23afc30..25d0a148e37 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt
index d74411e9801..256d2a421d8 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.kt b/compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.kt
index c81e0401fd0..3d020f1c116 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.kt
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.kt b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.kt
index 213772cb39f..166a2aa8a70 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.kt
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.kt b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.kt
index 6f559318844..d916945818b 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.kt
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.fir.kt b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.fir.kt
index c2ed3cf5369..9f87631f031 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.kt b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.kt
index 71d1c3892b4..740a7d7176c 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 import kotlin.reflect.KProperty
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.kt b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.kt
index a280a71a3a7..edcd12c677e 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.kt
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.kt b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.kt
index 855ead8f6aa..e8e99e8d53a 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.kt
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.kt
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.fir.kt b/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.fir.kt
index 7742e6f5f0e..90af868e24d 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 interface A<T> {
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.kt b/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.kt
index b10c1052c0d..3a7baea34f5 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 interface A<T> {
diff --git a/compiler/testData/diagnostics/tests/delegation/clashes/finalMemberOverridden.fir.kt b/compiler/testData/diagnostics/tests/delegation/clashes/finalMemberOverridden.fir.kt
index bdaa4551534..364ec0c5290 100644
--- a/compiler/testData/diagnostics/tests/delegation/clashes/finalMemberOverridden.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegation/clashes/finalMemberOverridden.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 open class Final {
     fun foo() {}
     val bar: Int = 0
diff --git a/compiler/testData/diagnostics/tests/delegation/clashes/finalMemberOverridden.kt b/compiler/testData/diagnostics/tests/delegation/clashes/finalMemberOverridden.kt
index dc6663af184..5a99e5f74f4 100644
--- a/compiler/testData/diagnostics/tests/delegation/clashes/finalMemberOverridden.kt
+++ b/compiler/testData/diagnostics/tests/delegation/clashes/finalMemberOverridden.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 open class Final {
     fun foo() {}
     val bar: Int = 0
diff --git a/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/severalDelegates.fir.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/severalDelegates.fir.kt
index 31a575c77f5..0875a883077 100644
--- a/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/severalDelegates.fir.kt
+++ b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/severalDelegates.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface Base1 {
     fun test() = "OK"
 }
diff --git a/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/severalDelegates.kt b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/severalDelegates.kt
index 8260598308f..85850278325 100644
--- a/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/severalDelegates.kt
+++ b/compiler/testData/diagnostics/tests/delegation/memberHidesSupertypeOverride/severalDelegates.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface Base1 {
     fun test() = "OK"
 }
diff --git a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.fir.kt b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.fir.kt
index cbc3f4d1b96..7c9c6f68318 100644
--- a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 package m
diff --git a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt
index 1e27c20a5e9..08b1fb12c4e 100644
--- a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt
+++ b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 package m
diff --git a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.fir.kt b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.fir.kt
index 0a93180d2f3..1fb7f27f8c6 100644
--- a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.fir.kt
+++ b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 enum class E : Cloneable {
     A;
     <!OVERRIDING_FINAL_MEMBER!>override<!> fun clone(): Any {
diff --git a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.kt b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.kt
index 7e54fe89e29..f18c3eb226b 100644
--- a/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.kt
+++ b/compiler/testData/diagnostics/tests/enum/kt8972_cloneNotAllowed.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 enum class E : Cloneable {
     A;
     <!OVERRIDING_FINAL_MEMBER!>override<!> fun clone(): Any {
diff --git a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.fir.kt b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.fir.kt
index ba60714eeec..80b8b13d1a6 100644
--- a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.fir.kt
+++ b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 val a1 = 0
 val a2 = <!DIVISION_BY_ZERO!>1 / 0<!>
diff --git a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.kt b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.kt
index 96e181a510f..c6f36e97204 100644
--- a/compiler/testData/diagnostics/tests/evaluate/divisionByZero.kt
+++ b/compiler/testData/diagnostics/tests/evaluate/divisionByZero.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 val a1 = 0
 val a2 = <!DIVISION_BY_ZERO!>1 / 0<!>
diff --git a/compiler/testData/diagnostics/tests/exposed/inaccessibleType.fir.kt b/compiler/testData/diagnostics/tests/exposed/inaccessibleType.fir.kt
index 9a2045952a6..f25ef7c9ef4 100644
--- a/compiler/testData/diagnostics/tests/exposed/inaccessibleType.fir.kt
+++ b/compiler/testData/diagnostics/tests/exposed/inaccessibleType.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -USELESS_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 // FILE: j/Base.java
 package j;
diff --git a/compiler/testData/diagnostics/tests/exposed/inaccessibleType.kt b/compiler/testData/diagnostics/tests/exposed/inaccessibleType.kt
index 3571333955c..c74cc2020e7 100644
--- a/compiler/testData/diagnostics/tests/exposed/inaccessibleType.kt
+++ b/compiler/testData/diagnostics/tests/exposed/inaccessibleType.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -USELESS_CAST -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 // FILE: j/Base.java
 package j;
diff --git a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.fir.kt b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.fir.kt
index cdd860a98bf..a9b5aef4c75 100644
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: a.kt
 package outer
 
diff --git a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt
index daedeee3e63..9d66173da70 100644
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt
+++ b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: a.kt
 package outer
 
diff --git a/compiler/testData/diagnostics/tests/extensions/classObject.fir.kt b/compiler/testData/diagnostics/tests/extensions/classObject.fir.kt
index 59906776f9f..504fca39d45 100644
--- a/compiler/testData/diagnostics/tests/extensions/classObject.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/classObject.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface Tr
 
 class A { companion object }
diff --git a/compiler/testData/diagnostics/tests/extensions/classObject.kt b/compiler/testData/diagnostics/tests/extensions/classObject.kt
index 59081a07c2b..e6d4e5aa45f 100644
--- a/compiler/testData/diagnostics/tests/extensions/classObject.kt
+++ b/compiler/testData/diagnostics/tests/extensions/classObject.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface Tr
 
 class A { companion object }
diff --git a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.fir.kt b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.fir.kt
index a5802ec230a..98c13e9b600 100644
--- a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 interface JPAEntityClass<D> {
     fun <T> T.findByName(s: String): D {null!!}
diff --git a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt
index 46f5bc1c2f0..5b5862e9dae 100644
--- a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt
+++ b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 interface JPAEntityClass<D> {
     fun <T> T.findByName(s: String): D {null!!}
diff --git a/compiler/testData/diagnostics/tests/extensions/kt3563.fir.kt b/compiler/testData/diagnostics/tests/extensions/kt3563.fir.kt
index 802dc2207e7..b13f924f277 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt3563.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/kt3563.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-3563 Compiler requiring java.io.File, and it's unclear why
 
 package bar
diff --git a/compiler/testData/diagnostics/tests/extensions/kt3563.kt b/compiler/testData/diagnostics/tests/extensions/kt3563.kt
index 45f9b6b8af8..b7aa22e52ac 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt3563.kt
+++ b/compiler/testData/diagnostics/tests/extensions/kt3563.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-3563 Compiler requiring java.io.File, and it's unclear why
 
 package bar
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.fir.kt b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.fir.kt
index 2a24d9a4177..472484733c8 100644
--- a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package bar
 
 
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt
index 89da8c15289..28e12d062f2 100644
--- a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt
+++ b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package bar
 
 
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.fir.kt b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.fir.kt
index 634d38bae98..2ecd180fbab 100644
--- a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.fir.kt
+++ b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 class A {}
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.kt b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.kt
index ccd38c0d785..a358604b17a 100644
--- a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.kt
+++ b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 class A {}
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/FunctionType.fir.kt b/compiler/testData/diagnostics/tests/functionAsExpression/FunctionType.fir.kt
index 01c65eada00..024b43fa227 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/FunctionType.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/FunctionType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/FunctionType.kt b/compiler/testData/diagnostics/tests/functionAsExpression/FunctionType.kt
index fe07efb7534..e7b9ef3c3a5 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/FunctionType.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/FunctionType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.fir.kt b/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.fir.kt
index bf1be9eec6a..6f7c0a80cee 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER -UNUSED_VARIABLE
 fun <T> listOf(): List<T> = null!!
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.kt b/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.kt
index f8cbaed0d9e..e810eadd259 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/InferenceParametersTypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER -UNUSED_VARIABLE
 fun <T> listOf(): List<T> = null!!
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.fir.kt b/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.fir.kt
index 0df064a4054..a53c1ba8f57 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.kt b/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.kt
index 075c00c052f..e4e7cb1ea03 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/MissingParameterTypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.fir.kt b/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.fir.kt
index 1ba956ba591..05f5ff1921e 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.fir.kt
@@ -1,3 +1,2 @@
-// !WITH_NEW_INFERENCE
 fun foo(f: String.() -> Int) {}
 val test = foo(<!ARGUMENT_TYPE_MISMATCH!>fun () = <!UNRESOLVED_REFERENCE!>length<!><!>)
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.kt b/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.kt
index 7400932c1bb..97f43096fcc 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/ReceiverByExpectedType.kt
@@ -1,3 +1,2 @@
-// !WITH_NEW_INFERENCE
 fun foo(f: String.() -> Int) {}
 val test = foo(<!TYPE_MISMATCH, TYPE_MISMATCH, TYPE_MISMATCH!>fun <!EXPECTED_PARAMETERS_NUMBER_MISMATCH{NI}!>()<!> = <!UNRESOLVED_REFERENCE!>length<!><!>)
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.fir.kt b/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.fir.kt
index 17ea14c6a0f..931f8557a41 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.kt b/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.kt
index b0ba25b3c96..3209a9efa5d 100644
--- a/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.kt
+++ b/compiler/testData/diagnostics/tests/functionAsExpression/WithGenericParameters.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.fir.kt
index 8111b18415b..83cdfd7f608 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 val receiver = { Int.(<!SYNTAX!><!>) <!SYNTAX!>-><!> }
 val receiverWithParameter = { Int.(<!UNRESOLVED_REFERENCE!>a<!>) <!SYNTAX!>-><!> }
 
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.kt b/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.kt
index 83db001f4fb..257f11a149b 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/DeprecatedSyntax.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 val receiver = { Int.(<!SYNTAX!><!>) <!SYNTAX!>-><!> }
 val receiverWithParameter = { Int.<!ILLEGAL_SELECTOR!>(<!UNRESOLVED_REFERENCE!>a<!>)<!> <!SYNTAX!>-><!> }
 
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.fir.kt
index b78dc2ed6de..3276af65ace 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER
 package a
 
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.kt b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.kt
index 256b22d7c7d..e56012b3086 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER
 package a
 
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.fir.kt
index 33e568b0c0e..1a7f1c67f04 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 fun foo0(f: () -> String) = f
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.kt b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.kt
index 15723a1b453..dba678eb05a 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 fun foo0(f: () -> String) = f
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.fir.kt
index 3ed2055c36e..4bcde82e60e 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package h
 
 //traits to make ambiguity with function literal as an argument
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.kt b/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.kt
index 4ebaa121fed..9b020300a14 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package h
 
 //traits to make ambiguity with function literal as an argument
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambdaWithExpectedType.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambdaWithExpectedType.fir.kt
index ac9ddf444fe..1a57c9b9e82 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambdaWithExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambdaWithExpectedType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun test(bal: Array<Int>) {
     var bar = 4
 
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambdaWithExpectedType.kt b/compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambdaWithExpectedType.kt
index af0f5107fb5..27ed62005c0 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambdaWithExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/assignmentOperationInLambdaWithExpectedType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun test(bal: Array<Int>) {
     var bar = 4
 
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.fir.kt
index 36f55311414..54de7540b24 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 data class A(val x: Int, val y: String)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.kt
index c0c10550f24..7eeff83541d 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/complexInference.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 data class A(val x: Int, val y: String)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/inferredFunctionalType.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/inferredFunctionalType.fir.kt
index af2c1f80b19..547897f30d7 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/inferredFunctionalType.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/inferredFunctionalType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 data class A(val x: Int, val y: String)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/inferredFunctionalType.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/inferredFunctionalType.kt
index e37741fc27a..c074bbbc53c 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/inferredFunctionalType.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/inferredFunctionalType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 data class A(val x: Int, val y: String)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.fir.kt
index 4fec1861ca3..90aec275a7d 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 data class A(val x: Int, val y: String)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.kt
index 7e9b68f8dc5..5753f8c2c0b 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/noExpectedType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 data class A(val x: Int, val y: String)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.fir.kt
index eacbe222183..9b268965011 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER
 data class A(val x: Int, val y: String)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.kt
index 45cd30a41b2..f47c7d525fe 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/redeclaration.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER
 data class A(val x: Int, val y: String)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.fir.kt
index 30bb8a69f4f..13e1d1f1757 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 data class A(val x: Int, val y: String)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.kt
index 11e4b0ed95c..cfb973869e4 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/simple.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 data class A(val x: Int, val y: String)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/underscore.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/underscore.fir.kt
index 0f01f99fbf8..9f9803681ff 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/underscore.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/underscore.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 data class A(val x: Int, val y: String)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/underscore.kt b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/underscore.kt
index 862932686bf..585dec4c051 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/underscore.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/destructuringInLambdas/underscore.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 data class A(val x: Int, val y: String)
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt7383_starProjectedFunction.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/kt7383_starProjectedFunction.fir.kt
index abb1198ef3e..531512ef8f8 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt7383_starProjectedFunction.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt7383_starProjectedFunction.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-7383 Assertion failed when a star-projection of function type is used
 
 fun foo() {
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/kt7383_starProjectedFunction.kt b/compiler/testData/diagnostics/tests/functionLiterals/kt7383_starProjectedFunction.kt
index 0b06daa66a4..bf12887292c 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt7383_starProjectedFunction.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt7383_starProjectedFunction.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-7383 Assertion failed when a star-projection of function type is used
 
 fun foo() {
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.kt
index a02e3ec1010..a2500bc82dc 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 fun test() {
     run {<!RETURN_NOT_ALLOWED!>return<!>}
     run {}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.fir.kt
index 998fc7d5291..bd241153105 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun test(a: Int) {
     run f@{
       if (a > 0) return@f
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.kt
index 248d8870097..758b5b2a188 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun test(a: Int) {
     run f@{
       if (a > 0) return@f
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnitAndDontCareType.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnitAndDontCareType.fir.kt
index 96941889555..0dcc17c600a 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnitAndDontCareType.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnitAndDontCareType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 val flag = true
 
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnitAndDontCareType.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnitAndDontCareType.kt
index e9e8cec06aa..61206d5f67a 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnitAndDontCareType.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnitAndDontCareType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 val flag = true
 
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.fir.kt
index 91930abf1d3..e5f864f2baa 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun test(a: Int) {
     run<Int>f@{
       if (a > 0) return@f <!ARGUMENT_TYPE_MISMATCH!>""<!>
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.kt
index b5d5d185409..34821cc921b 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun test(a: Int) {
     run<Int>f@{
       if (a > 0) return@f <!TYPE_MISMATCH, TYPE_MISMATCH!>""<!>
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.fir.kt
index 350f0877d5d..e86df822f8d 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun <T, R> Iterable<T>.map(transform: (T) -> R): List<R> = null!!
 fun <T> listOf(): List<T> = null!!
 fun <T> listOf(vararg values: T): List<T> = null!!
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.kt
index 9a4a49e8bb7..8f97ce3f2f7 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/NoCommonSystem.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun <T, R> Iterable<T>.map(transform: (T) -> R): List<R> = null!!
 fun <T> listOf(): List<T> = null!!
 fun <T> listOf(vararg values: T): List<T> = null!!
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.fir.kt
index f0b428ce65b..a1dbfb3eb58 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 // KT-6822 Smart cast doesn't work inside local returned expression in lambda
 
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.kt b/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.kt
index 5b87f4a6639..8bbe3eaec5d 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/SmartCast.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 // KT-6822 Smart cast doesn't work inside local returned expression in lambda
 
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.fir.kt b/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.fir.kt
index 98fce09583a..966e4961a6f 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.fir.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package m
 
 interface Element
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.kt b/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.kt
index 97c1866b3d7..54199aebc46 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.kt
+++ b/compiler/testData/diagnostics/tests/functionLiterals/returnNullWithReturn.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package m
 
 interface Element
diff --git a/compiler/testData/diagnostics/tests/generics/Projections.fir.kt b/compiler/testData/diagnostics/tests/generics/Projections.fir.kt
index 71832d2488d..7b9792c7fa0 100644
--- a/compiler/testData/diagnostics/tests/generics/Projections.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/Projections.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 class In<in T>() {
diff --git a/compiler/testData/diagnostics/tests/generics/Projections.kt b/compiler/testData/diagnostics/tests/generics/Projections.kt
index fbcfe3ec6bc..e751811eb81 100644
--- a/compiler/testData/diagnostics/tests/generics/Projections.kt
+++ b/compiler/testData/diagnostics/tests/generics/Projections.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 class In<in T>() {
diff --git a/compiler/testData/diagnostics/tests/generics/capturedParameters/innerLocalClass.fir.kt b/compiler/testData/diagnostics/tests/generics/capturedParameters/innerLocalClass.fir.kt
index 9db00cd330e..bb354c54523 100644
--- a/compiler/testData/diagnostics/tests/generics/capturedParameters/innerLocalClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/capturedParameters/innerLocalClass.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // NI_EXPECTED_FILE
 private class Outer<E> {
diff --git a/compiler/testData/diagnostics/tests/generics/capturedParameters/innerLocalClass.kt b/compiler/testData/diagnostics/tests/generics/capturedParameters/innerLocalClass.kt
index fba197b17fa..70258d09ad7 100644
--- a/compiler/testData/diagnostics/tests/generics/capturedParameters/innerLocalClass.kt
+++ b/compiler/testData/diagnostics/tests/generics/capturedParameters/innerLocalClass.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // NI_EXPECTED_FILE
 private class Outer<E> {
diff --git a/compiler/testData/diagnostics/tests/generics/capturedParameters/localClass.fir.kt b/compiler/testData/diagnostics/tests/generics/capturedParameters/localClass.fir.kt
index 6a62c440362..02fe183ea8f 100644
--- a/compiler/testData/diagnostics/tests/generics/capturedParameters/localClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/capturedParameters/localClass.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 fun <T> magic(): T = null!!
diff --git a/compiler/testData/diagnostics/tests/generics/capturedParameters/localClass.kt b/compiler/testData/diagnostics/tests/generics/capturedParameters/localClass.kt
index 983949fc3e9..a15270d8bb9 100644
--- a/compiler/testData/diagnostics/tests/generics/capturedParameters/localClass.kt
+++ b/compiler/testData/diagnostics/tests/generics/capturedParameters/localClass.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 fun <T> magic(): T = null!!
diff --git a/compiler/testData/diagnostics/tests/generics/capturedParameters/objectLiteral.fir.kt b/compiler/testData/diagnostics/tests/generics/capturedParameters/objectLiteral.fir.kt
index e2025ae2620..20b2656e1d4 100644
--- a/compiler/testData/diagnostics/tests/generics/capturedParameters/objectLiteral.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/capturedParameters/objectLiteral.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 fun <T> magic(): T = null!!
diff --git a/compiler/testData/diagnostics/tests/generics/capturedParameters/objectLiteral.kt b/compiler/testData/diagnostics/tests/generics/capturedParameters/objectLiteral.kt
index 08cd7c2008a..37af4b63f8f 100644
--- a/compiler/testData/diagnostics/tests/generics/capturedParameters/objectLiteral.kt
+++ b/compiler/testData/diagnostics/tests/generics/capturedParameters/objectLiteral.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 fun <T> magic(): T = null!!
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.fir.kt
index 6d9ada7f7a6..146f78ef334 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER -TOPLEVEL_TYPEALIASES_ONLY
 
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.kt
index 0e1bdb17869..a834baca259 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocal.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER -TOPLEVEL_TYPEALIASES_ONLY
 
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocalInsideInner.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocalInsideInner.fir.kt
index c4fd539d3fc..202dc6a5f67 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocalInsideInner.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocalInsideInner.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER -TOPLEVEL_TYPEALIASES_ONLY
 
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocalInsideInner.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocalInsideInner.kt
index 41446fbcbad..7353627a470 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocalInsideInner.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/implicitArguments/fromSuperClassesLocalInsideInner.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER -TOPLEVEL_TYPEALIASES_ONLY
 
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.fir.kt
index e6715840002..79207e23614 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.kt
index 1e47b515c93..ad2154e0abc 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/innerTP.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.fir.kt
index 079219d3a6b..1cdf23f96b2 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 class Outer<E> {
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.kt
index 54281b0ef71..73d216fb93c 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/innerUncheckedCast.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 class Outer<E> {
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.fir.kt
index 49a3c44cbff..054c18edf3b 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_VARIABLE
 // JAVAC_EXPECTED_FILE
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.kt
index 64b3a129de1..fa48202eef8 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/iterator.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_VARIABLE
 // JAVAC_EXPECTED_FILE
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.fir.kt
index 29f126589f7..e293e122324 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VALUE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.kt
index c9c5da69d80..bb9c10f2d8e 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/qualifiedOuter.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VALUE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.fir.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.fir.kt
index f8586a9c92b..e7b2369250d 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.kt b/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.kt
index c7b41148d8c..58130117bac 100644
--- a/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.kt
+++ b/compiler/testData/diagnostics/tests/generics/innerClasses/simpleOutUseSite.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/generics/kt30590.fir.kt b/compiler/testData/diagnostics/tests/generics/kt30590.fir.kt
index fc7f293f8c0..eb5d2cd96e3 100644
--- a/compiler/testData/diagnostics/tests/generics/kt30590.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/kt30590.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/generics/kt30590.kt b/compiler/testData/diagnostics/tests/generics/kt30590.kt
index 9e5d418b52f..065cd2c2fb7 100644
--- a/compiler/testData/diagnostics/tests/generics/kt30590.kt
+++ b/compiler/testData/diagnostics/tests/generics/kt30590.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/generics/kt34729.fir.kt b/compiler/testData/diagnostics/tests/generics/kt34729.fir.kt
index 81507bb416f..2c3f763878d 100644
--- a/compiler/testData/diagnostics/tests/generics/kt34729.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/kt34729.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !LANGUAGE: +NewInference
 
diff --git a/compiler/testData/diagnostics/tests/generics/kt34729.kt b/compiler/testData/diagnostics/tests/generics/kt34729.kt
index f07d2e3ee0c..9f993c27f14 100644
--- a/compiler/testData/diagnostics/tests/generics/kt34729.kt
+++ b/compiler/testData/diagnostics/tests/generics/kt34729.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !LANGUAGE: +NewInference
 
diff --git a/compiler/testData/diagnostics/tests/generics/multipleBoundsMemberScope/simple.fir.kt b/compiler/testData/diagnostics/tests/generics/multipleBoundsMemberScope/simple.fir.kt
index 3eb3f039f43..2ed53725de1 100644
--- a/compiler/testData/diagnostics/tests/generics/multipleBoundsMemberScope/simple.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/multipleBoundsMemberScope/simple.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface A {
     fun foo()
 }
diff --git a/compiler/testData/diagnostics/tests/generics/multipleBoundsMemberScope/simple.kt b/compiler/testData/diagnostics/tests/generics/multipleBoundsMemberScope/simple.kt
index 3a76b1ca50c..161252d172c 100644
--- a/compiler/testData/diagnostics/tests/generics/multipleBoundsMemberScope/simple.kt
+++ b/compiler/testData/diagnostics/tests/generics/multipleBoundsMemberScope/simple.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface A {
     fun foo()
 }
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/expressionsBoundsViolation.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/expressionsBoundsViolation.fir.kt
index 19ab29f9bf5..457375011b1 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/expressionsBoundsViolation.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/expressionsBoundsViolation.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A<T : CharSequence>(x: T)
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/expressionsBoundsViolation.kt b/compiler/testData/diagnostics/tests/generics/nullability/expressionsBoundsViolation.kt
index 73ec1f43bd2..4d511fd15d0 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/expressionsBoundsViolation.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/expressionsBoundsViolation.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A<T : CharSequence>(x: T)
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.fir.kt
index a69eea7da2f..dfec1c57287 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION,-UNUSED_VARIABLE
 
 fun <T : CharSequence?> T.bar1() {}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.kt b/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.kt
index 25d9392afdb..0960439ba2e 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/smartCasts.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION,-UNUSED_VARIABLE
 
 fun <T : CharSequence?> T.bar1() {}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.fir.kt
index ced57f85d58..5cc65394618 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION,-UNUSED_VARIABLE
 
 fun <T : CharSequence?> T.bar1() {}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.kt b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.kt
index 4196c852c6e..40f25b33373 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsOnThis.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION,-UNUSED_VARIABLE
 
 fun <T : CharSequence?> T.bar1() {}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.fir.kt
index 672d2e18f86..27d83b75346 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_VARIABLE -UNUSED_PARAMETER -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE
 
 fun <T : CharSequence> bar1(x: T) {}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.kt b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.kt
index a9c752df1e0..c6bb3d8cf4b 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/smartCastsValueArgument.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_VARIABLE -UNUSED_PARAMETER -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE
 
 fun <T : CharSequence> bar1(x: T) {}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.fir.kt
index bbb5fd5457d..cc72d5e866f 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.kt b/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.kt
index 851db406158..6d16004c320 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolation.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.fir.kt
index f21a8a01c4b..e8301245153 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.kt b/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.kt
index 990c6ae3038..df2221ef587 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/tpBoundsViolationVariance.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.fir.kt
index 23624fb4fd6..8164b68eecc 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VALUE -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 
 class A<T : CharSequence?, E1 : T, E2: T?> {
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.kt b/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.kt
index 0f76856a0b6..819d298e21e 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/tpInBounds.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VALUE -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 
 class A<T : CharSequence?, E1 : T, E2: T?> {
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.fir.kt
index 4add13feaa1..38d6b9d8ad3 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION,-UNUSED_VARIABLE
 
 fun <T : CharSequence?> T.bar1() {}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.kt b/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.kt
index d17ab31de17..17998637049 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/useAsReceiver.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION,-UNUSED_VARIABLE
 
 fun <T : CharSequence?> T.bar1() {}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.fir.kt b/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.fir.kt
index 825afde72d5..5e7b5e94c1e 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 fun <T : CharSequence?> bar1(x: T) {}
diff --git a/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.kt b/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.kt
index b3436752d5c..05c72e519ae 100644
--- a/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.kt
+++ b/compiler/testData/diagnostics/tests/generics/nullability/useAsValueArgument.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 fun <T : CharSequence?> bar1(x: T) {}
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/addAll.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/addAll.fir.kt
index f838a567a99..69ec47b337f 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/addAll.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/addAll.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 interface C<out T>
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/addAll.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/addAll.kt
index 2f66883b44b..08134790020 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/addAll.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/addAll.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 interface C<out T>
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/extensionReceiverTypeMismatch.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/extensionReceiverTypeMismatch.fir.kt
index 86934ecf1fa..033aeb43f75 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/extensionReceiverTypeMismatch.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/extensionReceiverTypeMismatch.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class A<T> {
     fun T.foo() {}
     fun Out<T>.bar() {}
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/extensionReceiverTypeMismatch.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/extensionReceiverTypeMismatch.kt
index 6a65475cc85..6b98cff7f97 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/extensionReceiverTypeMismatch.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/extensionReceiverTypeMismatch.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class A<T> {
     fun T.foo() {}
     fun Out<T>.bar() {}
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/inValueParameter.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/inValueParameter.fir.kt
index 11c53b219ee..5d1a3ba3376 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/inValueParameter.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/inValueParameter.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface A<T>
 interface B<E> {
     fun foo(x: A<in E>)
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/inValueParameter.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/inValueParameter.kt
index a4ecece652a..7d019f81856 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/inValueParameter.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/inValueParameter.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface A<T>
 interface B<E> {
     fun foo(x: A<in E>)
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.fir.kt
index 247b88ce81b..3debc87b9e5 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // !CHECK_TYPE
 import java.util.ArrayList
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.kt
index a34babd823e..bf92e860044 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/kt7296.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // !CHECK_TYPE
 import java.util.ArrayList
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/multipleArgumentProjectedOut.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/multipleArgumentProjectedOut.fir.kt
index f75905a9af0..929445b7e34 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/multipleArgumentProjectedOut.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/multipleArgumentProjectedOut.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A<T> {
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/multipleArgumentProjectedOut.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/multipleArgumentProjectedOut.kt
index 280493caf68..812ef20d22b 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/multipleArgumentProjectedOut.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/multipleArgumentProjectedOut.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A<T> {
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/platformSuperClass.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/platformSuperClass.fir.kt
index 88468010ca6..f7bd702a738 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/platformSuperClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/platformSuperClass.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 // FILE: Clazz.java
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/platformSuperClass.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/platformSuperClass.kt
index 63f2e9eb509..9762496f347 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/platformSuperClass.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/platformSuperClass.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 // FILE: Clazz.java
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutConventions.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutConventions.fir.kt
index 0a3c82c5e05..8bde9b0bc8b 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutConventions.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutConventions.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A<T> {
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutConventions.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutConventions.kt
index 0af707c81eb..104aa8869fa 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutConventions.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutConventions.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A<T> {
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutSmartCast.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutSmartCast.fir.kt
index 7f79fcf4a6f..2722ef3cb61 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutSmartCast.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutSmartCast.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 class Inv<E>
 class C<R> {
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutSmartCast.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutSmartCast.kt
index afe772cfb44..b2a65a313af 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutSmartCast.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/projectedOutSmartCast.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 class Inv<E>
 class C<R> {
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/starNullabilityRecursive.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/starNullabilityRecursive.kt
index a74e605d5f4..647c43d2127 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/starNullabilityRecursive.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/starNullabilityRecursive.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 interface A<T : A<T?>?> {
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchConventions.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchConventions.fir.kt
index 7a128a0ceea..c93bf963688 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchConventions.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchConventions.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A<T> {
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchConventions.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchConventions.kt
index dcb3fddb8b9..49c400c9eb6 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchConventions.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchConventions.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A<T> {
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchInLambda.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchInLambda.fir.kt
index c1f1d9fa5c5..c71c7c06a0f 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchInLambda.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchInLambda.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 class Out<out T> {
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchInLambda.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchInLambda.kt
index 55b57fdfd0c..f1917f2309b 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchInLambda.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeMismatchInLambda.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 class Out<out T> {
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeParameterBounds.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeParameterBounds.fir.kt
index b0ab7830151..d34eb310c3f 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeParameterBounds.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeParameterBounds.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeParameterBounds.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeParameterBounds.kt
index 9b3e6464052..f65f208efe5 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/typeParameterBounds.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/typeParameterBounds.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/varargs.fir.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/varargs.fir.kt
index c21154f95f3..ba07d0b42ce 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/varargs.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/varargs.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A<T> {
diff --git a/compiler/testData/diagnostics/tests/generics/projectionsScope/varargs.kt b/compiler/testData/diagnostics/tests/generics/projectionsScope/varargs.kt
index 1b7ec4bcafe..7308ea36821 100644
--- a/compiler/testData/diagnostics/tests/generics/projectionsScope/varargs.kt
+++ b/compiler/testData/diagnostics/tests/generics/projectionsScope/varargs.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A<T> {
diff --git a/compiler/testData/diagnostics/tests/generics/protectedSuperCall.fir.kt b/compiler/testData/diagnostics/tests/generics/protectedSuperCall.fir.kt
index 0b6114cd802..0f89e995456 100644
--- a/compiler/testData/diagnostics/tests/generics/protectedSuperCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/protectedSuperCall.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: GA.kt
 
diff --git a/compiler/testData/diagnostics/tests/generics/protectedSuperCall.kt b/compiler/testData/diagnostics/tests/generics/protectedSuperCall.kt
index 01d9838004e..0b128cd097d 100644
--- a/compiler/testData/diagnostics/tests/generics/protectedSuperCall.kt
+++ b/compiler/testData/diagnostics/tests/generics/protectedSuperCall.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: GA.kt
 
diff --git a/compiler/testData/diagnostics/tests/generics/starProjections/invalid.fir.kt b/compiler/testData/diagnostics/tests/generics/starProjections/invalid.fir.kt
index 7fa36d8ecf7..f97dbcb6ee0 100644
--- a/compiler/testData/diagnostics/tests/generics/starProjections/invalid.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/starProjections/invalid.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: main.kt
diff --git a/compiler/testData/diagnostics/tests/generics/starProjections/invalid.kt b/compiler/testData/diagnostics/tests/generics/starProjections/invalid.kt
index 40880d0e20f..ff5029bd207 100644
--- a/compiler/testData/diagnostics/tests/generics/starProjections/invalid.kt
+++ b/compiler/testData/diagnostics/tests/generics/starProjections/invalid.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: main.kt
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.fir.kt b/compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.fir.kt
index 8402c98cef4..8921ee1031c 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 class A<F>
 
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.kt b/compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.kt
index 7df95fbe8ed..97b84e5fdb2 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.kt
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/CapturedAsReified.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 class A<F>
 
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.fir.kt b/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.fir.kt
index edd4554f33d..c91803b2995 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class C<<!REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T>
 
 fun <T> id(p: T): T = p
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.kt b/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.kt
index c8c5d88f04f..d2a85166754 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.kt
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class C<<!REIFIED_TYPE_PARAMETER_NO_INLINE!>reified<!> T>
 
 fun <T> id(p: T): T = p
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.fir.kt b/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.fir.kt
index 8153c980f63..b73c9bec5a2 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_EXPRESSION
 
 inline fun <reified T> foo() {
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.kt b/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.kt
index 5fa0d3563d6..eff39527cac 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.kt
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_EXPRESSION
 
 inline fun <reified T> foo() {
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.fir.kt b/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.fir.kt
index 6519e562bfe..b5ebf1f1ca3 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.fir.kt
@@ -1,5 +1,4 @@
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 interface Tr<T> {
     var v: Tr<T>
 }
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.kt b/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.kt
index 3a985d9f749..4013acd1a59 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.kt
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.kt
@@ -1,5 +1,4 @@
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 interface Tr<T> {
     var v: Tr<T>
 }
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.fir.kt b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.fir.kt
index e496c211df9..2a9d439e679 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.fir.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNREACHABLE_CODE -UNUSED_PARAMETER
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 // t is unused due to KT-4233
 interface Tr<T> {
     var v: T
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.kt b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.kt
index d2d740e37ec..be7dcf38e55 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.kt
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNREACHABLE_CODE -UNUSED_PARAMETER
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 // t is unused due to KT-4233
 interface Tr<T> {
     var v: T
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.fir.kt b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.fir.kt
index c63e7486b07..108e8147295 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNREACHABLE_CODE
-// !WITH_NEW_INFERENCE
 interface Tr<T> {
     var v: T
 }
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.kt b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.kt
index b2046304041..f1169423b91 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.kt
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNREACHABLE_CODE
-// !WITH_NEW_INFERENCE
 interface Tr<T> {
     var v: T
 }
diff --git a/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.fir.kt b/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.fir.kt
index e02c42140fd..885e77f46f2 100644
--- a/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.fir.kt
+++ b/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
 fun myFun(i : String) {}
diff --git a/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.kt b/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.kt
index dbe5097d6f5..d899b0753e4 100644
--- a/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.kt
+++ b/compiler/testData/diagnostics/tests/generics/wrongNumberOfTypeArgumentsDiagnostic.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
 fun myFun(i : String) {}
diff --git a/compiler/testData/diagnostics/tests/implicitIntersection.fir.kt b/compiler/testData/diagnostics/tests/implicitIntersection.fir.kt
index 603d7123d64..f5f91e1f8ee 100644
--- a/compiler/testData/diagnostics/tests/implicitIntersection.fir.kt
+++ b/compiler/testData/diagnostics/tests/implicitIntersection.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 // See KT-10244: no intersection types in signatures
 
diff --git a/compiler/testData/diagnostics/tests/implicitIntersection.kt b/compiler/testData/diagnostics/tests/implicitIntersection.kt
index 228697fac03..449fd529d9a 100644
--- a/compiler/testData/diagnostics/tests/implicitIntersection.kt
+++ b/compiler/testData/diagnostics/tests/implicitIntersection.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 // See KT-10244: no intersection types in signatures
 
diff --git a/compiler/testData/diagnostics/tests/implicitNestedIntersection.fir.kt b/compiler/testData/diagnostics/tests/implicitNestedIntersection.fir.kt
index 9a7ae4322b3..589b23dff7e 100644
--- a/compiler/testData/diagnostics/tests/implicitNestedIntersection.fir.kt
+++ b/compiler/testData/diagnostics/tests/implicitNestedIntersection.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/implicitNestedIntersection.kt b/compiler/testData/diagnostics/tests/implicitNestedIntersection.kt
index 02a83df85a8..96e91be70b9 100644
--- a/compiler/testData/diagnostics/tests/implicitNestedIntersection.kt
+++ b/compiler/testData/diagnostics/tests/implicitNestedIntersection.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.fir.kt b/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.fir.kt
index bacfed58eb4..662ce394de5 100644
--- a/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // MODULE: m1
 // FILE: a.kt
 package a
diff --git a/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt b/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt
index 54fe75a775d..03956ea2597 100644
--- a/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt
+++ b/compiler/testData/diagnostics/tests/imports/ClassClashStarImport.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // MODULE: m1
 // FILE: a.kt
 package a
diff --git a/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.fir.kt b/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.fir.kt
index 3afe8b10396..9999be53404 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // FILE: 1.kt
 package k
 
diff --git a/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.kt b/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.kt
index d6d091c0325..e2081d0e7db 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.kt
+++ b/compiler/testData/diagnostics/tests/imports/ImportOverloadFunctions.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // FILE: 1.kt
 package k
 
diff --git a/compiler/testData/diagnostics/tests/imports/Imports.fir.kt b/compiler/testData/diagnostics/tests/imports/Imports.fir.kt
index 592aaf07f9b..16591b14077 100644
--- a/compiler/testData/diagnostics/tests/imports/Imports.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/Imports.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE:a.kt
 package a
 
diff --git a/compiler/testData/diagnostics/tests/imports/Imports.kt b/compiler/testData/diagnostics/tests/imports/Imports.kt
index fdd7ddd18f6..a55745d480b 100644
--- a/compiler/testData/diagnostics/tests/imports/Imports.kt
+++ b/compiler/testData/diagnostics/tests/imports/Imports.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE:a.kt
 package a
 
diff --git a/compiler/testData/diagnostics/tests/imports/twoImportLists.fir.kt b/compiler/testData/diagnostics/tests/imports/twoImportLists.fir.kt
index ac3a130affe..f672cbd68a2 100644
--- a/compiler/testData/diagnostics/tests/imports/twoImportLists.fir.kt
+++ b/compiler/testData/diagnostics/tests/imports/twoImportLists.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE:a.kt
 package a
 
diff --git a/compiler/testData/diagnostics/tests/imports/twoImportLists.kt b/compiler/testData/diagnostics/tests/imports/twoImportLists.kt
index e9d4ec5ce4a..ac2f6b8ee97 100644
--- a/compiler/testData/diagnostics/tests/imports/twoImportLists.kt
+++ b/compiler/testData/diagnostics/tests/imports/twoImportLists.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE:a.kt
 package a
 
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.fir.kt
index 9910f306a43..e0232acad09 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.fir.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 fun foo() {
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt
index aa75c6f6be8..42221848c08 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 fun foo() {
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.fir.kt
index f1d324fea07..422b9c6c20e 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.fir.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
 package d
 
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.kt b/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.kt
index 25ead5a9f34..2586168dfdc 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
 package d
 
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.fir.kt
index 639b8d15dc2..313c50c5a8b 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.fir.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun test1() {
     if (<!UNRESOLVED_REFERENCE!>rr<!>) {
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt
index 8e85b832182..c4f23e769c3 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun test1() {
     if (<!UNRESOLVED_REFERENCE!>rr<!>) {
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.fir.kt
index a11daee0313..90db98422fb 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package bar
 
 fun main() {
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt
index c08815a2914..f5cabf77236 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package bar
 
 fun main() {
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.fir.kt
index 2094b38ed5a..a0b300bed43 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.fir.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package b
 
 fun <T, R> foo(map: Map<T, R>) : R = throw Exception()
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.kt
index ab24263880b..3bd91b697a5 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/noTypeParamsInReturnType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package b
 
 fun <T, R> foo(map: Map<T, R>) : R = throw Exception()
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.fir.kt
index 7022fa3623b..bd1c7ef0fa7 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.fir.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //EA-35646
 package a
 
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.kt b/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.kt
index 105c52570db..ca4a8354714 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //EA-35646
 package a
 
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.fir.kt b/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.fir.kt
index cf5b76944a2..408101f0126 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //!DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun <T> foo(i: Int, t: T) {}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.kt b/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.kt
index 4a75d5f5fd9..d0ce762d0c9 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.kt
+++ b/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //!DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun <T> foo(i: Int, t: T) {}
diff --git a/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.fir.kt b/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.fir.kt
index 90f47681aa7..0f70a950cb1 100644
--- a/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun <T: Any> fooT22() : T? {
   return null
 }
diff --git a/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.kt b/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.kt
index 37e7f6ca7d1..8a51ba2f890 100644
--- a/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.kt
+++ b/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun <T: Any> fooT22() : T? {
   return null
 }
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.fir.kt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.fir.kt
index 0192043f3bc..1ee62f30377 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package f
 
 fun <T> g(i: Int, a: Any): List<T> {throw Exception()}
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.kt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.kt
index cac79451b19..86daf144206 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.kt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package f
 
 fun <T> g(i: Int, a: Any): List<T> {throw Exception()}
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.fir.kt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.fir.kt
index 98ffbb92738..c90d9f55e36 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package f
 
 fun <R> h(i: Int, a: Any, r: R, f: (Boolean) -> Int) = 1
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.kt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.kt
index 24ff15ec54c..c8eff93154e 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.kt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package f
 
 fun <R> h(i: Int, a: Any, r: R, f: (Boolean) -> Int) = 1
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.fir.kt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.fir.kt
index 68ddfaa283f..c2116e2279b 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package f
 
 fun <T> f(i: Int, c: Collection<T>): List<T> {throw Exception()}
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.kt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.kt
index e4bb38a8de6..8a3f2b008e5 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.kt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package f
 
 fun <T> f(i: Int, c: Collection<T>): List<T> {throw Exception()}
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.fir.kt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.fir.kt
index 3db6dd11b4a..4d3a16f128c 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -CONFLICTING_JVM_DECLARATIONS
 package f
 
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.kt b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.kt
index 50c932000f4..69db5cc44ef 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.kt
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -CONFLICTING_JVM_DECLARATIONS
 package f
 
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.fir.kt
index 02a88a1740b..38bc9d7d371 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // !CHECK_TYPE
 
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.kt
index 50b478363d3..5a81b61c0c8 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/cannotCaptureInProjection.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // !CHECK_TYPE
 
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.fir.kt
index 42533c3bfae..55b14ab75f1 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // !CHECK_TYPE
 
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.kt
index 775986e5020..fbb90ff3508 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureForNullableTypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // !CHECK_TYPE
 
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.fir.kt
index 74680a72759..ee1d61cf97f 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 fun <T : Any> Array<T?>.filterNotNull(): List<T> = throw Exception()
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.kt
index 1ea84475a5f..6ec7122de23 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureFromNullableTypeVariable.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 fun <T : Any> Array<T?>.filterNotNull(): List<T> = throw Exception()
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureTypeOnlyOnTopLevel.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureTypeOnlyOnTopLevel.fir.kt
index af760e4fdc5..1f98eb469e8 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureTypeOnlyOnTopLevel.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureTypeOnlyOnTopLevel.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 fun <T> foo(array: Array<Array<T>>): Array<Array<T>> = array
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureTypeOnlyOnTopLevel.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureTypeOnlyOnTopLevel.kt
index d20e3d6a4ee..5fbbf48caf5 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/captureTypeOnlyOnTopLevel.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/captureTypeOnlyOnTopLevel.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 fun <T> foo(array: Array<Array<T>>): Array<Array<T>> = array
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.fir.kt
index c2baf7b9e51..adc3342dd76 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 
 fun <T> foo(a1: Array<T>, a2: Array<out T>): T = null!!
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.kt
index c014b688f9f..8473202cc19 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/expectedTypeMismatchWithInVariance.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 
 fun <T> foo(a1: Array<T>, a2: Array<out T>): T = null!!
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.fir.kt
index 2977fc13931..2840939446f 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun <T> Array<T>.foo() {}
 
 fun test(array: Array<out Int>) {
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.kt
index 562c08ffc59..d8264cd424e 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/kt2872.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun <T> Array<T>.foo() {}
 
 fun test(array: Array<out Int>) {
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/noCaptureTypeErrorForNonTopLevel.fir.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/noCaptureTypeErrorForNonTopLevel.fir.kt
index ab9488a78f9..0ef682bcd9c 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/noCaptureTypeErrorForNonTopLevel.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/noCaptureTypeErrorForNonTopLevel.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 class A<T>
 class B<T>
diff --git a/compiler/testData/diagnostics/tests/inference/capturedTypes/noCaptureTypeErrorForNonTopLevel.kt b/compiler/testData/diagnostics/tests/inference/capturedTypes/noCaptureTypeErrorForNonTopLevel.kt
index b0762e26070..ac9360ccf02 100644
--- a/compiler/testData/diagnostics/tests/inference/capturedTypes/noCaptureTypeErrorForNonTopLevel.kt
+++ b/compiler/testData/diagnostics/tests/inference/capturedTypes/noCaptureTypeErrorForNonTopLevel.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 class A<T>
 class B<T>
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedType.fir.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedType.fir.kt
index a06dcfc4b07..5fa78bd038f 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <T> materialize(): T = TODO()
 
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedType.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedType.kt
index 9a8d205c222..90b08eebfd3 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <T> materialize(): T = TODO()
 
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.fir.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.fir.kt
index 3044cee818f..35a50575020 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <T : Number> materializeNumber(): T = TODO()
 
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.kt
index 1092e4d8ec9..82af478d09f 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithExpectedTypeAndBound.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <T : Number> materializeNumber(): T = TODO()
 
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.fir.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.fir.kt
index 400b2680b95..c6002ee7223 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <T> materialize(): T = TODO()
 
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.kt
index 541535ac2d9..2984d99ac31 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coercionWithoutExpectedType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <T> materialize(): T = TODO()
 
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coersionWithAnonymousFunctionsAndUnresolved.fir.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coersionWithAnonymousFunctionsAndUnresolved.fir.kt
index 9b18874a312..af8675eefe4 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coersionWithAnonymousFunctionsAndUnresolved.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coersionWithAnonymousFunctionsAndUnresolved.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 fun takeFnToAny(fn: () -> Any) {}
 fun takeFnToUnit(fn: () -> Unit) {}
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coersionWithAnonymousFunctionsAndUnresolved.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coersionWithAnonymousFunctionsAndUnresolved.kt
index cbf72205d7a..956de346b32 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/coersionWithAnonymousFunctionsAndUnresolved.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/coersionWithAnonymousFunctionsAndUnresolved.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 fun takeFnToAny(fn: () -> Any) {}
 fun takeFnToUnit(fn: () -> Unit) {}
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.fir.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.fir.kt
index db9d05d735c..ddff40abc7a 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <T> materialize(): T = TODO()
 
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.kt
index e5f58302acb..c56c02b7460 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/indirectCoercionWithExpectedType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <T> materialize(): T = TODO()
 
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.fir.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.fir.kt
index 3355d127606..7919750eacd 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // ISSUE: KT-30242
 
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.kt
index 964666b4ad1..a696d66ea85 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/kt30242.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // ISSUE: KT-30242
 
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/noCoercion.fir.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/noCoercion.fir.kt
index 789e35678ba..54160b77ad3 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/noCoercion.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/noCoercion.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 fun noCoercionLastExpressionUsedAsReturnArgument() {
diff --git a/compiler/testData/diagnostics/tests/inference/coercionToUnit/noCoercion.kt b/compiler/testData/diagnostics/tests/inference/coercionToUnit/noCoercion.kt
index b59b8cd762c..fee9612655b 100644
--- a/compiler/testData/diagnostics/tests/inference/coercionToUnit/noCoercion.kt
+++ b/compiler/testData/diagnostics/tests/inference/coercionToUnit/noCoercion.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 fun noCoercionLastExpressionUsedAsReturnArgument() {
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/kt31969.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/kt31969.kt
index 599c9042acf..0a8aedd9780 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/kt31969.kt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/kt31969.kt
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 open class View
 
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.fir.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.fir.kt
index 87354f76355..62771517349 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 fun <T : Any> nullable(): T? = null
 
diff --git a/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.kt b/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.kt
index eff7f8de893..aa14bc206ff 100644
--- a/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.kt
+++ b/compiler/testData/diagnostics/tests/inference/commonSystem/kt32818.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 fun <T : Any> nullable(): T? = null
 
diff --git a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.fir.kt b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.fir.kt
index c31d96cdb22..9c629901919 100644
--- a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 package d
diff --git a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt
index 0c250c622dc..cee1a1d7013 100644
--- a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt
+++ b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 package d
diff --git a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.fir.kt b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.fir.kt
index 650d75a29c7..7041d68261b 100644
--- a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package conflictingSubstitutions
 //+JDK
 
diff --git a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt
index f31cff91a4e..6d70dc89f1c 100644
--- a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt
+++ b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package conflictingSubstitutions
 //+JDK
 
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.fir.kt
index 8bf396cd3e6..cd3a4b80909 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class Out<out T>
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.kt b/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.kt
index 977e6d5af5b..bec3b059a21 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/constraintFromVariantTypeWithNestedProjection.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class Out<out T>
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.fir.kt
index 6a20e7b74fd..42f8f9b9907 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package c
 
 import java.util.ArrayList
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt
index 564011e52c2..9003814c25d 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package c
 
 import java.util.ArrayList
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/ignoreConstraintFromImplicitInNothing.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/ignoreConstraintFromImplicitInNothing.fir.kt
index 62b443f333a..4f39ac4875b 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/ignoreConstraintFromImplicitInNothing.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/ignoreConstraintFromImplicitInNothing.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/ignoreConstraintFromImplicitInNothing.kt b/compiler/testData/diagnostics/tests/inference/constraints/ignoreConstraintFromImplicitInNothing.kt
index 38b0c794753..8adaa83b7eb 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/ignoreConstraintFromImplicitInNothing.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/ignoreConstraintFromImplicitInNothing.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/kt6320.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/kt6320.fir.kt
index 377a18614be..c000b8edfe8 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/kt6320.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/kt6320.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // AssertionError in ConstraintSystem(The constraint shouldn't contain different type variables on both sides: Y <: X)
 
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/kt6320.kt b/compiler/testData/diagnostics/tests/inference/constraints/kt6320.kt
index 5d86d293f12..f2869dc5e6d 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/kt6320.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/kt6320.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // AssertionError in ConstraintSystem(The constraint shouldn't contain different type variables on both sides: Y <: X)
 
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/kt8879.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/kt8879.fir.kt
index 70ef84c6151..0900f850046 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/kt8879.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/kt8879.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 interface Inv<I>
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/kt8879.kt b/compiler/testData/diagnostics/tests/inference/constraints/kt8879.kt
index e357d1dc8f5..702f91eca82 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/kt8879.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/kt8879.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 interface Inv<I>
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.fir.kt
index a64feb0db8c..b83edc82577 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // SKIP_JAVAC
 
 // FILE: MySettings.java
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.kt b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.kt
index c3217126fad..64059a3760c 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/manyConstraintsDueToRecursiveFlexibleTypesWithWildcards.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // SKIP_JAVAC
 
 // FILE: MySettings.java
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.fir.kt b/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.fir.kt
index 907ab33178d..1301e4209bb 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 interface A<T>
 
diff --git a/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.kt b/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.kt
index 7cb0539a24c..730306295d9 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.kt
+++ b/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 interface A<T>
 
diff --git a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.fir.kt b/compiler/testData/diagnostics/tests/inference/dependantOnVariance.fir.kt
index 02030065e69..f67ceac3a16 100644
--- a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/dependantOnVariance.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 class MyList<T>(t: T) {}
diff --git a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.kt b/compiler/testData/diagnostics/tests/inference/dependantOnVariance.kt
index a47d0b24324..b45c3bc600d 100644
--- a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.kt
+++ b/compiler/testData/diagnostics/tests/inference/dependantOnVariance.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 class MyList<T>(t: T) {}
diff --git a/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.fir.kt b/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.fir.kt
index a946ec1bcd7..777d65a76d1 100644
--- a/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ExpectedTypeFromCast
 
 fun foo() = 1
diff --git a/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.kt b/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.kt
index 7debdb39f03..67a862daf57 100644
--- a/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.kt
+++ b/compiler/testData/diagnostics/tests/inference/expectedTypeAdditionalTest.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ExpectedTypeFromCast
 
 fun foo() = 1
diff --git a/compiler/testData/diagnostics/tests/inference/expectedTypeDoubleReceiver.fir.kt b/compiler/testData/diagnostics/tests/inference/expectedTypeDoubleReceiver.fir.kt
index a0ef0081b76..20377b3b04f 100644
--- a/compiler/testData/diagnostics/tests/inference/expectedTypeDoubleReceiver.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/expectedTypeDoubleReceiver.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ExpectedTypeFromCast
 
 fun <T> foo(): T = TODO()
diff --git a/compiler/testData/diagnostics/tests/inference/expectedTypeDoubleReceiver.kt b/compiler/testData/diagnostics/tests/inference/expectedTypeDoubleReceiver.kt
index d77ed65040f..7aca4352654 100644
--- a/compiler/testData/diagnostics/tests/inference/expectedTypeDoubleReceiver.kt
+++ b/compiler/testData/diagnostics/tests/inference/expectedTypeDoubleReceiver.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ExpectedTypeFromCast
 
 fun <T> foo(): T = TODO()
diff --git a/compiler/testData/diagnostics/tests/inference/expectedTypeFromCast.fir.kt b/compiler/testData/diagnostics/tests/inference/expectedTypeFromCast.fir.kt
index cb72542a16c..feb05b6775b 100644
--- a/compiler/testData/diagnostics/tests/inference/expectedTypeFromCast.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/expectedTypeFromCast.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ExpectedTypeFromCast
 
 fun <T> foo(): T = TODO()
diff --git a/compiler/testData/diagnostics/tests/inference/expectedTypeFromCast.kt b/compiler/testData/diagnostics/tests/inference/expectedTypeFromCast.kt
index 88e0d3f9ed5..958a9bd62dd 100644
--- a/compiler/testData/diagnostics/tests/inference/expectedTypeFromCast.kt
+++ b/compiler/testData/diagnostics/tests/inference/expectedTypeFromCast.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ExpectedTypeFromCast
 
 fun <T> foo(): T = TODO()
diff --git a/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.fir.kt b/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.fir.kt
index 0f25ac22342..ecef54717de 100644
--- a/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ExpectedTypeFromCast
 
 class X<S> {
diff --git a/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.kt b/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.kt
index 0c6b97f790f..baa1cdf33c5 100644
--- a/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.kt
+++ b/compiler/testData/diagnostics/tests/inference/expectedTypeWithGenerics.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ExpectedTypeFromCast
 
 class X<S> {
diff --git a/compiler/testData/diagnostics/tests/inference/findViewById.kt b/compiler/testData/diagnostics/tests/inference/findViewById.kt
index 620781ae011..cd085d628ed 100644
--- a/compiler/testData/diagnostics/tests/inference/findViewById.kt
+++ b/compiler/testData/diagnostics/tests/inference/findViewById.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ExpectedTypeFromCast
 // !DIAGNOSTICS: -UNUSED_VARIABLE -DEBUG_INFO_LEAKING_THIS
 
diff --git a/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.fir.kt b/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.fir.kt
index 4b14922b7a1..17dbcf48d09 100644
--- a/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 fun <X, Y, Z> foo(f: (Y) -> Z, g: (X) -> Y, x: X): Z = f(g(x))
 
diff --git a/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.kt b/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.kt
index 1cf0161c059..ba8576f56e0 100644
--- a/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.kt
+++ b/compiler/testData/diagnostics/tests/inference/fixationOrderForProperConstraints.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 fun <X, Y, Z> foo(f: (Y) -> Z, g: (X) -> Y, x: X): Z = f(g(x))
 
diff --git a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.fir.kt b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.fir.kt
index 998c43024e6..783a432646c 100644
--- a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 package a
diff --git a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt
index 593c530fff0..35b58a21d1a 100644
--- a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt
+++ b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 package a
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.fir.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.fir.kt
index 4f080355f6b..1d68322817f 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.kt
index afbb3233dc7..0fae38e8a42 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeExtensionWithFunctionalArgument.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.fir.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.fir.kt
index 46da8700d06..d734cf6654d 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.kt
index 5a490697679..9ce49029db2 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeInCompanionObjectWithFunctionalArgument.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.fir.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.fir.kt
index cd227b70b35..8ae0d5151f1 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.kt
index f34d2b764c4..bb85a8fa1bd 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeInObjectWithFunctionalArgument.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.fir.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.fir.kt
index 7975f090869..aa4bb150410 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.kt b/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.kt
index 4543d049289..ecd2ad7d1f1 100644
--- a/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.kt
+++ b/compiler/testData/diagnostics/tests/inference/implicitInvokeWithFunctionLiteralArgument.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/inference/kt1293.fir.kt b/compiler/testData/diagnostics/tests/inference/kt1293.fir.kt
index eee3c01b0b8..d159302cbac 100644
--- a/compiler/testData/diagnostics/tests/inference/kt1293.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt1293.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-1293 Compiler doesn't show error when element of Array<Int?> is assigned to Int
 
 package kt1293
diff --git a/compiler/testData/diagnostics/tests/inference/kt1293.kt b/compiler/testData/diagnostics/tests/inference/kt1293.kt
index 87d031e800d..1b61e63d9ee 100644
--- a/compiler/testData/diagnostics/tests/inference/kt1293.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt1293.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-1293 Compiler doesn't show error when element of Array<Int?> is assigned to Int
 
 package kt1293
diff --git a/compiler/testData/diagnostics/tests/inference/kt28598.fir.kt b/compiler/testData/diagnostics/tests/inference/kt28598.fir.kt
index f58ab2ccf1d..cf57637b45f 100644
--- a/compiler/testData/diagnostics/tests/inference/kt28598.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt28598.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !IDIAGNOSTICS: -UNUSED_EXPRESSION
 
 fun case_1(a: MutableList<out MutableList<MutableList<MutableList<MutableList<MutableList<MutableList<Int?>?>?>?>?>?>?>?) {
diff --git a/compiler/testData/diagnostics/tests/inference/kt28598.kt b/compiler/testData/diagnostics/tests/inference/kt28598.kt
index 4e6ed61c7b9..083d76ebd6a 100644
--- a/compiler/testData/diagnostics/tests/inference/kt28598.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt28598.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !IDIAGNOSTICS: -UNUSED_EXPRESSION
 
 fun case_1(a: MutableList<out MutableList<MutableList<MutableList<MutableList<MutableList<MutableList<Int?>?>?>?>?>?>?>?) {
diff --git a/compiler/testData/diagnostics/tests/inference/kt28654.fir.kt b/compiler/testData/diagnostics/tests/inference/kt28654.fir.kt
index 246c86b318c..5fedeedb88e 100644
--- a/compiler/testData/diagnostics/tests/inference/kt28654.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt28654.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // Related issue: KT-28654
 
diff --git a/compiler/testData/diagnostics/tests/inference/kt28654.kt b/compiler/testData/diagnostics/tests/inference/kt28654.kt
index 87aa044e490..d3dcbde3d44 100644
--- a/compiler/testData/diagnostics/tests/inference/kt28654.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt28654.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // Related issue: KT-28654
 
diff --git a/compiler/testData/diagnostics/tests/inference/kt30405.kt b/compiler/testData/diagnostics/tests/inference/kt30405.kt
index eeb542cd06c..a122c529868 100644
--- a/compiler/testData/diagnostics/tests/inference/kt30405.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt30405.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ExpectedTypeFromCast
 // !CHECK_TYPE
 // Issue: KT-30405
diff --git a/compiler/testData/diagnostics/tests/inference/kt32434.kt b/compiler/testData/diagnostics/tests/inference/kt32434.kt
index 1dbb488c980..420306b2623 100644
--- a/compiler/testData/diagnostics/tests/inference/kt32434.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt32434.kt
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // FULL_JDK
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // Issue: KT-32434
 
diff --git a/compiler/testData/diagnostics/tests/inference/kt35702.kt b/compiler/testData/diagnostics/tests/inference/kt35702.kt
index 3298921cbed..5615830e9ef 100644
--- a/compiler/testData/diagnostics/tests/inference/kt35702.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt35702.kt
@@ -1,7 +1,6 @@
 // FIR_IDENTICAL
 // !LANGUAGE: +NewInference
 // !DIAGNOSTICS: -UNCHECKED_CAST -UNUSED_VARIABLE -UNUSED_ANONYMOUS_PARAMETER -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // ISSUE: KT-35702
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/inference/kt6175.fir.kt b/compiler/testData/diagnostics/tests/inference/kt6175.fir.kt
index ed4b4a4b090..5c070a721cc 100644
--- a/compiler/testData/diagnostics/tests/inference/kt6175.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt6175.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER
 
 fun <T, R : Any> foo(body: (R?) -> T): T = fail()
diff --git a/compiler/testData/diagnostics/tests/inference/kt6175.kt b/compiler/testData/diagnostics/tests/inference/kt6175.kt
index 18728dd16ab..5f359b9039f 100644
--- a/compiler/testData/diagnostics/tests/inference/kt6175.kt
+++ b/compiler/testData/diagnostics/tests/inference/kt6175.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER
 
 fun <T, R : Any> foo(body: (R?) -> T): T = fail()
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.fir.kt b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.fir.kt
index 266b32d2ef6..f3288b9f04d 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package h
 
 interface A<T> {}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.kt b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.kt
index 0cc066b7744..59f2fc047b4 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.kt
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package h
 
 interface A<T> {}
diff --git a/compiler/testData/diagnostics/tests/inference/noInformationForParameter.fir.kt b/compiler/testData/diagnostics/tests/inference/noInformationForParameter.fir.kt
index 293293ec857..56a1b03283d 100644
--- a/compiler/testData/diagnostics/tests/inference/noInformationForParameter.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/noInformationForParameter.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package noInformationForParameter
 //+JDK
 
diff --git a/compiler/testData/diagnostics/tests/inference/noInformationForParameter.kt b/compiler/testData/diagnostics/tests/inference/noInformationForParameter.kt
index f171350c8e0..27256dbee90 100644
--- a/compiler/testData/diagnostics/tests/inference/noInformationForParameter.kt
+++ b/compiler/testData/diagnostics/tests/inference/noInformationForParameter.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package noInformationForParameter
 //+JDK
 
diff --git a/compiler/testData/diagnostics/tests/inference/nonFunctionalExpectedTypeForLambdaArgument.fir.kt b/compiler/testData/diagnostics/tests/inference/nonFunctionalExpectedTypeForLambdaArgument.fir.kt
index befb058613f..27b21b764ca 100644
--- a/compiler/testData/diagnostics/tests/inference/nonFunctionalExpectedTypeForLambdaArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/nonFunctionalExpectedTypeForLambdaArgument.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun callAny(arg: Any?) {}
diff --git a/compiler/testData/diagnostics/tests/inference/nonFunctionalExpectedTypeForLambdaArgument.kt b/compiler/testData/diagnostics/tests/inference/nonFunctionalExpectedTypeForLambdaArgument.kt
index c7f7b8a2b66..5f1095c2065 100644
--- a/compiler/testData/diagnostics/tests/inference/nonFunctionalExpectedTypeForLambdaArgument.kt
+++ b/compiler/testData/diagnostics/tests/inference/nonFunctionalExpectedTypeForLambdaArgument.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun callAny(arg: Any?) {}
diff --git a/compiler/testData/diagnostics/tests/inference/nothingType/kt32388.fir.kt b/compiler/testData/diagnostics/tests/inference/nothingType/kt32388.fir.kt
index 87f82df7b07..e04bf0a4feb 100644
--- a/compiler/testData/diagnostics/tests/inference/nothingType/kt32388.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/nothingType/kt32388.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <A, B> Either<A, B>.recover(f: (A) -> B): Either<A, B> = when (this) {
     is Either.Left -> f(this.a).right()
diff --git a/compiler/testData/diagnostics/tests/inference/nothingType/kt32388.kt b/compiler/testData/diagnostics/tests/inference/nothingType/kt32388.kt
index e3fb2e1bd72..7ff84193289 100644
--- a/compiler/testData/diagnostics/tests/inference/nothingType/kt32388.kt
+++ b/compiler/testData/diagnostics/tests/inference/nothingType/kt32388.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <A, B> Either<A, B>.recover(f: (A) -> B): Either<A, B> = when (this) {
     is Either.Left -> f(<!DEBUG_INFO_SMARTCAST!>this<!>.a).right()
diff --git a/compiler/testData/diagnostics/tests/inference/nothingType/kt34335.fir.kt b/compiler/testData/diagnostics/tests/inference/nothingType/kt34335.fir.kt
index 21e5905dac8..6906a043c27 100644
--- a/compiler/testData/diagnostics/tests/inference/nothingType/kt34335.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/nothingType/kt34335.fir.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +NewInference
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun call(vararg x: Any?) {}
diff --git a/compiler/testData/diagnostics/tests/inference/nothingType/kt34335.kt b/compiler/testData/diagnostics/tests/inference/nothingType/kt34335.kt
index d4cd160d60e..82d4917eb75 100644
--- a/compiler/testData/diagnostics/tests/inference/nothingType/kt34335.kt
+++ b/compiler/testData/diagnostics/tests/inference/nothingType/kt34335.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +NewInference
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun call(vararg x: Any?) {}
diff --git a/compiler/testData/diagnostics/tests/inference/nothingType/lambdaNothingAndExpectedType.fir.kt b/compiler/testData/diagnostics/tests/inference/nothingType/lambdaNothingAndExpectedType.fir.kt
index 419db4e3e21..d4537af5218 100644
--- a/compiler/testData/diagnostics/tests/inference/nothingType/lambdaNothingAndExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/nothingType/lambdaNothingAndExpectedType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 fun <K> select2(x: K, y: K): K = TODO()
diff --git a/compiler/testData/diagnostics/tests/inference/nothingType/lambdaNothingAndExpectedType.kt b/compiler/testData/diagnostics/tests/inference/nothingType/lambdaNothingAndExpectedType.kt
index 89ae085cc5f..2c734b6ea6e 100644
--- a/compiler/testData/diagnostics/tests/inference/nothingType/lambdaNothingAndExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/inference/nothingType/lambdaNothingAndExpectedType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 fun <K> select2(x: K, y: K): K = TODO()
diff --git a/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationFromNullabilityConstraint.fir.kt b/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationFromNullabilityConstraint.fir.kt
index deb087ffcfd..6b0f2ae6009 100644
--- a/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationFromNullabilityConstraint.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationFromNullabilityConstraint.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun <M> make(): M? = null
diff --git a/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationFromNullabilityConstraint.kt b/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationFromNullabilityConstraint.kt
index ceeccea1614..b6590aa510e 100644
--- a/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationFromNullabilityConstraint.kt
+++ b/compiler/testData/diagnostics/tests/inference/nothingType/notEnoughInformationFromNullabilityConstraint.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun <M> make(): M? = null
diff --git a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.fir.kt b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.fir.kt
index f8302f0d9b8..f98ff2c781a 100644
--- a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 import java.util.*
diff --git a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt
index 0bb672e22d9..1380320c6df 100644
--- a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt
+++ b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 import java.util.*
diff --git a/compiler/testData/diagnostics/tests/inference/publicApproximation/chainedLambdas.fir.kt b/compiler/testData/diagnostics/tests/inference/publicApproximation/chainedLambdas.fir.kt
index ee27bff3f91..f38d9cfd30b 100644
--- a/compiler/testData/diagnostics/tests/inference/publicApproximation/chainedLambdas.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/publicApproximation/chainedLambdas.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 interface First {
diff --git a/compiler/testData/diagnostics/tests/inference/publicApproximation/chainedLambdas.kt b/compiler/testData/diagnostics/tests/inference/publicApproximation/chainedLambdas.kt
index 9c65de5ded1..fa18f6f31af 100644
--- a/compiler/testData/diagnostics/tests/inference/publicApproximation/chainedLambdas.kt
+++ b/compiler/testData/diagnostics/tests/inference/publicApproximation/chainedLambdas.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 interface First {
diff --git a/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionAfterSmartCastInLambdaReturn.fir.kt b/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionAfterSmartCastInLambdaReturn.fir.kt
index 65380c4fab8..b18392afa36 100644
--- a/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionAfterSmartCastInLambdaReturn.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionAfterSmartCastInLambdaReturn.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 interface Base {
diff --git a/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionAfterSmartCastInLambdaReturn.kt b/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionAfterSmartCastInLambdaReturn.kt
index bd23b67db6e..2ce11620656 100644
--- a/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionAfterSmartCastInLambdaReturn.kt
+++ b/compiler/testData/diagnostics/tests/inference/publicApproximation/intersectionAfterSmartCastInLambdaReturn.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 interface Base {
diff --git a/compiler/testData/diagnostics/tests/inference/publicApproximation/smartCastInLambdaReturnAfterIntersection.fir.kt b/compiler/testData/diagnostics/tests/inference/publicApproximation/smartCastInLambdaReturnAfterIntersection.fir.kt
index 6e0f6a00d4b..d0bc3b701a7 100644
--- a/compiler/testData/diagnostics/tests/inference/publicApproximation/smartCastInLambdaReturnAfterIntersection.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/publicApproximation/smartCastInLambdaReturnAfterIntersection.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 interface Base {
diff --git a/compiler/testData/diagnostics/tests/inference/publicApproximation/smartCastInLambdaReturnAfterIntersection.kt b/compiler/testData/diagnostics/tests/inference/publicApproximation/smartCastInLambdaReturnAfterIntersection.kt
index 21b2d66a2b5..d0a9c08ebef 100644
--- a/compiler/testData/diagnostics/tests/inference/publicApproximation/smartCastInLambdaReturnAfterIntersection.kt
+++ b/compiler/testData/diagnostics/tests/inference/publicApproximation/smartCastInLambdaReturnAfterIntersection.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 interface Base {
diff --git a/compiler/testData/diagnostics/tests/inference/publicApproximation/twoIntersections.fir.kt b/compiler/testData/diagnostics/tests/inference/publicApproximation/twoIntersections.fir.kt
index f67d9d8df08..ec9ec9090d1 100644
--- a/compiler/testData/diagnostics/tests/inference/publicApproximation/twoIntersections.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/publicApproximation/twoIntersections.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 interface Base {
diff --git a/compiler/testData/diagnostics/tests/inference/publicApproximation/twoIntersections.kt b/compiler/testData/diagnostics/tests/inference/publicApproximation/twoIntersections.kt
index fb48437117c..80f4c89adb3 100644
--- a/compiler/testData/diagnostics/tests/inference/publicApproximation/twoIntersections.kt
+++ b/compiler/testData/diagnostics/tests/inference/publicApproximation/twoIntersections.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 interface Base {
diff --git a/compiler/testData/diagnostics/tests/inference/recursiveCalls/kt23531.fir.kt b/compiler/testData/diagnostics/tests/inference/recursiveCalls/kt23531.fir.kt
index 898993914ad..cce62531e2a 100644
--- a/compiler/testData/diagnostics/tests/inference/recursiveCalls/kt23531.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/recursiveCalls/kt23531.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 class Scope
 
diff --git a/compiler/testData/diagnostics/tests/inference/recursiveCalls/kt23531.kt b/compiler/testData/diagnostics/tests/inference/recursiveCalls/kt23531.kt
index 68eeafcea57..02b0b011eaa 100644
--- a/compiler/testData/diagnostics/tests/inference/recursiveCalls/kt23531.kt
+++ b/compiler/testData/diagnostics/tests/inference/recursiveCalls/kt23531.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 class Scope
 
diff --git a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/localFactorial.fir.kt b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/localFactorial.fir.kt
index 3cc459f591a..8f1200ca411 100644
--- a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/localFactorial.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/localFactorial.fir.kt
@@ -1,5 +1,4 @@
 // FIR_IDE_IGNORE
-// !WITH_NEW_INFERENCE
 // See KT-6271
 fun foo() {
     fun fact(n: Int) = {
diff --git a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/localFactorial.kt b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/localFactorial.kt
index c644c0971a8..a198c606e42 100644
--- a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/localFactorial.kt
+++ b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/localFactorial.kt
@@ -1,5 +1,4 @@
 // FIR_IDE_IGNORE
-// !WITH_NEW_INFERENCE
 // See KT-6271
 fun foo() {
     fun fact(n: Int) = {
diff --git a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveFun.fir.kt b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveFun.fir.kt
index cc019054899..831c654f61d 100644
--- a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveFun.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveFun.fir.kt
@@ -1,5 +1,4 @@
 // FIR_IDE_IGNORE
-// !WITH_NEW_INFERENCE
 fun foo() {
     fun bar() = (fun() = bar())
 }
diff --git a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveFun.kt b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveFun.kt
index f122176d638..956c1e7ffaf 100644
--- a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveFun.kt
+++ b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveFun.kt
@@ -1,5 +1,4 @@
 // FIR_IDE_IGNORE
-// !WITH_NEW_INFERENCE
 fun foo() {
     fun bar() = (fun() = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!DEBUG_INFO_MISSING_UNRESOLVED!>bar<!>()<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveLambda.fir.kt b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveLambda.fir.kt
index 7d557b5e535..3f2ccb269a3 100644
--- a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveLambda.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveLambda.fir.kt
@@ -1,5 +1,4 @@
 // FIR_IDE_IGNORE
-// !WITH_NEW_INFERENCE
 fun foo() {
     fun bar() = {
         bar()
diff --git a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveLambda.kt b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveLambda.kt
index 56545bcc2df..af8ad14babc 100644
--- a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveLambda.kt
+++ b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/recursiveLambda.kt
@@ -1,5 +1,4 @@
 // FIR_IDE_IGNORE
-// !WITH_NEW_INFERENCE
 fun foo() {
     fun bar() = {
         <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!DEBUG_INFO_MISSING_UNRESOLVED!>bar<!>()<!>
diff --git a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.fir.kt b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.fir.kt
index 75149b12bb9..31e9ab5759b 100644
--- a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.fir.kt
@@ -1,5 +1,4 @@
 // FIR_IDE_IGNORE
-// !WITH_NEW_INFERENCE
 fun foo() {
     fun bar1() = bar1()
 
diff --git a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.kt b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.kt
index 2dad1767344..c571f49e90b 100644
--- a/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.kt
+++ b/compiler/testData/diagnostics/tests/inference/recursiveLocalFuns/selfCall.kt
@@ -1,5 +1,4 @@
 // FIR_IDE_IGNORE
-// !WITH_NEW_INFERENCE
 fun foo() {
     fun bar1() = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM!><!DEBUG_INFO_MISSING_UNRESOLVED!>bar1<!>()<!>
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.fir.kt
index 7826a33bb55..96b6369f20a 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-1127 Wrong type computed for Arrays.asList()
 
 package d
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt
index 3b72b90e71a..0b1dd4fb676 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-1127 Wrong type computed for Arrays.asList()
 
 package d
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.fir.kt
index ba6eafc3e00..9ec2e2eb8a8 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 //KT-2200 array(array()) breaks compiler
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt
index ef64b163801..9667f42ae6e 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 //KT-2200 array(array()) breaks compiler
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2283.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2283.fir.kt
index 227671a13fc..6f4ea329c99 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2283.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2283.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-2283 Bad diagnostics of failed type inference
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2283.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2283.kt
index 661f4fe7f84..6fdebb43d85 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2283.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2283.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-2283 Bad diagnostics of failed type inference
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.fir.kt
index 5fd5029ee29..d705c1b79e8 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-2286 Improve error message for nullability check failure for extension methods
 
 package n
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt
index b6d6c0ec4e3..64f34a67432 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-2286 Improve error message for nullability check failure for extension methods
 
 package n
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.fir.kt
index 96938cad1ec..9c9d03f21b0 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNREACHABLE_CODE
 //KT-2445 Calling method with function with generic parameter causes compile-time exception
 package a
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt
index 45cbc5ce470..12e244db875 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNREACHABLE_CODE
 //KT-2445 Calling method with function with generic parameter causes compile-time exception
 package a
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2741.fir.kt
index cef3337b9fa..c1b96c11e6b 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2741.fir.kt
@@ -1,5 +1,4 @@
 //KT-2741 Compiler can't infer a type of a function literal parameter when its body contains errors
-// !WITH_NEW_INFERENCE
 
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2741.kt
index d534930ec52..389ea4200be 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2741.kt
@@ -1,5 +1,4 @@
 //KT-2741 Compiler can't infer a type of a function literal parameter when its body contains errors
-// !WITH_NEW_INFERENCE
 
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2838.fir.kt
index 7430a30235d..88f5b5daf04 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2838.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNREACHABLE_CODE
 //KT-2838 Type inference failed on passing null as a nullable argument
 package a
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2838.kt
index 30528f3fab6..495577d6210 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2838.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNREACHABLE_CODE
 //KT-2838 Type inference failed on passing null as a nullable argument
 package a
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2841.fir.kt
index 34b6397ef08..fdc075d5f4d 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2841.kt
index 8fe0c9ffc98..696c4baf97a 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.fir.kt
index 076d8c24bad..11e02319aa8 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.kt
index 37ba71be17f..5bf8d23f720 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.fir.kt
index a42aefcaadf..71b58d2df18 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.kt
index c223113c487..d9456233fc7 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it_this.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.fir.kt
index e856e2b1b25..d316ef728b8 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.kt
index 8e5e6c574d6..872d1bd28e0 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.fir.kt
index 879d4b84eed..39828a9f952 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-2883 Type inference fails due to non-Unit value returned
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.kt
index 95efc0688bb..0c612239ea4 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-2883 Type inference fails due to non-Unit value returned
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt32862_both.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt32862_both.fir.kt
index 452faa4aede..202b9502fb0 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt32862_both.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt32862_both.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 interface G<T> {
     fun build(): G<T>
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt32862_both.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt32862_both.kt
index 35470d64a5c..395a604413b 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt32862_both.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt32862_both.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 interface G<T> {
     fun build(): G<T>
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt32862_none.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt32862_none.fir.kt
index 9f6b4b06592..f1f3d017190 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt32862_none.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt32862_none.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 fun foo(s: String) {}
 fun foo(i: Long) {}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt32862_none.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt32862_none.kt
index 2e4ae2b6767..af1d8278f15 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt32862_none.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt32862_none.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 fun foo(s: String) {}
 fun foo(i: Long) {}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt33629.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt33629.fir.kt
index fd4634bfece..9eeda35ce50 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt33629.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt33629.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun <E> emptyList(): List<E> = TODO()
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt33629.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt33629.kt
index 44f0512eb4f..759bb1f9a02 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt33629.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt33629.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun <E> emptyList(): List<E> = TODO()
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt36342.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt36342.fir.kt
index a86f711f102..4dda2caa7d2 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt36342.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt36342.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 import java.lang.Exception
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt36342.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt36342.kt
index c5ac3622711..0a0b62c7b96 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt36342.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt36342.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 import java.lang.Exception
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.fir.kt
index 9624c28f2a1..f905fc93d25 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <K> id(arg: K): K = arg
 fun <M> materialize(): M = TODO()
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.kt
index 46346cda080..b384ff74f6c 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt36342_2.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <K> id(arg: K): K = arg
 fun <M> materialize(): M = TODO()
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt731.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt731.fir.kt
index eb259524968..e756bdc8b13 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt731.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt731.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 //KT-731 Missing error from type inference
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt
index c4e1d0d98e5..f1b25d7420a 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt731.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 //KT-731 Missing error from type inference
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt742.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt742.fir.kt
index 15e81b3b1f5..283620aedcc 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt742.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt742.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-742 Stack overflow in type inference
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt
index f1d0df486da..f2b4c58dc17 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt742.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-742 Stack overflow in type inference
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt832.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt832.fir.kt
index 892754ed03c..51fd6ed2833 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt832.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt832.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-832 Provide better diagnostics when type inference fails for an expression that returns a function
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt832.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt832.kt
index 4e7c917d2fb..38fb0c5550d 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt832.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt832.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-832 Provide better diagnostics when type inference fails for an expression that returns a function
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt948.fir.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt948.fir.kt
index 4b8a09505af..c264ff4bf26 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt948.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt948.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 //KT-948 Make type inference work with sure()/!!
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt b/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt
index 908c4b90065..2e9d2edba77 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt948.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 //KT-948 Make type inference work with sure()/!!
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.fir.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.fir.kt
index 3bed3f2a2d8..bcd8fb2c80a 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //For testing error messages text see DiagnosticMessageTest.testFunctionPlaceholder
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt
index 666c2bf038b..ddb429392ef 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //For testing error messages text see DiagnosticMessageTest.testFunctionPlaceholder
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.fir.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.fir.kt
index 995f30938ea..22d96ff0c70 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.kt
index 324921801de..e5898ffe2ab 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 package a
 
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.fir.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.fir.kt
index 80e64e539ee..f1d7133a179 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package aa
 
 fun <T, R> foo(block: (T)-> R) = block
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.kt
index 38b58fa387f..3272c3704a3 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package aa
 
 fun <T, R> foo(block: (T)-> R) = block
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.fir.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.fir.kt
index c7be5251afd..d48ecba5b77 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun <K> id2(x: K, s: String): K = x
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.kt
index 95f2d3a8dc8..fd0ece028c8 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/inferTypeFromUnresolvedArgument.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun <K> id2(x: K, s: String): K = x
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.fir.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.fir.kt
index 36b993c41cd..c3d614ed0ca 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 fun <R> foo (f: ()->R, r: MutableList<R>) = r.add(f())
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.kt
index 7108a6b6381..fca19ac0b3f 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 fun <R> foo (f: ()->R, r: MutableList<R>) = r.add(f())
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.fir.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.fir.kt
index a3deb300a16..42136d6dd2b 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 class X
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.kt
index 44d9ec08cd5..01c63bbcf7e 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnComponentN.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 class X
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.fir.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.fir.kt
index 5093ee66f47..95a68b2dc1e 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class X
 
 operator fun <T> X.iterator(): Iterable<T> = TODO()
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.kt
index 1e6454a861b..ea73d04b5ae 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/typeInferenceFailedOnIteratorCall.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class X
 
 operator fun <T> X.iterator(): Iterable<T> = TODO()
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/wrongArgumentPassedToLocalExtensionFunction.fir.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/wrongArgumentPassedToLocalExtensionFunction.fir.kt
index 216e5d1a791..93d4e5d9140 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/wrongArgumentPassedToLocalExtensionFunction.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/wrongArgumentPassedToLocalExtensionFunction.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // WITH_RUNTIME
 
 fun Runnable.test(f: Runnable.(Int) -> Unit) {
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/wrongArgumentPassedToLocalExtensionFunction.kt b/compiler/testData/diagnostics/tests/inference/reportingImprovements/wrongArgumentPassedToLocalExtensionFunction.kt
index b46e39f8f5b..b38f78d7d05 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/wrongArgumentPassedToLocalExtensionFunction.kt
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/wrongArgumentPassedToLocalExtensionFunction.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // WITH_RUNTIME
 
 fun Runnable.test(f: Runnable.(Int) -> Unit) {
diff --git a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.fir.kt b/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.fir.kt
index f56ada63152..4a884cc375a 100644
--- a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package typeConstructorMismatch
 //+JDK
 
diff --git a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt b/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt
index 530718d7a48..5e342cc3707 100644
--- a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt
+++ b/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package typeConstructorMismatch
 //+JDK
 
diff --git a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.fir.kt b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.fir.kt
index 2c64137eb71..ca87b90384e 100644
--- a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package typeInferenceExpectedTypeMismatch
 
 import java.util.*
diff --git a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.kt b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.kt
index 4a9573ce1aa..631ba119c38 100644
--- a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.kt
+++ b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package typeInferenceExpectedTypeMismatch
 
 import java.util.*
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.fir.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.fir.kt
index e9d910c26bf..f1293c38a1c 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.kt
index b0de8d3f355..31dfbeb5d86 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.fir.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.fir.kt
index 133d2feda13..2307f85ecdd 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 package s
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt
index 1eb55cc189a..3b489f54847 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 package s
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.fir.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.fir.kt
index c442f006335..ad98b3e03d2 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package Hello
 
 open class Base<T>
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.kt
index 00b070ffaa4..df8715776e8 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package Hello
 
 open class Base<T>
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.fir.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.fir.kt
index 675483b1ffe..86b194be127 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.fir.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 fun <V: U, U> foo(v: V, u: U) = u
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.kt b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.kt
index ceb29636360..fc9857f5a39 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.kt
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 fun <V: U, U> foo(v: V, u: U) = u
diff --git a/compiler/testData/diagnostics/tests/infos/SmartCasts.fir.kt b/compiler/testData/diagnostics/tests/infos/SmartCasts.fir.kt
index d5655efe5c9..8f335bd058b 100644
--- a/compiler/testData/diagnostics/tests/infos/SmartCasts.fir.kt
+++ b/compiler/testData/diagnostics/tests/infos/SmartCasts.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 open class A() {
   fun foo() {}
 }
diff --git a/compiler/testData/diagnostics/tests/infos/SmartCasts.kt b/compiler/testData/diagnostics/tests/infos/SmartCasts.kt
index fbd3aea3ae8..95b6e033051 100644
--- a/compiler/testData/diagnostics/tests/infos/SmartCasts.kt
+++ b/compiler/testData/diagnostics/tests/infos/SmartCasts.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 open class A() {
   fun foo() {}
 }
diff --git a/compiler/testData/diagnostics/tests/inline/inlineLambdaInDefaultInlineParameterDisabled.fir.kt b/compiler/testData/diagnostics/tests/inline/inlineLambdaInDefaultInlineParameterDisabled.fir.kt
index 8a831f8e5c4..dc882c9e78b 100644
--- a/compiler/testData/diagnostics/tests/inline/inlineLambdaInDefaultInlineParameterDisabled.fir.kt
+++ b/compiler/testData/diagnostics/tests/inline/inlineLambdaInDefaultInlineParameterDisabled.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
 // !LANGUAGE: -InlineDefaultFunctionalParameters
 
diff --git a/compiler/testData/diagnostics/tests/inline/inlineLambdaInDefaultInlineParameterDisabled.kt b/compiler/testData/diagnostics/tests/inline/inlineLambdaInDefaultInlineParameterDisabled.kt
index ef3dae6f475..78937d8386c 100644
--- a/compiler/testData/diagnostics/tests/inline/inlineLambdaInDefaultInlineParameterDisabled.kt
+++ b/compiler/testData/diagnostics/tests/inline/inlineLambdaInDefaultInlineParameterDisabled.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -NOTHING_TO_INLINE
 // !LANGUAGE: -InlineDefaultFunctionalParameters
 
diff --git a/compiler/testData/diagnostics/tests/inline/kt15410.fir.kt b/compiler/testData/diagnostics/tests/inline/kt15410.fir.kt
index b4899954c86..e455a47e3be 100644
--- a/compiler/testData/diagnostics/tests/inline/kt15410.fir.kt
+++ b/compiler/testData/diagnostics/tests/inline/kt15410.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 open class Foo protected constructor()
diff --git a/compiler/testData/diagnostics/tests/inline/kt15410.kt b/compiler/testData/diagnostics/tests/inline/kt15410.kt
index 6bca72641f5..cb4a847079a 100644
--- a/compiler/testData/diagnostics/tests/inline/kt15410.kt
+++ b/compiler/testData/diagnostics/tests/inline/kt15410.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 open class Foo protected constructor()
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.fir.kt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.fir.kt
index c41c4bee41e..b716fc00100 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.fir.kt
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun box() : String {
     test {
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.kt b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.kt
index 80dd51c42ad..35593279205 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.kt
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaAsGeneric.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun box() : String {
     <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}!>test<!> {
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.fir.kt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.fir.kt
index 70d9d0e3c08..83de3deb13a 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 class Outer {
     class Nested<T>
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.kt b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.kt
index 884c9fb8584..1f9b03b0354 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.kt
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 class Outer {
     class Nested<T>
diff --git a/compiler/testData/diagnostics/tests/j+k/collectorInference.kt b/compiler/testData/diagnostics/tests/j+k/collectorInference.kt
index 4cf347e6fb1..8213cac8912 100644
--- a/compiler/testData/diagnostics/tests/j+k/collectorInference.kt
+++ b/compiler/testData/diagnostics/tests/j+k/collectorInference.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // SKIP_TXT
 // FULL_JDK
diff --git a/compiler/testData/diagnostics/tests/j+k/flexibleNothing.kt b/compiler/testData/diagnostics/tests/j+k/flexibleNothing.kt
index 6e2e7b234a1..772e86487ed 100644
--- a/compiler/testData/diagnostics/tests/j+k/flexibleNothing.kt
+++ b/compiler/testData/diagnostics/tests/j+k/flexibleNothing.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 
 // FILE: TestClass.java
 import org.jetbrains.annotations.Nullable;
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.fir.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.fir.kt
index 07814a5a1a4..35220c8e3c5 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // FILE: A.java
 
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.kt
index 1a7ee22adb6..9087463f034 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/classTypeParameterInferredFromArgument.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // FILE: A.java
 
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.fir.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.fir.kt
index 1012262d2c3..7e51219511e 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // FILE: Outer.java
 
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.kt
index 15182060056..8f9c486a20f 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/innerClass.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // FILE: Outer.java
 
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/noClassTypeParametersInvParameter.fir.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/noClassTypeParametersInvParameter.fir.kt
index 0045756feac..e3c016cefd3 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/noClassTypeParametersInvParameter.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/noClassTypeParametersInvParameter.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: A.java
 
 public class A {
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/noClassTypeParametersInvParameter.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/noClassTypeParametersInvParameter.kt
index 5e3b91186d8..95a10a3920f 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/noClassTypeParametersInvParameter.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/noClassTypeParametersInvParameter.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: A.java
 
 public class A {
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.fir.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.fir.kt
index eee0e6ef4dd..86affa593ef 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: C.java
 
 // See KT-10410
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.kt
index cee6eaeff2b..3a68bcaef9e 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/recursive.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: C.java
 
 // See KT-10410
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCall.fir.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCall.fir.kt
index 06556bae449..caf94fd0cf9 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCall.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 // FILE: A.java
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCall.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCall.kt
index 852545278fe..936fd195aaf 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCall.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCall.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 // FILE: A.java
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCallImpossibleToInfer.fir.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCallImpossibleToInfer.fir.kt
index 39e676b31ea..56b2b0ef877 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCallImpossibleToInfer.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCallImpossibleToInfer.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 // FILE: A.java
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCallImpossibleToInfer.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCallImpossibleToInfer.kt
index c9235bef874..573a1bfb21d 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCallImpossibleToInfer.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructor/superCallImpossibleToInfer.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 // FILE: A.java
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.fir.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.fir.kt
index fad33b8fb85..1cde74d7c72 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 
 import java.io.Serializable;
diff --git a/compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.kt b/compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.kt
index ec44ac464fe..b35b271babe 100644
--- a/compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.kt
+++ b/compiler/testData/diagnostics/tests/j+k/genericConstructorWithMultipleBounds.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 
 import java.io.Serializable;
diff --git a/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.fir.kt b/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.fir.kt
index 64cd635b035..cd09789325d 100644
--- a/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 import org.jetbrains.annotations.*;
 
diff --git a/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.kt b/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.kt
index ba1e8518705..304f29bfd10 100644
--- a/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.kt
+++ b/compiler/testData/diagnostics/tests/j+k/sam/enhancedSamConstructor.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 import org.jetbrains.annotations.*;
 
diff --git a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.fir.kt b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.fir.kt
index 8c4c5b28435..78a05f02662 100644
--- a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // FILE: EventListener.java
 public interface EventListener<E> {
diff --git a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.kt b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.kt
index 9b13f34945a..89228862837 100644
--- a/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.kt
+++ b/compiler/testData/diagnostics/tests/j+k/samByProjectedType/genericInReturnType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // FILE: EventListener.java
 public interface EventListener<E> {
diff --git a/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.fir.kt b/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.fir.kt
index 992af681e14..70543008bc0 100644
--- a/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.fir.kt
+++ b/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: A.java
diff --git a/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.kt b/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.kt
index c4bdfdd1563..c7c0d347ef4 100644
--- a/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.kt
+++ b/compiler/testData/diagnostics/tests/j+k/wrongVarianceInJava.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: A.java
diff --git a/compiler/testData/diagnostics/tests/kt13401.fir.kt b/compiler/testData/diagnostics/tests/kt13401.fir.kt
index ff746e0535d..f195c6b5397 100644
--- a/compiler/testData/diagnostics/tests/kt13401.fir.kt
+++ b/compiler/testData/diagnostics/tests/kt13401.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 // See KT-13401: SOE in VarianceChecker
 
diff --git a/compiler/testData/diagnostics/tests/kt13401.kt b/compiler/testData/diagnostics/tests/kt13401.kt
index e9ccffb6966..80333d3389c 100644
--- a/compiler/testData/diagnostics/tests/kt13401.kt
+++ b/compiler/testData/diagnostics/tests/kt13401.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 // See KT-13401: SOE in VarianceChecker
 
diff --git a/compiler/testData/diagnostics/tests/kt310.fir.kt b/compiler/testData/diagnostics/tests/kt310.fir.kt
index 9e95191526c..738c832ccec 100644
--- a/compiler/testData/diagnostics/tests/kt310.fir.kt
+++ b/compiler/testData/diagnostics/tests/kt310.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun f(c: LongRange): Int {
     return c.<!UNRESOLVED_REFERENCE!>start<!>()
diff --git a/compiler/testData/diagnostics/tests/kt310.kt b/compiler/testData/diagnostics/tests/kt310.kt
index a1670061adf..a392d2adeea 100644
--- a/compiler/testData/diagnostics/tests/kt310.kt
+++ b/compiler/testData/diagnostics/tests/kt310.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun f(c: LongRange): Int {
     return c.<!FUNCTION_EXPECTED!>start<!>()
diff --git a/compiler/testData/diagnostics/tests/library/Collections.fir.kt b/compiler/testData/diagnostics/tests/library/Collections.fir.kt
index 27a12114e35..45371a280a8 100644
--- a/compiler/testData/diagnostics/tests/library/Collections.fir.kt
+++ b/compiler/testData/diagnostics/tests/library/Collections.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package collections
 
 fun <T> testCollection(c: Collection<T>, t: T) {
diff --git a/compiler/testData/diagnostics/tests/library/Collections.kt b/compiler/testData/diagnostics/tests/library/Collections.kt
index a34229efccd..007383e65ae 100644
--- a/compiler/testData/diagnostics/tests/library/Collections.kt
+++ b/compiler/testData/diagnostics/tests/library/Collections.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package collections
 
 fun <T> testCollection(c: Collection<T>, t: T) {
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.fir.kt b/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.fir.kt
index a708c8dc640..328e56c4402 100644
--- a/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.fir.kt
+++ b/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.fir.kt
@@ -1,3 +1,2 @@
-// !WITH_NEW_INFERENCE
 annotation class A(val a: IntArray = <!TYPE_MISMATCH!>arrayOf(1)<!>)
 annotation class B(val a: IntArray = intArrayOf(1))
diff --git a/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.kt b/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.kt
index 855b8c22283..5be111bbe0a 100644
--- a/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.kt
+++ b/compiler/testData/diagnostics/tests/modifiers/const/arrayInAnnotationArgumentType.kt
@@ -1,3 +1,2 @@
-// !WITH_NEW_INFERENCE
 annotation class A(val a: IntArray = <!TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH{OI}, TYPE_MISMATCH{NI}, TYPE_MISMATCH{NI}!>arrayOf(1)<!>)
 annotation class B(val a: IntArray = intArrayOf(1))
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.fir.kt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.fir.kt
index 4105d6291d3..dddd623b059 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.fir.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // MODULE: m1
 // FILE: a.kt
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.kt b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.kt
index bbbfcb18a17..1f2f734b1b4 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // MODULE: m1
 // FILE: a.kt
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.fir.kt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.fir.kt
index ef0f3eb4599..702ed9cbb7f 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.fir.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // MODULE: m1
 // FILE: a.kt
 package p
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.kt b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.kt
index c0be64d357b..dc2df929564 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.kt
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // MODULE: m1
 // FILE: a.kt
 package p
diff --git a/compiler/testData/diagnostics/tests/multiplatform/namedArguments.fir.kt b/compiler/testData/diagnostics/tests/multiplatform/namedArguments.fir.kt
index 9a064ec275d..be5be893aa0 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/namedArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/namedArguments.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +MultiPlatformProjects
 // MODULE: m1-common
 // FILE: common.kt
diff --git a/compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt b/compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt
index 37790ce62e4..40d0d70dca6 100644
--- a/compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt
+++ b/compiler/testData/diagnostics/tests/multiplatform/namedArguments.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +MultiPlatformProjects
 // MODULE: m1-common
 // FILE: common.kt
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt
index 28775d449d4..50ce3608e59 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt
+++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // FILE: test/J.java
 
 package test;
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt
index 2ae3fc32ac4..7eac2b2d950 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt
+++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // FILE: test/J.java
 
 package test;
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.fir.kt
index cf7143619e3..802373b198f 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 fun main() {
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.kt
index 1500e1a030a..54ec6a905b4 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 fun main() {
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.kt
index 36e6c2d8c91..6ed9d7f262c 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 class A() {
     operator infix fun plus(i : Int) {}
     operator fun unaryMinus() {}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.fir.kt
index 89a349c22ad..760026300e9 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-2146 Nullability casts in when.
 package kt2146
 
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.kt
index a074aeecdb6..019137965eb 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-2146 Nullability casts in when.
 package kt2146
 
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.fir.kt
index 4ee20cf434b..4ea68036dba 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-2164 !! does not propagate nullability information
 package kt2164
 
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.kt
index 0e4193fc611..af0be5af601 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-2164 !! does not propagate nullability information
 package kt2164
 
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.fir.kt
index 854e2281788..de02af4ab72 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
 //KT-2216 Nullability of a value determined in function parameter computation doesn't pass to code following
 package kt2216
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.kt
index 4db26fe8a4f..a3ef6f94083 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -DEBUG_INFO_SMARTCAST
 //KT-2216 Nullability of a value determined in function parameter computation doesn't pass to code following
 package kt2216
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt30734.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt30734.fir.kt
index 25ea6b526a8..d9ef44e524f 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt30734.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt30734.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +NewInference
 // Issue: KT-30734
 
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt30734.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt30734.kt
index 459974779ca..53a1579a429 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt30734.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt30734.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +NewInference
 // Issue: KT-30734
 
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unnecessaryNotNullAssertion.fir.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unnecessaryNotNullAssertion.fir.kt
index b5f9e05f811..35f2d87663e 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unnecessaryNotNullAssertion.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unnecessaryNotNullAssertion.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -SENSELESS_COMPARISON, -DEBUG_INFO_SMARTCAST
 
 fun takeNotNull(s: String) {}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unnecessaryNotNullAssertion.kt b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unnecessaryNotNullAssertion.kt
index a1e9a09a30d..01c1b825896 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unnecessaryNotNullAssertion.kt
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/unnecessaryNotNullAssertion.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -SENSELESS_COMPARISON, -DEBUG_INFO_SMARTCAST
 
 fun takeNotNull(s: String) {}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.fir.kt b/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.fir.kt
index fcce0275ffd..2b51253a6c2 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun <T> test(t: T): T {
     if (t != null) {
         return t<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.kt b/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.kt
index d8c27d1374f..4c5a76add3e 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun <T> test(t: T): T {
     if (t != null) {
         return t<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.fir.kt b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.fir.kt
index 13ee4dbdf08..677a141c099 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.kt b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.kt
index 718554dae0d..c32c02d4fc2 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterPlatform.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.fir.kt b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.fir.kt
index ac2ee3313fc..d6669bb5619 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun foo(x: String) {}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.kt b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.kt
index bf7b67381db..a5887a15523 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentToNonNullParameterSimple.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun foo(x: String) {}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.fir.kt b/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.fir.kt
index 75356611a22..848be3e88cc 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.fir.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun <T> test(t: T): String? {
     if (t != null) {
         return t<!UNNECESSARY_SAFE_CALL!>?.<!>toString()
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.kt b/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.kt
index 27b11f14094..219d05ab2ef 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.kt
+++ b/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun <T> test(t: T): String? {
     if (t != null) {
         return t<!UNNECESSARY_SAFE_CALL!>?.<!>toString()
diff --git a/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.fir.kt b/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.fir.kt
index 754458888ea..2f38bbbce5a 100644
--- a/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.fir.kt
+++ b/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(n: Number) = n
 
 fun test() {
diff --git a/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt b/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt
index a8b30693cef..03a89ca0fd5 100644
--- a/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt
+++ b/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(n: Number) = n
 
 fun test() {
diff --git a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.fir.kt b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.fir.kt
index 6e531829f0f..256de007afa 100644
--- a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.fir.kt
+++ b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 package a
diff --git a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt
index 1502aa288b7..f59be6be1fa 100644
--- a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt
+++ b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 package a
diff --git a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.fir.kt b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.fir.kt
index ace8eca8e5a..a89a29ad123 100644
--- a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.fir.kt
+++ b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 fun foo(i: Int) = i
diff --git a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt
index 44ca2aa9717..4f87a343ddf 100644
--- a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt
+++ b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 fun foo(i: Int) = i
diff --git a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.fir.kt b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.fir.kt
index aa669f9dca7..2ab2d63d285 100644
--- a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.fir.kt
+++ b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 package a
 
diff --git a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt
index 49ea728d052..f5574644cd0 100644
--- a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt
+++ b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 package a
 
diff --git a/compiler/testData/diagnostics/tests/objects/kt5527.fir.kt b/compiler/testData/diagnostics/tests/objects/kt5527.fir.kt
index de95c8a8022..87e02797099 100644
--- a/compiler/testData/diagnostics/tests/objects/kt5527.fir.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt5527.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 object Boo {}
diff --git a/compiler/testData/diagnostics/tests/objects/kt5527.kt b/compiler/testData/diagnostics/tests/objects/kt5527.kt
index 0a8853e73f2..6b5ba7195b6 100644
--- a/compiler/testData/diagnostics/tests/objects/kt5527.kt
+++ b/compiler/testData/diagnostics/tests/objects/kt5527.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 object Boo {}
diff --git a/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModAssignOperatorConventions.fir.kt b/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModAssignOperatorConventions.fir.kt
index f64bd1bdf0d..f328d45217c 100644
--- a/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModAssignOperatorConventions.fir.kt
+++ b/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModAssignOperatorConventions.fir.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: -ProhibitOperatorMod
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class OldAndNew {
diff --git a/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModAssignOperatorConventions.kt b/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModAssignOperatorConventions.kt
index 8ca2e1cec73..33f4e01ae10 100644
--- a/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModAssignOperatorConventions.kt
+++ b/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModAssignOperatorConventions.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: -ProhibitOperatorMod
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class OldAndNew {
diff --git a/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModOperatorConventions.fir.kt b/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModOperatorConventions.fir.kt
index 2b1cd615b4c..f02f145bcc5 100644
--- a/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModOperatorConventions.fir.kt
+++ b/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModOperatorConventions.fir.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: -ProhibitOperatorMod
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class OldAndNew {
diff --git a/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModOperatorConventions.kt b/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModOperatorConventions.kt
index 8ec787522ff..7e6bb91ceaf 100644
--- a/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModOperatorConventions.kt
+++ b/compiler/testData/diagnostics/tests/operatorRem/DeprecatedModOperatorConventions.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: -ProhibitOperatorMod
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class OldAndNew {
diff --git a/compiler/testData/diagnostics/tests/operatorRem/doNotResolveToInapplicableRem.fir.kt b/compiler/testData/diagnostics/tests/operatorRem/doNotResolveToInapplicableRem.fir.kt
index 3c5b319096e..f219481b102 100644
--- a/compiler/testData/diagnostics/tests/operatorRem/doNotResolveToInapplicableRem.fir.kt
+++ b/compiler/testData/diagnostics/tests/operatorRem/doNotResolveToInapplicableRem.fir.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: -ProhibitOperatorMod
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 object OldMod {
diff --git a/compiler/testData/diagnostics/tests/operatorRem/doNotResolveToInapplicableRem.kt b/compiler/testData/diagnostics/tests/operatorRem/doNotResolveToInapplicableRem.kt
index a644c9bebd7..588abdb08f5 100644
--- a/compiler/testData/diagnostics/tests/operatorRem/doNotResolveToInapplicableRem.kt
+++ b/compiler/testData/diagnostics/tests/operatorRem/doNotResolveToInapplicableRem.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: -ProhibitOperatorMod
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 object OldMod {
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.fir.kt b/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.fir.kt
index bf731458499..a1b04c1bf0e 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.fir.kt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 class A {
     operator fun get(x: Int): Int = x
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.kt b/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.kt
index 336e7b3ca7b..a46a695d85a 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.kt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt11300.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 class A {
     operator fun get(x: Int): Int = x
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.fir.kt b/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.fir.kt
index 4b6ff721930..63b6c07acf1 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.fir.kt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-13330 AssertionError: Illegal resolved call to variable with invoke
 
 fun foo(exec: (String.() -> Unit)?) = "".<!INAPPLICABLE_CANDIDATE!>exec<!><caret>() // <caret> is test data tag here
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.kt b/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.kt
index 7d17e513ad6..f15c3745d4b 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.kt
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt13330.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-13330 AssertionError: Illegal resolved call to variable with invoke
 
 fun foo(exec: (String.() -> Unit)?) = "".<!UNSAFE_IMPLICIT_INVOKE_CALL, WRONG_NUMBER_OF_TYPE_ARGUMENTS{NI}!>exec<!><!WRONG_NUMBER_OF_TYPE_ARGUMENTS{OI}!><<!UNRESOLVED_REFERENCE!>caret<!>><!>() // <caret> is test data tag here
diff --git a/compiler/testData/diagnostics/tests/overload/defaultParameters.fir.kt b/compiler/testData/diagnostics/tests/overload/defaultParameters.fir.kt
index 5b7b7f84d11..5e871e83bc6 100644
--- a/compiler/testData/diagnostics/tests/overload/defaultParameters.fir.kt
+++ b/compiler/testData/diagnostics/tests/overload/defaultParameters.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/overload/defaultParameters.kt b/compiler/testData/diagnostics/tests/overload/defaultParameters.kt
index abc3d7231bc..d1829c687f1 100644
--- a/compiler/testData/diagnostics/tests/overload/defaultParameters.kt
+++ b/compiler/testData/diagnostics/tests/overload/defaultParameters.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/tests/overload/kt2493.fir.kt b/compiler/testData/diagnostics/tests/overload/kt2493.fir.kt
index 40c426b7fe4..6e72ebd2b2e 100644
--- a/compiler/testData/diagnostics/tests/overload/kt2493.fir.kt
+++ b/compiler/testData/diagnostics/tests/overload/kt2493.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface A
 interface B
 
diff --git a/compiler/testData/diagnostics/tests/overload/kt2493.kt b/compiler/testData/diagnostics/tests/overload/kt2493.kt
index 73424902928..17d6b03bbf9 100644
--- a/compiler/testData/diagnostics/tests/overload/kt2493.kt
+++ b/compiler/testData/diagnostics/tests/overload/kt2493.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface A
 interface B
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.fir.kt
index 8ca71dcd74b..a865c4e99a7 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 // SKIP_JAVAC
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.kt b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.kt
index eec363d673e..ae03227f7a7 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 // SKIP_JAVAC
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.fir.kt
index 5cce6cae9c7..6c1b45fc4f2 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 interface Foo
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.kt b/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.kt
index 4a719283223..c3ce3e75b6b 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
 
 interface Foo
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.kt b/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.kt
index 83ea7decc29..eef0913d8ec 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // FILE: p/Visitor.java
 
 package p;
diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.fir.kt
index 689e6e31ab5..2951967aafc 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: A.java
 
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.kt b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.kt
index fd07ab11be7..5b16e5c9bfa 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/notNullTypeParameter/methodTypeParameter.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: A.java
 
 import org.jetbrains.annotations.NotNull;
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.fir.kt
index 18c9e60b888..f88b686e612 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt
index 8f89d89fa9f..9ecf7821f1a 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/arithmetic.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.fir.kt
index a59e1eda6f7..4dd0494b0ce 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt
index bcc125ee286..712431e8132 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/assignToVar.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.fir.kt
index d08d7080d4a..6b8cf402706 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
 // FILE: J.java
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt
index cda8720e916..551d125f87d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/conditions.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
 // FILE: J.java
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.fir.kt
index a32ba52480c..aae0923b786 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: J.java
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt
index 8af77c1813a..bb8ff0a9c87 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/dataFlowInfo.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: J.java
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.fir.kt
index 1ef043f66e2..9c884b34a28 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: J.java
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt
index 6d74135a4b6..4c6d2fc62aa 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/defaultParameters.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // FILE: J.java
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.fir.kt
index 2a16ec3d803..0f3f372bcce 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt
index 6b878d86363..5970a02c277 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/delegation.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.fir.kt
index e0b27d2fd0a..44750a4acb1 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt
index c2367edb4df..33465a257df 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/passToJava.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.fir.kt
index 2755f518ced..40cffe7a8ca 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt
index 87f626a5219..df4f6c14145 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullabilityWarnings/throw.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: J.java
 
 import org.jetbrains.annotations.*;
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.fir.kt
index adf22ababc0..a3d40416ffb 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // FILE: A.java
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.kt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.kt
index 578f1093a57..15d84f068b1 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/arrays.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // FILE: A.java
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.fir.kt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.fir.kt
index 761b2b25bbd..c0f9db1c7b8 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.fir.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // FILE: A.java
 
diff --git a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.kt b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.kt
index cb4a5be6f32..c6653eac642 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.kt
+++ b/compiler/testData/diagnostics/tests/platformTypes/rawTypes/samRaw.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // FILE: A.java
 
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.fir.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.fir.kt
index 8091a2cabdf..f6f10a935c6 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.fir.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 val x get() = foo()
 val y get() = bar()
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.kt
index 686ff76a21d..50b2d297578 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/cantBeInferred.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 val x get() = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>()
 val y get() = <!NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>bar<!>()
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/nullAsNothing.fir.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/nullAsNothing.fir.kt
index d43acd3a5f7..d0efc02d6d9 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/nullAsNothing.fir.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/nullAsNothing.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 val x get() = null
 val y get() = null!!
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/nullAsNothing.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/nullAsNothing.kt
index c8bd54ea24f..c9c42e8cf62 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/nullAsNothing.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/nullAsNothing.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 val x get() = null
 val <!IMPLICIT_NOTHING_PROPERTY_TYPE!>y<!> get() = null!!
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/objectExpression.fir.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/objectExpression.fir.kt
index e56fd8d69f4..10d85197bca 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/objectExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/objectExpression.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 object Outer {
     private var x
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/objectExpression.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/objectExpression.kt
index fed89a4295e..8e707b06ff6 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/objectExpression.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/objectExpression.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 object Outer {
     private var x
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.fir.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.fir.kt
index dadfa97842d..758371ab934 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.fir.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.kt
index 748b1512262..8da2453ec26 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/recursiveGetter.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.fir.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.fir.kt
index 68531f82a31..6d800786d9a 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.fir.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: -ShortSyntaxForPropertyGetters
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.kt b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.kt
index f238f196290..fdce8c4da00 100644
--- a/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.kt
+++ b/compiler/testData/diagnostics/tests/properties/inferenceFromGetters/unsupportedInferenceFromGetters.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: -ShortSyntaxForPropertyGetters
 // NI_EXPECTED_FILE
 
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.fir.kt b/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.fir.kt
index ee8c478f187..6cf18760663 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.fir.kt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -UNREACHABLE_CODE
-// !WITH_NEW_INFERENCE
 
 class A {
     class B {
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.kt b/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.kt
index e6119f16e33..b2e09756ffe 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.kt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/TypeWithError.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE -UNREACHABLE_CODE
-// !WITH_NEW_INFERENCE
 
 class A {
     class B {
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.fir.kt b/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.fir.kt
index 3d99787f9d9..37517d4e75f 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.fir.kt
@@ -1,2 +1 @@
-// !WITH_NEW_INFERENCE
 val unwrapped = <!UNRESOLVED_REFERENCE!>some<!><<!UNRESOLVED_REFERENCE!>sdf<!>()()<out Any>::unwrap
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.kt b/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.kt
index 42784851b6e..2fb84b035c7 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.kt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/calleeExpressionAsCallExpression.kt
@@ -1,2 +1 @@
-// !WITH_NEW_INFERENCE
 val unwrapped = <!UNRESOLVED_REFERENCE!>some<!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!><<!><!DEBUG_INFO_MISSING_UNRESOLVED!>sdf<!>()()<out <!DEBUG_INFO_MISSING_UNRESOLVED!>Any<!>>::<!DEBUG_INFO_MISSING_UNRESOLVED!>unwrap<!>
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.fir.kt b/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.fir.kt
index c413fd0249e..a24577bee4e 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 val unwrapped = some.<!SYNTAX!><<!><!UNRESOLVED_REFERENCE!>cabc<!><!SYNTAX!>$Wrapper<!><<!PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT!>out Any<!>>::<!UNRESOLVED_REFERENCE!>unwrap<!>
diff --git a/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.kt b/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.kt
index 18db3c8cb6e..9f5270292cf 100644
--- a/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.kt
+++ b/compiler/testData/diagnostics/tests/qualifiedExpression/nullCalleeExpression.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 val unwrapped = <!UNRESOLVED_REFERENCE!>some<!>.<!SYNTAX!><<!><!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>cabc<!><!SYNTAX!>$Wrapper<!><out <!DEBUG_INFO_MISSING_UNRESOLVED!>Any<!>>::<!DEBUG_INFO_MISSING_UNRESOLVED!>unwrap<!>
diff --git a/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.fir.kt b/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.fir.kt
index 86c7ff9bf37..69e0247fd63 100644
--- a/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.fir.kt
+++ b/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun import() {
     <!UNRESOLVED_REFERENCE!>import<!> a<!SYNTAX!>.<!><!UNRESOLVED_REFERENCE!>*<!><!SYNTAX!><!>
 }
diff --git a/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt b/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt
index fd4898166c0..65a0b43d879 100644
--- a/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt
+++ b/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun import() {
     <!FUNCTION_CALL_EXPECTED!>import<!> <!UNRESOLVED_REFERENCE!>a<!><!SYNTAX!>.<!><!DEBUG_INFO_MISSING_UNRESOLVED!>*<!><!SYNTAX!><!>
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet81.fir.kt b/compiler/testData/diagnostics/tests/regressions/Jet81.fir.kt
index d7fbd05f526..83cab2c3fef 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet81.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet81.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 // JET-81 Assertion fails when processing self-referring anonymous objects
 
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet81.kt b/compiler/testData/diagnostics/tests/regressions/Jet81.kt
index d557e34dd63..a6663d65dd2 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet81.kt
+++ b/compiler/testData/diagnostics/tests/regressions/Jet81.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 // JET-81 Assertion fails when processing self-referring anonymous objects
 
diff --git a/compiler/testData/diagnostics/tests/regressions/OutProjections.fir.kt b/compiler/testData/diagnostics/tests/regressions/OutProjections.fir.kt
index 48dbe3206e1..7f0fb514060 100644
--- a/compiler/testData/diagnostics/tests/regressions/OutProjections.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/OutProjections.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class Point() {
 }
 
diff --git a/compiler/testData/diagnostics/tests/regressions/OutProjections.kt b/compiler/testData/diagnostics/tests/regressions/OutProjections.kt
index ce685827dcc..531c2b0f4ba 100644
--- a/compiler/testData/diagnostics/tests/regressions/OutProjections.kt
+++ b/compiler/testData/diagnostics/tests/regressions/OutProjections.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class Point() {
 }
 
diff --git a/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.fir.kt b/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.fir.kt
index d404428b921..d9cbd608db7 100644
--- a/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun main() {
     val a : Int? = null;
     var v = 1
diff --git a/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.kt b/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.kt
index 4391781a4f1..6465489194a 100644
--- a/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.kt
+++ b/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun main() {
     val a : Int? = null;
     var v = 1
diff --git a/compiler/testData/diagnostics/tests/regressions/correctResultSubstitutorForErrorCandidate.fir.kt b/compiler/testData/diagnostics/tests/regressions/correctResultSubstitutorForErrorCandidate.fir.kt
index 84aaf3d524e..b6638f51169 100644
--- a/compiler/testData/diagnostics/tests/regressions/correctResultSubstitutorForErrorCandidate.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/correctResultSubstitutorForErrorCandidate.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun test(a: Int, b: Boolean) {
diff --git a/compiler/testData/diagnostics/tests/regressions/correctResultSubstitutorForErrorCandidate.kt b/compiler/testData/diagnostics/tests/regressions/correctResultSubstitutorForErrorCandidate.kt
index 65b023f7c13..3cf1f5044ff 100644
--- a/compiler/testData/diagnostics/tests/regressions/correctResultSubstitutorForErrorCandidate.kt
+++ b/compiler/testData/diagnostics/tests/regressions/correctResultSubstitutorForErrorCandidate.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun test(a: Int, b: Boolean) {
diff --git a/compiler/testData/diagnostics/tests/regressions/ea72837.fir.kt b/compiler/testData/diagnostics/tests/regressions/ea72837.fir.kt
index 62428aab796..fe4dad1f4b8 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea72837.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/ea72837.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 fun <T> g(x: T) = 1
 fun h(x: () -> Unit) = 1
diff --git a/compiler/testData/diagnostics/tests/regressions/ea72837.kt b/compiler/testData/diagnostics/tests/regressions/ea72837.kt
index 173635e8d04..80a9e4777bb 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea72837.kt
+++ b/compiler/testData/diagnostics/tests/regressions/ea72837.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 fun <T> g(x: T) = 1
 fun h(x: () -> Unit) = 1
diff --git a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundLocal.fir.kt b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundLocal.fir.kt
index 83a5dfd4d0b..f4481fc4ebc 100644
--- a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundLocal.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundLocal.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun bar() {
     fun <T: <!UNRESOLVED_REFERENCE!>T?<!>> foo() {}
     <!INAPPLICABLE_CANDIDATE!>foo<!>()
diff --git a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundLocal.kt b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundLocal.kt
index 6407878e67b..31f6359da71 100644
--- a/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundLocal.kt
+++ b/compiler/testData/diagnostics/tests/regressions/itselfAsUpperBoundLocal.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun bar() {
     fun <<!CYCLIC_GENERIC_UPPER_BOUND!>T: T?<!>> foo() {}
     <!TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>foo<!>()
diff --git a/compiler/testData/diagnostics/tests/regressions/kt10243.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt10243.fir.kt
index eb1e3b5304f..e28c3623f31 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt10243.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt10243.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 val f: Boolean = true
 private fun doUpdateRegularTasks() {
     try {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt10243.kt b/compiler/testData/diagnostics/tests/regressions/kt10243.kt
index 0845815e599..c5f5ce0b938 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt10243.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt10243.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 val f: Boolean = true
 private fun doUpdateRegularTasks() {
     try {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt10843.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt10843.fir.kt
index 9f41a1e530c..b756a3e5eb6 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt10843.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt10843.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 // See EA-76890 / KT-10843: NPE during analysis
 fun lambda(x : Int?) = x?.<!UNRESOLVED_REFERENCE!>let<!> l {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt10843.kt b/compiler/testData/diagnostics/tests/regressions/kt10843.kt
index c209aad4428..797327290cb 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt10843.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt10843.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 // See EA-76890 / KT-10843: NPE during analysis
 fun lambda(x : Int?) = x?.<!FUNCTION_CALL_EXPECTED, NEW_INFERENCE_NO_INFORMATION_FOR_PARAMETER{NI}, NO_VALUE_FOR_PARAMETER, TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER{OI}!>let<!> <!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE{OI}, DEBUG_INFO_MISSING_UNRESOLVED{NI}!>l<!> {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt11979.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt11979.fir.kt
index ad796b0d6e2..4d137bb0afe 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt11979.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt11979.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 
 interface Bar<T> {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt11979.kt b/compiler/testData/diagnostics/tests/regressions/kt11979.kt
index 2a9334a113f..aca2c7e8184 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt11979.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt11979.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 
 interface Bar<T> {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt12898.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt12898.fir.kt
index f54ea71e143..c62673ba5f2 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt12898.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt12898.fir.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +NewInference
-// !WITH_NEW_INFERENCE
 
 interface B<T : S?, S : Any> {
     val t: T
diff --git a/compiler/testData/diagnostics/tests/regressions/kt12898.kt b/compiler/testData/diagnostics/tests/regressions/kt12898.kt
index c974e06e263..8e77087ea6c 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt12898.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt12898.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +NewInference
-// !WITH_NEW_INFERENCE
 
 interface B<T : S?, S : Any> {
     val t: T
diff --git a/compiler/testData/diagnostics/tests/regressions/kt13685.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt13685.fir.kt
index eaa4343fca8..6e0fa3730e0 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt13685.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt13685.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNREACHABLE_CODE
 
 fun foo() {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt13685.kt b/compiler/testData/diagnostics/tests/regressions/kt13685.kt
index 8bc4030ed4c..baef6a303b4 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt13685.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt13685.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNREACHABLE_CODE
 
 fun foo() {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1489_1728.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt1489_1728.fir.kt
index 450b0be92c7..ad47b7a20ed 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1489_1728.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt1489_1728.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package kt606_dependents
 
 //KT-1489 Code analyzer fails with assertion
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1489_1728.kt b/compiler/testData/diagnostics/tests/regressions/kt1489_1728.kt
index af180e6e67f..f15bdb3d45e 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1489_1728.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt1489_1728.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package kt606_dependents
 
 //KT-1489 Code analyzer fails with assertion
diff --git a/compiler/testData/diagnostics/tests/regressions/kt24488.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt24488.fir.kt
index b4eb7957a51..0d7c8420d68 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt24488.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt24488.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 
 class Bar {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt24488.kt b/compiler/testData/diagnostics/tests/regressions/kt24488.kt
index 03710b2c651..09e9fea9cea 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt24488.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt24488.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 
 class Bar {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt251.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt251.fir.kt
index a2e921aeb0c..a4ab77ebd2a 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt251.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt251.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class A() {
     var x: Int = 0
         get() = "s"
diff --git a/compiler/testData/diagnostics/tests/regressions/kt251.kt b/compiler/testData/diagnostics/tests/regressions/kt251.kt
index d176a2ec39b..4a2f6c53c68 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt251.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt251.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class A() {
     var x: Int = 0
         get() = <!TYPE_MISMATCH!>"s"<!>
diff --git a/compiler/testData/diagnostics/tests/regressions/kt282.kt b/compiler/testData/diagnostics/tests/regressions/kt282.kt
index b8c0744fcec..a51b1ae8b72 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt282.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt282.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // KT-282 Nullability in extension functions and in binary calls
 
 class Set {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt312.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt312.fir.kt
index 55c6122115e..735790dc2c6 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt312.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt312.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-312 Nullability problem when a nullable version of a generic type is returned
 
 fun <T> Array<out T>.safeGet(index : Int) : T? {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt312.kt b/compiler/testData/diagnostics/tests/regressions/kt312.kt
index 3a9d5e87cc1..10975743dc2 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt312.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt312.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-312 Nullability problem when a nullable version of a generic type is returned
 
 fun <T> Array<out T>.safeGet(index : Int) : T? {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt328.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt328.fir.kt
index 566fd637ba5..e6c6003c1a7 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt328.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt328.fir.kt
@@ -1,5 +1,4 @@
 // COMPARE_WITH_LIGHT_TREE
-// !WITH_NEW_INFERENCE
 //KT-328 Local function in function literals cause exceptions
 
 fun bar1() = {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt328.kt b/compiler/testData/diagnostics/tests/regressions/kt328.kt
index 92c0521be4a..0b29be62287 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt328.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt328.kt
@@ -1,5 +1,4 @@
 // COMPARE_WITH_LIGHT_TREE
-// !WITH_NEW_INFERENCE
 //KT-328 Local function in function literals cause exceptions
 
 fun bar1() = {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt352.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt352.fir.kt
index ba34d4d076c..293c30b4192 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt352.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt352.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-352 Function variable declaration type isn't checked inside a function body
 
 package kt352
diff --git a/compiler/testData/diagnostics/tests/regressions/kt352.kt b/compiler/testData/diagnostics/tests/regressions/kt352.kt
index 80cc37de7aa..4449b509b11 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt352.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt352.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-352 Function variable declaration type isn't checked inside a function body
 
 package kt352
diff --git a/compiler/testData/diagnostics/tests/regressions/kt353.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt353.fir.kt
index 86054faac9e..4533391638b 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt353.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt353.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-353 Generic type argument inference sometimes doesn't work
 
 interface A {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt353.kt b/compiler/testData/diagnostics/tests/regressions/kt353.kt
index fa8ddba128d..adb137b882d 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt353.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt353.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-353 Generic type argument inference sometimes doesn't work
 
 interface A {
diff --git a/compiler/testData/diagnostics/tests/regressions/kt5362.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt5362.fir.kt
index c1fc5dadfbc..25a5b46b0e0 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt5362.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt5362.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-5362 Compiler crashes on access to extension method from nested class
 class Outer {
     class Nested{
diff --git a/compiler/testData/diagnostics/tests/regressions/kt5362.kt b/compiler/testData/diagnostics/tests/regressions/kt5362.kt
index 34fbca34c61..01590fb2bfe 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt5362.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt5362.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-5362 Compiler crashes on access to extension method from nested class
 class Outer {
     class Nested{
diff --git a/compiler/testData/diagnostics/tests/regressions/kt557.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt557.fir.kt
index c24e96f737d..e1f6c4fb228 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt557.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt557.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-557 Wrong type inference near sure extension function
 
 fun <T : Any> T?.sure() : T = this!!
diff --git a/compiler/testData/diagnostics/tests/regressions/kt557.kt b/compiler/testData/diagnostics/tests/regressions/kt557.kt
index 69c28808b02..3f8fec24bb6 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt557.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt557.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-557 Wrong type inference near sure extension function
 
 fun <T : Any> T?.sure() : T = this!!
diff --git a/compiler/testData/diagnostics/tests/regressions/kt7804.fir.kt b/compiler/testData/diagnostics/tests/regressions/kt7804.fir.kt
index 653d5ad4902..b8d0740f8ea 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt7804.fir.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt7804.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See also KT-7804 (Wrong type inference of kotlin.Any? was for 'a' without explicit type)
 fun <T> foo(a: T) = a
 
diff --git a/compiler/testData/diagnostics/tests/regressions/kt7804.kt b/compiler/testData/diagnostics/tests/regressions/kt7804.kt
index 272a5ff8555..4f2a17dfefb 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt7804.kt
+++ b/compiler/testData/diagnostics/tests/regressions/kt7804.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See also KT-7804 (Wrong type inference of kotlin.Any? was for 'a' without explicit type)
 fun <T> foo(a: T) = a
 
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.fir.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.fir.kt
index b4a948e98ac..7e9749c5768 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: -DslMarkerOnFunctionTypeReceiver
 
 @Target(AnnotationTarget.TYPE)
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.kt
index a797d631928..a606a5b45a6 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: -DslMarkerOnFunctionTypeReceiver
 
 @Target(AnnotationTarget.TYPE)
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.fir.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.fir.kt
index 8ee13aff80d..ee9222f6e0e 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.fir.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !LANGUAGE: +DslMarkerOnFunctionTypeReceiver
-// !WITH_NEW_INFERENCE
 
 @Target(AnnotationTarget.TYPE)
 @DslMarker
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.kt
index 30b8565f613..da1020399d7 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/annotatedFunctionType_1_4.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !LANGUAGE: +DslMarkerOnFunctionTypeReceiver
-// !WITH_NEW_INFERENCE
 
 @Target(AnnotationTarget.TYPE)
 @DslMarker
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.fir.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.fir.kt
index ac479bd5be8..1a9fac5a9ca 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 @DslMarker
 @Target(AnnotationTarget.CLASS, AnnotationTarget.TYPEALIAS)
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.kt
index 82127f4206c..0448706e1a1 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/dslMarkerWithTypealiasRecursion.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 @DslMarker
 @Target(AnnotationTarget.CLASS, AnnotationTarget.TYPEALIAS)
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/markersIntersection.fir.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/markersIntersection.fir.kt
index 8eb2a6ceed0..8d2c9493f41 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/markersIntersection.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/markersIntersection.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 @DslMarker
 @Target(AnnotationTarget.TYPE)
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/markersIntersection.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/markersIntersection.kt
index 775a0300d13..4e5850e0a7c 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/markersIntersection.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/markersIntersection.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 @DslMarker
 @Target(AnnotationTarget.TYPE)
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/substitutedReceiverAnnotatedType.fir.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/substitutedReceiverAnnotatedType.fir.kt
index ab79d02f572..71215b5040b 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/substitutedReceiverAnnotatedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/substitutedReceiverAnnotatedType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 @DslMarker
 @Target(AnnotationTarget.TYPE)
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/substitutedReceiverAnnotatedType.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/substitutedReceiverAnnotatedType.kt
index d65adb64d78..bdd29eee30e 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/substitutedReceiverAnnotatedType.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/substitutedReceiverAnnotatedType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 @DslMarker
 @Target(AnnotationTarget.TYPE)
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers.fir.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers.fir.kt
index 62179bd9710..06932e37d76 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 @DslMarker
 @Target(AnnotationTarget.TYPE)
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers.kt
index 266905762c6..a6a5b859604 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 @DslMarker
 @Target(AnnotationTarget.TYPE)
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers2.fir.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers2.fir.kt
index cb6b70fbac7..5b4eac008c3 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers2.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers2.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 @DslMarker
 @Target(AnnotationTarget.TYPE)
diff --git a/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers2.kt b/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers2.kt
index 70127848792..f53d6b57913 100644
--- a/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers2.kt
+++ b/compiler/testData/diagnostics/tests/resolve/dslMarker/threeImplicitReceivers2.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 @DslMarker
 @Target(AnnotationTarget.TYPE)
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.fir.kt
index dd8b318e300..f7f25bfef65 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
         
 fun Int.invoke(i: Int, a: Any) {}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.kt
index 3b22fe99ffa..7f4d131807e 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
         
 fun Int.invoke(i: Int, a: Any) {}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.fir.kt
index 1d4a539deb1..89ad9545277 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A<T>
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.kt
index 4896965ae74..d82833dbd5a 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 class A<T>
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.fir.kt
index 5ee43224bcf..ec1e39472a0 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 operator fun String.invoke(i: Int) {}
 
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.kt
index 6ebc3151730..7cf9720bfb3 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 operator fun String.invoke(i: Int) {}
 
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt
index 7e64054a47e..c443b26b513 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun test1() {
     1. (<!UNRESOLVED_REFERENCE!>fun String.(i: Int) = i<!> )(1)
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.kt
index 46c92d47f0c..d5780d57811 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun test1() {
     <!TYPE_MISMATCH{OI}!>1<!>. <!FUNCTION_EXPECTED{NI}!>(fun String.(i: Int) = i )<!>(1)
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.fir.kt
index e8d87240b9e..b529ad4ce2f 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun String.invoke(i: Int) {}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.kt b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.kt
index 895b56c673b..3ddec244424 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun String.invoke(i: Int) {}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.fir.kt
index 8e0ac8d2ca4..acc7042275d 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
 class A
 
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.kt b/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.kt
index 14ba82c59c0..8fd35158d2a 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/extensionValueAsNonExtension.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
 class A
 
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.fir.kt
index ac3698b8b5b..dc70817fa31 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun Int.invoke(a: Int) {}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.kt b/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.kt
index aa925573843..1f3154bc543 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/functionExpectedWhenSeveralInvokesExist.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun Int.invoke(a: Int) {}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/implicitInvokeAfterSafeCall.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/implicitInvokeAfterSafeCall.fir.kt
index 2902fef2d90..1b9ebbf5fdf 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/implicitInvokeAfterSafeCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/implicitInvokeAfterSafeCall.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 // Test case 1: additional receiver, generic invoke
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/implicitInvokeAfterSafeCall.kt b/compiler/testData/diagnostics/tests/resolve/invoke/implicitInvokeAfterSafeCall.kt
index f84dc1d32da..31f66e74615 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/implicitInvokeAfterSafeCall.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/implicitInvokeAfterSafeCall.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 // Test case 1: additional receiver, generic invoke
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt
index 71ca8ad03e3..120f937c13c 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: 1.kt
 package fooIsExtension
 
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.kt b/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.kt
index 68269dfac25..bed94c1770a 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeOnVariableWithExtensionFunctionType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: 1.kt
 package fooIsExtension
 
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.fir.kt
index e6edf1f1c3e..b1638a6ce7d 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun Int.invoke() {}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.kt b/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.kt
index ddf18776e96..df775fab1f3 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/reportFunctionExpectedWhenOneInvokeExist.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun Int.invoke() {}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/wrongInvokeExtension.fir.kt b/compiler/testData/diagnostics/tests/resolve/invoke/wrongInvokeExtension.fir.kt
index 840f30c16fe..ece2c87afc2 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/wrongInvokeExtension.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/wrongInvokeExtension.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 class B
 
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/wrongInvokeExtension.kt b/compiler/testData/diagnostics/tests/resolve/invoke/wrongInvokeExtension.kt
index 49ccf408f0f..f8fa864b150 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/wrongInvokeExtension.kt
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/wrongInvokeExtension.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 class B
 
diff --git a/compiler/testData/diagnostics/tests/resolve/kt36264.fir.kt b/compiler/testData/diagnostics/tests/resolve/kt36264.fir.kt
index 351bb9506df..ab4ec9489f7 100644
--- a/compiler/testData/diagnostics/tests/resolve/kt36264.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/kt36264.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/resolve/kt36264.kt b/compiler/testData/diagnostics/tests/resolve/kt36264.kt
index 065737f95a8..1772355390e 100644
--- a/compiler/testData/diagnostics/tests/resolve/kt36264.kt
+++ b/compiler/testData/diagnostics/tests/resolve/kt36264.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.fir.kt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.fir.kt
index f416eb22b4d..0a6893c8b7d 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package h
 
 fun foo(i: Int) = i
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.kt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.kt
index b9c4e349144..dc52e245f20 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.kt
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package h
 
 fun foo(i: Int) = i
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.fir.kt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.fir.kt
index 3e04edb2149..74b8670b80a 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class ResolutionCandidate<A>
 
 class ResolutionTask<B, C : B>(val candidate: ResolutionCandidate<B>)
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.kt b/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.kt
index a97dcea49d9..dd4f7d0b20c 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.kt
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/twoTypeParameters.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class ResolutionCandidate<A>
 
 class ResolutionTask<B, C : B>(val candidate: ResolutionCandidate<B>)
diff --git a/compiler/testData/diagnostics/tests/resolve/newLineLambda.fir.kt b/compiler/testData/diagnostics/tests/resolve/newLineLambda.fir.kt
index c29c5f54f67..2a7655bfd2e 100644
--- a/compiler/testData/diagnostics/tests/resolve/newLineLambda.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/newLineLambda.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun noArgs() {}
diff --git a/compiler/testData/diagnostics/tests/resolve/newLineLambda.kt b/compiler/testData/diagnostics/tests/resolve/newLineLambda.kt
index 0dc3e618af1..4d1e59efc31 100644
--- a/compiler/testData/diagnostics/tests/resolve/newLineLambda.kt
+++ b/compiler/testData/diagnostics/tests/resolve/newLineLambda.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun noArgs() {}
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.fir.kt
index 0806faef8dc..cdb0bf42b2b 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 object X1
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.kt
index 730b30478cd..720d82682d6 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/allLambdas.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 object X1
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/genericClash.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/genericClash.fir.kt
index 10d4e2c32e4..bfcf957196d 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/genericClash.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/genericClash.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 interface A<T> {
     fun foo(x: T)
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/genericClash.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/genericClash.kt
index d79b377d9d7..b0ccc400d48 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/genericClash.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/genericClash.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 interface A<T> {
     fun foo(x: T)
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.fir.kt
index 16482cbb981..520acd5367f 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface AutoCloseable
 interface Closeable : AutoCloseable
 
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.kt
index d11483dff2a..660db038f41 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt10640.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface AutoCloseable
 interface Closeable : AutoCloseable
 
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.fir.kt
index a0bfa633ac6..bf767d349d9 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CONSTRAINT_SYSTEM_FOR_OVERLOAD_RESOLUTION: CONSTRAINT_SYSTEM_FOR_NEW_INFERENCE
 
 open class A<T>(val value: T)
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.kt
index 2737c6b7d8a..1fbb7b61944 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CONSTRAINT_SYSTEM_FOR_OVERLOAD_RESOLUTION: CONSTRAINT_SYSTEM_FOR_NEW_INFERENCE
 
 open class A<T>(val value: T)
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670_compat.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670_compat.fir.kt
index 17b204a21cf..085f867a73d 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670_compat.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670_compat.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CONSTRAINT_SYSTEM_FOR_OVERLOAD_RESOLUTION: CONSTRAINT_SYSTEM_FOR_OLD_INFERENCE
 
 open class A<T>(val value: T)
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670_compat.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670_compat.kt
index 187c04c7a18..7479fd3db5b 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670_compat.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31670_compat.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CONSTRAINT_SYSTEM_FOR_OVERLOAD_RESOLUTION: CONSTRAINT_SYSTEM_FOR_OLD_INFERENCE
 
 open class A<T>(val value: T)
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.fir.kt
index f54ca2ce975..7f99d37bbde 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CONSTRAINT_SYSTEM_FOR_OVERLOAD_RESOLUTION: CONSTRAINT_SYSTEM_FOR_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.kt
index 38cf41b468d..c25bea63184 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CONSTRAINT_SYSTEM_FOR_OVERLOAD_RESOLUTION: CONSTRAINT_SYSTEM_FOR_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758_compat.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758_compat.fir.kt
index b488722cef2..11bff181787 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758_compat.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758_compat.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CONSTRAINT_SYSTEM_FOR_OVERLOAD_RESOLUTION: CONSTRAINT_SYSTEM_FOR_OLD_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758_compat.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758_compat.kt
index d3726df733a..522128fc864 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758_compat.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/kt31758_compat.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CONSTRAINT_SYSTEM_FOR_OVERLOAD_RESOLUTION: CONSTRAINT_SYSTEM_FOR_OLD_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/originalExamples.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/originalExamples.fir.kt
index 9d84149bd57..aee74593c05 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/originalExamples.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/originalExamples.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 object Right
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/originalExamples.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/originalExamples.kt
index 1123643b69f..3f4980a13c6 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/originalExamples.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/originalExamples.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 object Right
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.fir.kt
index a757322ceaf..a9b8e646898 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CONSTRAINT_SYSTEM_FOR_OVERLOAD_RESOLUTION: CONSTRAINT_SYSTEM_FOR_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.kt
index 32ff8d7df0b..c61a06997d6 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CONSTRAINT_SYSTEM_FOR_OVERLOAD_RESOLUTION: CONSTRAINT_SYSTEM_FOR_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter_compat.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter_compat.fir.kt
index ef9e1f8de6e..5fceb00561e 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter_compat.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter_compat.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CONSTRAINT_SYSTEM_FOR_OVERLOAD_RESOLUTION: CONSTRAINT_SYSTEM_FOR_OLD_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter_compat.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter_compat.kt
index fbf05b27471..2ae1cbf0c8a 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter_compat.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/overloadResolutionOnNullableContravariantParameter_compat.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CONSTRAINT_SYSTEM_FOR_OVERLOAD_RESOLUTION: CONSTRAINT_SYSTEM_FOR_OLD_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.fir.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.fir.kt
index f59daaf9445..885323d75e4 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 object X1
 object X2
 
diff --git a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.kt b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.kt
index f73fc338e57..c91b1261e50 100644
--- a/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.kt
+++ b/compiler/testData/diagnostics/tests/resolve/overloadConflicts/withVariance.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 object X1
 object X2
 
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.kt b/compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.kt
index 7244f734de2..77a09c57370 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.kt
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 //If this test hangs, it means something is broken.
 package a
 
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.fir.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.fir.kt
index 4929b83062d..14892d14db1 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -USELESS_ELVIS
 
 fun test() {
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.kt
index ce19ae7b491..d38b8386b33 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/constantsInIf.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -USELESS_ELVIS
 
 fun test() {
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.fir.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.fir.kt
index 575c13f78ca..ecc4fe08214 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.kt
index 6860fc3c516..862a731981c 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.fir.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.fir.kt
index 29cee2c9fb8..9ab0c68ba6d 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.kt
index 39388b96d04..1db39ad5555 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package a
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.fir.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.fir.kt
index c3fb5a6fcac..d552ecf374c 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.kt
index 6462bff9bcd..11c23dfe05d 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/multipleSuperClasses.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 interface A
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.fir.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.fir.kt
index 5af75bc0fb8..d4fb89d436f 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package b
 
 fun bar(i: Int) = i
diff --git a/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.kt b/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.kt
index 9fecfc44b98..2c4d876bcec 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.kt
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package b
 
 fun bar(i: Int) = i
diff --git a/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.fir.kt b/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.fir.kt
index 1e3a572e7c2..070fda67ea9 100644
--- a/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun <T> foo(t: T) = t
diff --git a/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.kt b/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.kt
index 9e73278a30e..613a6e6d025 100644
--- a/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.kt
+++ b/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun <T> foo(t: T) = t
diff --git a/compiler/testData/diagnostics/tests/resolve/wrongReceiver.fir.kt b/compiler/testData/diagnostics/tests/resolve/wrongReceiver.fir.kt
index ad2ea727ea5..d774c27cb25 100644
--- a/compiler/testData/diagnostics/tests/resolve/wrongReceiver.fir.kt
+++ b/compiler/testData/diagnostics/tests/resolve/wrongReceiver.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package some
 
 class A()
diff --git a/compiler/testData/diagnostics/tests/resolve/wrongReceiver.kt b/compiler/testData/diagnostics/tests/resolve/wrongReceiver.kt
index 29afef1bca2..3207307bb62 100644
--- a/compiler/testData/diagnostics/tests/resolve/wrongReceiver.kt
+++ b/compiler/testData/diagnostics/tests/resolve/wrongReceiver.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package some
 
 class A()
diff --git a/compiler/testData/diagnostics/tests/safeCall.kt b/compiler/testData/diagnostics/tests/safeCall.kt
index 3c822ca8f69..0a95578f330 100644
--- a/compiler/testData/diagnostics/tests/safeCall.kt
+++ b/compiler/testData/diagnostics/tests/safeCall.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 
 fun f(s: String, action: (String.() -> Unit)?) {
     s.foo().bar().<!UNSAFE_IMPLICIT_INVOKE_CALL!>action<!>()
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.fir.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.fir.kt
index 90e14f46766..a947edfa09e 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // FILE: A.java
 public class A {
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.kt
index e969432d437..e5638ff3996 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/methodsPriority.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // FILE: A.java
 public class A {
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_after.fir.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_after.fir.kt
index ac919c10d97..3d9630ec372 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_after.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_after.fir.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 // FILE: J.java
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_after.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_after.kt
index 44224abe785..e35db78959c 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_after.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_after.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 // FILE: J.java
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.fir.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.fir.kt
index a4f8219498e..3e7feacf559 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.fir.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 // FILE: J.java
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.kt
index fa1f16a60f9..16443216653 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/companionObject/inheritFromContainingClass_before.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: -ProhibitVisibilityOfNestedClassifiersFromSupertypesOfCompanion
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 
 // FILE: J.java
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/localVsStatic.fir.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/localVsStatic.fir.kt
index 38debd27bef..eca87ded82f 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/localVsStatic.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/localVsStatic.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // FILE: A.java
 public class A {
diff --git a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/localVsStatic.kt b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/localVsStatic.kt
index 912bd91a5c3..b4be8f60f25 100644
--- a/compiler/testData/diagnostics/tests/scopes/inheritance/statics/localVsStatic.kt
+++ b/compiler/testData/diagnostics/tests/scopes/inheritance/statics/localVsStatic.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE
 // FILE: A.java
 public class A {
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructor.fir.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructor.fir.kt
index 2ab8196cd5d..1a1fc5669b5 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructor.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 open class A protected constructor(x: Int) {
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructor.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructor.kt
index f467938fb1b..65fb3936ae6 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructor.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/nonSuperCallConstructor.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 open class A protected constructor(x: Int) {
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.fir.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.fir.kt
index 3eb7d22c743..442e01b09da 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: abc/A.java
 package abc;
 public class A {
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.kt
index 11b9330481e..4775674e343 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/syntheticSAMExtensions.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: abc/A.java
 package abc;
 public class A {
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/unstableSmartCast.fir.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/unstableSmartCast.fir.kt
index afa407fe22f..de47b4d7ce6 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/unstableSmartCast.fir.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/unstableSmartCast.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 open class BaseOuter {
     protected fun foo() = 1
diff --git a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/unstableSmartCast.kt b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/unstableSmartCast.kt
index b16e095a26a..980f769fc71 100644
--- a/compiler/testData/diagnostics/tests/scopes/protectedVisibility/unstableSmartCast.kt
+++ b/compiler/testData/diagnostics/tests/scopes/protectedVisibility/unstableSmartCast.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 open class BaseOuter {
     protected fun foo() = 1
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.fir.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.fir.kt
index 07592296bd7..710474c204b 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.fir.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // NI_EXPECTED_FILE
 class A(x: Int) {
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.kt
index b364924b1de..9b43b8ab38b 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/constructorCallType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // NI_EXPECTED_FILE
 class A(x: Int) {
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/generics2.fir.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/generics2.fir.kt
index 47870e18ba1..45c826f81ce 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/generics2.fir.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/generics2.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 open class B<R1, R2>(x: R1, y: R2)
 
 class A0<T1, T2> {
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/generics2.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/generics2.kt
index aaa496a9499..2d8c42d330b 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/generics2.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/generics2.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 open class B<R1, R2>(x: R1, y: R2)
 
 class A0<T1, T2> {
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/kt6993.fir.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/kt6993.fir.kt
index 4dfe5fc198e..b2a42af09d4 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/kt6993.fir.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/kt6993.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 class X<T>(val t: T) {
     constructor(t: T, i: Int) : this(<!ARGUMENT_TYPE_MISMATCH!>i<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/kt6993.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/kt6993.kt
index 868a5611a31..7c2f119757a 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/kt6993.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/kt6993.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 class X<T>(val t: T) {
     constructor(t: T, i: Int) : this(<!TYPE_MISMATCH!>i<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/return.fir.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/return.fir.kt
index 0e9f792a643..9fb85b4e5ee 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/return.fir.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/return.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class A {
     init {
         <!RETURN_NOT_ALLOWED!>return<!>
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/return.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/return.kt
index 28315408a5a..e176b17792d 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/return.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/return.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class A {
     init {
         <!RETURN_NOT_ALLOWED!>return<!>
diff --git a/compiler/testData/diagnostics/tests/secondaryConstructors/thisNonExisting.kt b/compiler/testData/diagnostics/tests/secondaryConstructors/thisNonExisting.kt
index 23dee119533..f6e55f4d73f 100644
--- a/compiler/testData/diagnostics/tests/secondaryConstructors/thisNonExisting.kt
+++ b/compiler/testData/diagnostics/tests/secondaryConstructors/thisNonExisting.kt
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 class A {
     constructor(x: Int) {}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.fir.kt
index b99e0b8be40..2db01d2ff39 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): String {
     var s: String?
     s = null
diff --git a/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.kt b/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.kt
index 9e1d6a96f66..d382f90bc92 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/alwaysNull.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): String {
     var s: String?
     s = null
diff --git a/compiler/testData/diagnostics/tests/smartCasts/alwaysNullWithJava.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/alwaysNullWithJava.fir.kt
index 8e2f08fde2b..f731335719b 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/alwaysNullWithJava.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/alwaysNullWithJava.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: My.java
 
 public class My {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/alwaysNullWithJava.kt b/compiler/testData/diagnostics/tests/smartCasts/alwaysNullWithJava.kt
index 6c6fd41b8cf..27f1855b0ed 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/alwaysNullWithJava.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/alwaysNullWithJava.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: My.java
 
 public class My {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.fir.kt
index 2553f583b3e..cb1d9c85e32 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +SafeCastCheckBoundSmartCasts
 interface SomeClass {
     val data: Any?
diff --git a/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.kt b/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.kt
index b9e005b3ca9..02a71f401b9 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/castchecks/variables.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +SafeCastCheckBoundSmartCasts
 interface SomeClass {
     val data: Any?
diff --git a/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.fir.kt
index 7cb7444019d..ed3be9ec261 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(x : String?, y : String?) {
     if (y != null && x == y) {
         // Both not null
diff --git a/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.kt b/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.kt
index 3f386d860d5..3c76fa5cefd 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/comparisonUnderAnd.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(x : String?, y : String?) {
     if (y != null && x == y) {
         // Both not null
diff --git a/compiler/testData/diagnostics/tests/smartCasts/complexComparison.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/complexComparison.fir.kt
index aa9eca4af42..60a8f9e3aea 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/complexComparison.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/complexComparison.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(x: String?, y: String?, z: String?, w: String?) {
     if (x != null && y != null && (x == z || y == z))
         z.length
diff --git a/compiler/testData/diagnostics/tests/smartCasts/complexComparison.kt b/compiler/testData/diagnostics/tests/smartCasts/complexComparison.kt
index bed56cb0280..88ca7ecf7e3 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/complexComparison.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/complexComparison.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(x: String?, y: String?, z: String?, w: String?) {
     if (x != null && y != null && (x == z || y == z))
         <!DEBUG_INFO_SMARTCAST!>z<!>.length
diff --git a/compiler/testData/diagnostics/tests/smartCasts/elvis/impossible.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/elvis/impossible.fir.kt
index cbce948f70f..dd4184904de 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/elvis/impossible.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/elvis/impossible.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +BooleanElvisBoundSmartCasts
 // See KT-20752
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/elvis/impossible.kt b/compiler/testData/diagnostics/tests/smartCasts/elvis/impossible.kt
index 788f7950c63..dec370ba256 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/elvis/impossible.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/elvis/impossible.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +BooleanElvisBoundSmartCasts
 // See KT-20752
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/elvisExprNotNull.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/elvisExprNotNull.fir.kt
index 5f6122d1c34..e3125bc9c89 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/elvisExprNotNull.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/elvisExprNotNull.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(s: Any?): String {
     val t = when {
         // To resolve: String U Nothing? = String?
diff --git a/compiler/testData/diagnostics/tests/smartCasts/elvisExprNotNull.kt b/compiler/testData/diagnostics/tests/smartCasts/elvisExprNotNull.kt
index 64769d9391d..3c6ccd65658 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/elvisExprNotNull.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/elvisExprNotNull.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(s: Any?): String {
     val t = when {
         // To resolve: String U Nothing? = String?
diff --git a/compiler/testData/diagnostics/tests/smartCasts/explicitDefaultGetter.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/explicitDefaultGetter.fir.kt
index 9b688c538ed..8260ab810b9 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/explicitDefaultGetter.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/explicitDefaultGetter.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class ExplicitAccessorForAnnotation {
     val tt: String? = "good"
         get
diff --git a/compiler/testData/diagnostics/tests/smartCasts/explicitDefaultGetter.kt b/compiler/testData/diagnostics/tests/smartCasts/explicitDefaultGetter.kt
index 30710c6791b..82fc66eb9e4 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/explicitDefaultGetter.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/explicitDefaultGetter.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class ExplicitAccessorForAnnotation {
     val tt: String? = "good"
         get
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.fir.kt
index 4a40d9e72ff..e178b19097c 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 package a
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt
index 02f9cd386a5..ebe4201b4c2 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 package a
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.fir.kt
index 0349104af9f..fad47bd5e27 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // ISSUE: KT-25432
 
 class Data<T>(val s: T)
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.kt
index 1899bc29b10..b2d3ee0c6b8 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // ISSUE: KT-25432
 
 class Data<T>(val s: T)
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.fir.kt
index ea2aa47e601..f9e4a0bac51 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // ISSUE: KT-29767
 
 fun test(a: MutableList<out Int?>?) {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.kt
index ccf8d6892a2..a74e92e5c06 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt29767.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // ISSUE: KT-29767
 
 fun test(a: MutableList<out Int?>?) {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/flexibleTypes.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/flexibleTypes.fir.kt
index d39c76a1bd0..7a7b58fac91 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/flexibleTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/flexibleTypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // FILE: A.java
 public interface A {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/flexibleTypes.kt b/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/flexibleTypes.kt
index cc13a0c6bc4..c01162d7617 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/flexibleTypes.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/flexibleTypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // FILE: A.java
 public interface A {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/unstableSmartCast.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/unstableSmartCast.fir.kt
index 5f772e95754..e6af93cd7ea 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/unstableSmartCast.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/unstableSmartCast.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 interface A {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/unstableSmartCast.kt b/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/unstableSmartCast.kt
index ac1fb2d44fb..e8db585a64d 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/unstableSmartCast.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/intersectionScope/unstableSmartCast.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 interface A {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt10444.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/kt10444.fir.kt
index 97af8b97801..4845fcb6bf3 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt10444.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt10444.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // KT-10444 Do not ignore smart (unchecked) casts to the same classifier
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt10444.kt b/compiler/testData/diagnostics/tests/smartCasts/kt10444.kt
index bf336d36415..3ab7acc1663 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt10444.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt10444.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // KT-10444 Do not ignore smart (unchecked) casts to the same classifier
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt2865.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/kt2865.fir.kt
index 901cbc1fb40..d2054b445df 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt2865.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt2865.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 operator fun <K, V> MutableMap<K, V>.set(k: K, v: V) {}
 
 fun foo(a: MutableMap<String, String>, x: String?) {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt2865.kt b/compiler/testData/diagnostics/tests/smartCasts/kt2865.kt
index ec7305cbef6..e5ce6450bff 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt2865.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt2865.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 operator fun <K, V> MutableMap<K, V>.set(k: K, v: V) {}
 
 fun foo(a: MutableMap<String, String>, x: String?) {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt30826.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/kt30826.fir.kt
index e61914a5daf..4973743f7e7 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt30826.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt30826.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // Issue: KT-30826
 
 interface I1
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt30826.kt b/compiler/testData/diagnostics/tests/smartCasts/kt30826.kt
index e501dc31090..6435ab642ee 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt30826.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt30826.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // Issue: KT-30826
 
 interface I1
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt30927.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/kt30927.fir.kt
index c6d8c192664..041e7943e43 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt30927.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt30927.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 fun case_0() {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt30927.kt b/compiler/testData/diagnostics/tests/smartCasts/kt30927.kt
index 6d6c6e044c2..4caf76f6d28 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt30927.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt30927.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 fun case_0() {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/lambdaArgumentWithBoundWithoutType.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/lambdaArgumentWithBoundWithoutType.fir.kt
index ab39cb96649..999430d18c2 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/lambdaArgumentWithBoundWithoutType.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/lambdaArgumentWithBoundWithoutType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface Foo
 interface Bar : Foo
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/lambdaArgumentWithBoundWithoutType.kt b/compiler/testData/diagnostics/tests/smartCasts/lambdaArgumentWithBoundWithoutType.kt
index f4d231d2d0f..0e6ac8e12f0 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/lambdaArgumentWithBoundWithoutType.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/lambdaArgumentWithBoundWithoutType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 interface Foo
 interface Bar : Foo
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/localFunChanges.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/localFunChanges.fir.kt
index 65a464945d2..a844c9e3207 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/localFunChanges.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/localFunChanges.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun trans(n: Int, f: () -> Boolean) = if (f()) n else null
 
 fun foo() {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/localFunChanges.kt b/compiler/testData/diagnostics/tests/smartCasts/localFunChanges.kt
index c999b0d0786..c3d6717fdb1 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/localFunChanges.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/localFunChanges.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun trans(n: Int, f: () -> Boolean) = if (f()) n else null
 
 fun foo() {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/captured.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/captured.fir.kt
index e720d23fd1e..6b8fea6295e 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/captured.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/captured.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 abstract class Runnable {
     abstract fun run()
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/captured.kt b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/captured.kt
index 3a212020d76..c3db758b8cd 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/captured.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/captured.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 abstract class Runnable {
     abstract fun run()
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexcl.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexcl.fir.kt
index 3fd3429e133..2a0533ed8bb 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexcl.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexcl.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 abstract class Runnable {
     abstract fun run()
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexcl.kt b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexcl.kt
index 0ab702ecc3d..7cd2a3f5ae9 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexcl.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/objectLiterals/exclexcl.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 abstract class Runnable {
     abstract fun run()
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/propertyToNotNull.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/propertyToNotNull.fir.kt
index a7f7a154349..f14a192a0df 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/propertyToNotNull.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/propertyToNotNull.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class Immutable(val x: String?) {
     fun foo(): String {
         if (x != null) return x
diff --git a/compiler/testData/diagnostics/tests/smartCasts/propertyToNotNull.kt b/compiler/testData/diagnostics/tests/smartCasts/propertyToNotNull.kt
index 412d720a42b..ea7b2718112 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/propertyToNotNull.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/propertyToNotNull.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class Immutable(val x: String?) {
     fun foo(): String {
         if (x != null) return <!DEBUG_INFO_SMARTCAST!>x<!>
diff --git a/compiler/testData/diagnostics/tests/smartCasts/publicVals/delegate.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/publicVals/delegate.fir.kt
index e589ef8a50a..ee146be949d 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/publicVals/delegate.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/publicVals/delegate.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 import kotlin.reflect.KProperty
 
 class Delegate {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/publicVals/delegate.kt b/compiler/testData/diagnostics/tests/smartCasts/publicVals/delegate.kt
index db465a5178c..c7a0cc99951 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/publicVals/delegate.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/publicVals/delegate.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 import kotlin.reflect.KProperty
 
 class Delegate {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/anotherVal.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/anotherVal.fir.kt
index d66fc29153c..64abd35132c 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/anotherVal.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/anotherVal.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun calc(x: List<String>?, y: Int?): Int {
     x?.get(y!! - 1) 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/anotherVal.kt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/anotherVal.kt
index a8da3729430..cf6b51ea559 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/anotherVal.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/anotherVal.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun calc(x: List<String>?, y: Int?): Int {
     x?.get(y!! - 1) 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseSecondArgument.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseSecondArgument.fir.kt
index f86d085ad71..06912594cf7 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseSecondArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseSecondArgument.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun calc(x: List<String>?, y: Int?): Int {
     x?.subList(y!! - 1, y)
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseSecondArgument.kt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseSecondArgument.kt
index 3a975a23af6..c122355fb57 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseSecondArgument.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/falseSecondArgument.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun calc(x: List<String>?, y: Int?): Int {
     x?.subList(y!! - 1, <!DEBUG_INFO_SMARTCAST!>y<!>)
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/receiverAndChainFalse.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/receiverAndChainFalse.fir.kt
index 149459a15ca..c76caf13a39 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/receiverAndChainFalse.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/receiverAndChainFalse.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun foo(x: String): String? = x
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/safecalls/receiverAndChainFalse.kt b/compiler/testData/diagnostics/tests/smartCasts/safecalls/receiverAndChainFalse.kt
index 7adff29007f..62085019793 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/safecalls/receiverAndChainFalse.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/safecalls/receiverAndChainFalse.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun foo(x: String): String? = x
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/typeInComparison.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/typeInComparison.fir.kt
index d2481f8146e..06d697dbb9d 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/typeInComparison.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/typeInComparison.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): Int {
     val x: Any? = null
     val y = 2
diff --git a/compiler/testData/diagnostics/tests/smartCasts/typeInComparison.kt b/compiler/testData/diagnostics/tests/smartCasts/typeInComparison.kt
index eefbcaff5b2..0d6d059b265 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/typeInComparison.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/typeInComparison.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): Int {
     val x: Any? = null
     val y = 2
diff --git a/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.fir.kt
index 6cf1fc73b07..ee7a1e9b940 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See KT-13468, KT-13765
 
 fun basic(): String {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.kt b/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.kt
index 0f0bd5b8dbf..7ca923d2eb0 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/variables/ifNullAssignment.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See KT-13468, KT-13765
 
 fun basic(): String {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.fir.kt
index 470ad17d171..da5b098c670 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun foo(x: Int, f: () -> Unit, y: Int) {}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.kt b/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.kt
index c966f96e050..c80306e473d 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/variables/lambdaBetweenArguments.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 
 fun foo(x: Int, f: () -> Unit, y: Int) {}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/variables/property.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/variables/property.fir.kt
index a98e9f3fe82..77f5ef0e154 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/variables/property.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/variables/property.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class MyClass(var p: String?)
 
 fun bar(s: String): Int {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/variables/property.kt b/compiler/testData/diagnostics/tests/smartCasts/variables/property.kt
index 1b734d49bd8..751bffeea33 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/variables/property.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/variables/property.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class MyClass(var p: String?)
 
 fun bar(s: String): Int {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.fir.kt
index bf4e3e6e11e..d9d81830f51 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo() {
     var v: String? = null
     v<!UNSAFE_CALL!>.<!>length
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.kt
index c3ee5db2cc0..fc8eaf4e00d 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/assignment.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo() {
     var v: String? = null
     v<!UNSAFE_CALL!>.<!>length
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/boundInitializerWrong.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/boundInitializerWrong.fir.kt
index 07ee21341b6..73fd3227a42 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/boundInitializerWrong.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/boundInitializerWrong.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-15792 and related
 
 fun foo() {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/boundInitializerWrong.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/boundInitializerWrong.kt
index 49b7e95df7f..c6478189d1b 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/boundInitializerWrong.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/boundInitializerWrong.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-15792 and related
 
 fun foo() {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.fir.kt
index e3f6e3cce53..e6496ca82c4 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 data class SomeObject(val n: SomeObject?) {
     fun doSomething() {}
     fun next(): SomeObject? = n    
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.kt
index 3506cfcb632..99460ce9520 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEach.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 data class SomeObject(val n: SomeObject?) {
     fun doSomething() {}
     fun next(): SomeObject? = n    
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.fir.kt
index 21b0471ef68..c6b7644e93b 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 data class SomeObject(val n: SomeObject?) {
     fun doSomething() {}
     fun next(): SomeObject? = n    
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.kt
index 7516bcd91d0..89510103255 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithBreak.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 data class SomeObject(val n: SomeObject?) {
     fun doSomething() {}
     fun next(): SomeObject? = n    
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.fir.kt
index 81441d3d79c..edba4fb2a97 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 data class SomeObject(val n: SomeObject?) {
     fun doSomething() {}
     fun next(): SomeObject? = n    
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.kt
index 2a779baae76..540dc379650 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/forEachWithContinue.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 data class SomeObject(val n: SomeObject?) {
     fun doSomething() {}
     fun next(): SomeObject? = n    
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.fir.kt
index 6885f08f2de..6aec92ff47a 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // JAVAC_EXPECTED_FILE
 // See also KT-10735
 fun test() {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.kt
index a591436706c..00d2269a78e 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initInTryReturnInCatch.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // JAVAC_EXPECTED_FILE
 // See also KT-10735
 fun test() {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.fir.kt
index 0b14f9a664a..b1bbc823964 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo() {
     var v: String? = "xyz"
     // It is possible in principle to provide smart cast here
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.kt
index 3bf5394913e..567d8290789 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/initialization.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo() {
     var v: String? = "xyz"
     // It is possible in principle to provide smart cast here
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.fir.kt
index 169ccfa437c..a4e834e56b9 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(arg: Int?): Int {
     var i = arg
     if (i != null && i++ == 5) {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.kt
index cac789a2e71..1cc64980ac5 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/plusplusMinusminus.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(arg: Int?): Int {
     var i = arg
     if (i != null && <!DEBUG_INFO_SMARTCAST!>i<!>++ == 5) {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.fir.kt
index b7520e5f0b1..e30d81bdc68 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class MyClass
 
 operator fun MyClass.inc(): MyClass { return null!! }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.kt
index b23cf17ff87..9596d64a6d8 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/postfixNotnullClassIncrement.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class MyClass
 
 operator fun MyClass.inc(): MyClass { <!UNREACHABLE_CODE{OI}!>return<!> null!! }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.fir.kt
index 9193fee27ef..0f48fd3aade 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class MyClass
 
 operator fun MyClass.inc(): MyClass { return null!! }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.kt
index f31b9849399..85c2e48241a 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/prefixNotnullClassIncrement.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class MyClass
 
 operator fun MyClass.inc(): MyClass { <!UNREACHABLE_CODE{OI}!>return<!> null!! }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.fir.kt
index 2383d0367d1..5c1d3cd0bd3 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun create(): Map<String, String> = null!!
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt
index 696a1d23866..913020fcebd 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/unnecessaryWithMap.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun create(): Map<String, String> = null!!
 
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.fir.kt
index 009054c8de9..2eeb814a921 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See also KT-7186
 
 fun IntArray.forEachIndexed( op: (i: Int, value: Int) -> Unit) {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.kt
index 91cfdaff869..921a5beb588 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varCapturedInInlineClosure.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See also KT-7186
 
 fun IntArray.forEachIndexed( op: (i: Int, value: Int) -> Unit) {
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.fir.kt
index 078a6734872..521e424a20c 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): Int {
     var i: Int? = 42
     i = null
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.kt
index a23c1b027c9..cc8df087fd7 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varIntNull.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): Int {
     var i: Int? = <!VARIABLE_WITH_REDUNDANT_INITIALIZER!>42<!>
     i = null
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.fir.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.fir.kt
index 73fbbe41bbd..3f294a50215 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.fir.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): Int {
     var s: String? = "abc"
     s = null
diff --git a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.kt b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.kt
index 91ed7e8410d..2977569c52f 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/varnotnull/varNull.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 fun foo(): Int {
     var s: String? = <!VARIABLE_WITH_REDUNDANT_INITIALIZER!>"abc"<!>
     s = null
diff --git a/compiler/testData/diagnostics/tests/substitutions/starProjections.fir.kt b/compiler/testData/diagnostics/tests/substitutions/starProjections.fir.kt
index 70d7a52c781..5738953c8c6 100644
--- a/compiler/testData/diagnostics/tests/substitutions/starProjections.fir.kt
+++ b/compiler/testData/diagnostics/tests/substitutions/starProjections.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 interface A<R, T: A<R, T>> {
diff --git a/compiler/testData/diagnostics/tests/substitutions/starProjections.kt b/compiler/testData/diagnostics/tests/substitutions/starProjections.kt
index 185071aec6e..be80ee9407f 100644
--- a/compiler/testData/diagnostics/tests/substitutions/starProjections.kt
+++ b/compiler/testData/diagnostics/tests/substitutions/starProjections.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 interface A<R, T: A<R, T>> {
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.fir.kt b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.fir.kt
index bbe6bcc0bbf..b381cd916ee 100644
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.fir.kt
+++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: foo.kt
 package foo
 
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.kt b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.kt
index cae112dc688..1a775a5d913 100644
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.kt
+++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: foo.kt
 package foo
 
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.fir.kt b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.fir.kt
index 92fd0a5ef67..5bd52843497 100644
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -CONFLICTING_JVM_DECLARATIONS -UNUSED_PARAMETER
 fun <T> f1(l: <!UNRESOLVED_REFERENCE!>List1<T><!>): T {throw Exception()} // ERROR type here
 fun <T> f1(l: <!UNRESOLVED_REFERENCE!>List2<T><!>): T {throw Exception()} // ERROR type here
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.kt b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.kt
index b4462ae3337..6f3a22c6407 100644
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.kt
+++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -CONFLICTING_JVM_DECLARATIONS -UNUSED_PARAMETER
 fun <T> f1(l: <!UNRESOLVED_REFERENCE!>List1<!><T>): T {throw Exception()} // ERROR type here
 fun <T> f1(l: <!UNRESOLVED_REFERENCE!>List2<!><T>): T {throw Exception()} // ERROR type here
diff --git a/compiler/testData/diagnostics/tests/subtyping/localClasses.fir.kt b/compiler/testData/diagnostics/tests/subtyping/localClasses.fir.kt
index 9e1ef9ad01b..50d9f5e2078 100644
--- a/compiler/testData/diagnostics/tests/subtyping/localClasses.fir.kt
+++ b/compiler/testData/diagnostics/tests/subtyping/localClasses.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER
 
 package p
diff --git a/compiler/testData/diagnostics/tests/subtyping/localClasses.kt b/compiler/testData/diagnostics/tests/subtyping/localClasses.kt
index 8f116ad0686..c26c039cf5e 100644
--- a/compiler/testData/diagnostics/tests/subtyping/localClasses.kt
+++ b/compiler/testData/diagnostics/tests/subtyping/localClasses.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER
 
 package p
diff --git a/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.fir.kt b/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.fir.kt
index 272f03cc3ad..be1a3dbcd12 100644
--- a/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.fir.kt
+++ b/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER
 
 package p
diff --git a/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.kt b/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.kt
index 53d549c771c..8c120f25fa6 100644
--- a/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.kt
+++ b/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER
 
 package p
diff --git a/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.fir.kt b/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.fir.kt
index ace431c0c07..3ca77160403 100644
--- a/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.fir.kt
+++ b/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER
 
 package p
diff --git a/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.kt b/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.kt
index ec238c908a8..96f77f0a5c0 100644
--- a/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.kt
+++ b/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER
 
 package p
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.fir.kt
index 2b796b31498..bd0bbc059e5 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: KotlinFile.kt
 fun foo(javaClass: JavaClass<Int>): Int {
     val inner = javaClass.createInner<String>()
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.kt
index 9577f65917d..8060cdab343 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/InnerClassInGeneric.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: KotlinFile.kt
 fun foo(javaClass: JavaClass<Int>): Int {
     val inner = javaClass.createInner<String>()
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/NoNamedArgsAllowed.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/NoNamedArgsAllowed.kt
index f91a4e7d6ae..4104cae1d8b 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/NoNamedArgsAllowed.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/NoNamedArgsAllowed.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // FILE: KotlinFile.kt
 fun foo(javaClass: JavaClass) {
     javaClass.doSomething(<!NAMED_ARGUMENTS_NOT_ALLOWED!>p<!> = 1) {
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ParameterTypeAnnotation.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ParameterTypeAnnotation.kt
index a5080f928f4..32fd3132948 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ParameterTypeAnnotation.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/ParameterTypeAnnotation.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // FILE: KotlinFile.kt
 fun foo(javaInterface: JavaInterface) {
     javaInterface.doIt(<!NULL_FOR_NONNULL_TYPE!>null<!>) { }
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.fir.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.fir.kt
index 96af786732e..b5028a18676 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.fir.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: KotlinFile.kt
 fun foo(javaClass: JavaClass) {
     javaClass.<!INVISIBLE_REFERENCE!>doSomething<!> { }
diff --git a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.kt b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.kt
index 9de8a5382e9..1d1f9804e89 100644
--- a/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.kt
+++ b/compiler/testData/diagnostics/tests/syntheticExtensions/samAdapters/Private.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FILE: KotlinFile.kt
 fun foo(javaClass: JavaClass) {
     javaClass.<!INVISIBLE_MEMBER!>doSomething<!> <!TYPE_MISMATCH{OI}!>{ }<!>
diff --git a/compiler/testData/diagnostics/tests/targetedBuiltIns/concurrentMapRemove.fir.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/concurrentMapRemove.fir.kt
index 17fca7ffac3..eb6adfc0c34 100644
--- a/compiler/testData/diagnostics/tests/targetedBuiltIns/concurrentMapRemove.fir.kt
+++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/concurrentMapRemove.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 import java.util.concurrent.*
diff --git a/compiler/testData/diagnostics/tests/targetedBuiltIns/concurrentMapRemove.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/concurrentMapRemove.kt
index a241bdce431..23ac45b6830 100644
--- a/compiler/testData/diagnostics/tests/targetedBuiltIns/concurrentMapRemove.kt
+++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/concurrentMapRemove.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 import java.util.concurrent.*
diff --git a/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.fir.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.fir.kt
index 486557a4fce..bf126b412d9 100644
--- a/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.fir.kt
+++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -PARAMETER_NAME_CHANGED_ON_OVERRIDE
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 class KotlinMap1<K, V> : java.util.AbstractMap<K, V>() {
diff --git a/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.kt b/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.kt
index 40016362b96..b0a4a912026 100644
--- a/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.kt
+++ b/compiler/testData/diagnostics/tests/targetedBuiltIns/mutableMapRemove.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -PARAMETER_NAME_CHANGED_ON_OVERRIDE
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 class KotlinMap1<K, V> : java.util.AbstractMap<K, V>() {
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.fir.kt b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.fir.kt
index 533cd0a0fe3..1cf25b6a047 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.fir.kt
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 open class GenericBaseClass<T> {
     open fun foo(x: T): T = x
     open fun ambiguous(x: T): T = x
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.kt b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.kt
index 1843a358cba..1f3c2ecde08 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.kt
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/ambiguousSuperWithGenerics.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 open class GenericBaseClass<T> {
     open fun foo(x: T): T = x
     open fun ambiguous(x: T): T = x
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.fir.kt b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.fir.kt
index b1737bd4527..a66da2b01ac 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.fir.kt
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // Ambiguity between fun and callable property
 
 open class BaseWithCallableProp {
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.kt b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.kt
index 39b17224993..46f00d11e68 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.kt
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/unqualifiedSuper/unqualifiedSuperWithCallableProperty.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // Ambiguity between fun and callable property
 
 open class BaseWithCallableProp {
diff --git a/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.fir.kt b/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.fir.kt
index 3c98b57eacf..d7962a6e56e 100644
--- a/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.fir.kt
+++ b/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNCHECKED_CAST
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 // Issue: KT-20849
 
diff --git a/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.kt b/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.kt
index 1a8c99b9c79..a0a8bf37a92 100644
--- a/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.kt
+++ b/compiler/testData/diagnostics/tests/typeParameters/implicitNothingInReturnPosition.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNCHECKED_CAST
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 // Issue: KT-20849
 
diff --git a/compiler/testData/diagnostics/tests/typeParameters/implicitNothingOnDelegates.fir.kt b/compiler/testData/diagnostics/tests/typeParameters/implicitNothingOnDelegates.fir.kt
index 836fdbb4e77..1dd40d52c65 100644
--- a/compiler/testData/diagnostics/tests/typeParameters/implicitNothingOnDelegates.fir.kt
+++ b/compiler/testData/diagnostics/tests/typeParameters/implicitNothingOnDelegates.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNCHECKED_CAST
-// !WITH_NEW_INFERENCE
 // WITH_RUNTIME
 // WITH_REFLECT
 // SKIP_TXT
diff --git a/compiler/testData/diagnostics/tests/typeParameters/implicitNothingOnDelegates.kt b/compiler/testData/diagnostics/tests/typeParameters/implicitNothingOnDelegates.kt
index c21d0bbe30b..113f8b69116 100644
--- a/compiler/testData/diagnostics/tests/typeParameters/implicitNothingOnDelegates.kt
+++ b/compiler/testData/diagnostics/tests/typeParameters/implicitNothingOnDelegates.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNCHECKED_CAST
-// !WITH_NEW_INFERENCE
 // WITH_RUNTIME
 // WITH_REFLECT
 // SKIP_TXT
diff --git a/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.fir.kt b/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.fir.kt
index 121f705be3a..7699ca8a113 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class Num<T: Number>(val x: T)
 
 typealias N<T> = Num<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.kt b/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.kt
index 9e236b31464..7bd2a7f3130 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.kt
+++ b/compiler/testData/diagnostics/tests/typealias/boundViolationInTypeAliasConstructor.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 class Num<T: Number>(val x: T)
 
 typealias N<T> = Num<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.fir.kt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.fir.kt
index c868b92be74..a597dc04782 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 
 class TColl<T, C : Collection<T>>
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.kt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.kt
index fcf532a4be2..ad38c5b85db 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.kt
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInDeepTypeAliasExpansion.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 
 class TColl<T, C : Collection<T>>
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.fir.kt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.fir.kt
index 5b2b448a9dd..0f44913f3b9 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 
 class Num<T : Number>
diff --git a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.kt b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.kt
index 66998fd9bfe..0abf9708a82 100644
--- a/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.kt
+++ b/compiler/testData/diagnostics/tests/typealias/boundsViolationInTypeAliasExpansion.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 
 class Num<T : Number>
diff --git a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.fir.kt b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.fir.kt
index 3fd7f4dd2ba..470c1e142c6 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class Outer {
diff --git a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.kt b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.kt
index 3a8bc36da99..70599f8c1fa 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.kt
+++ b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructor.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class Outer {
diff --git a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.fir.kt b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.fir.kt
index 6a5c43d9c55..556d3a92904 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package test
 
 typealias OI = Outer.Inner
diff --git a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.kt b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.kt
index dc9e4b2b674..d4afb618214 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.kt
+++ b/compiler/testData/diagnostics/tests/typealias/innerClassTypeAliasConstructorInSupertypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 package test
 
 typealias OI = Outer.Inner
diff --git a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.fir.kt b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.fir.kt
index f2e054d434f..cd666e9285d 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -TOPLEVEL_TYPEALIASES_ONLY
 
 class Pair<X, Y>(val x: X, val y: Y)
diff --git a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.kt b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.kt
index 9aec6936a4f..9280bcf6801 100644
--- a/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.kt
+++ b/compiler/testData/diagnostics/tests/typealias/innerTypeAliasConstructor.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -TOPLEVEL_TYPEALIASES_ONLY
 
 class Pair<X, Y>(val x: X, val y: Y)
diff --git a/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.fir.kt b/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.fir.kt
index b0081a293f8..c41acf2623a 100644
--- a/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 typealias Array2D<T> = Array<Array<T>>
diff --git a/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.kt b/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.kt
index b8651e1dfaf..32f344d14c4 100644
--- a/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.kt
+++ b/compiler/testData/diagnostics/tests/typealias/noApproximationInTypeAliasArgumentSubstitution.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 typealias Array2D<T> = Array<Array<T>>
diff --git a/compiler/testData/diagnostics/tests/typealias/starProjection.fir.kt b/compiler/testData/diagnostics/tests/typealias/starProjection.fir.kt
index 76e97407452..e67d269d8e7 100644
--- a/compiler/testData/diagnostics/tests/typealias/starProjection.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/starProjection.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 typealias A<T> = Map<T, T>
 typealias B = A<*>
 
diff --git a/compiler/testData/diagnostics/tests/typealias/starProjection.kt b/compiler/testData/diagnostics/tests/typealias/starProjection.kt
index 0d651e014e8..7f7c9699cd5 100644
--- a/compiler/testData/diagnostics/tests/typealias/starProjection.kt
+++ b/compiler/testData/diagnostics/tests/typealias/starProjection.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 typealias A<T> = Map<T, T>
 typealias B = A<*>
 
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.fir.kt
index 2ea38ab934a..1556957f654 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class Bound<X, Y : X>(val x: X, val y: Y)
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.kt
index 516e50eea4b..d2065df10ff 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorCrazyProjections.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class Bound<X, Y : X>(val x: X, val y: Y)
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.fir.kt
index 4218c8cbba6..2a132cb3675 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class C<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.kt
index 9f37e11bee7..a933b076bb8 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjection.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class C<T>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.fir.kt
index 4db0b2a98f2..1f0cafbc552 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 open class C<T>
 
 typealias CStar = C<*>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.kt
index 0084edb6950..e56fc7f9b41 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorForProjectionInSupertypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 open class C<T>
 
 typealias CStar = C<*>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.fir.kt
index 66d0fdbedec..be9f51d529f 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class Num<Tn : Number>(val x: Tn)
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.kt
index 3b9fb834740..e7d0847dba5 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInference.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class Num<Tn : Number>(val x: Tn)
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.fir.kt
index f2b5bafefc9..3f0becf950c 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 interface Ref<T> {
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.kt
index 4525dcbbad5..dab82144ff6 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithNestedCalls2.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 interface Ref<T> {
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.fir.kt
index b49ee36fb07..fff41b71315 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class Foo<A : Number>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.kt
index b7e1a1389a5..b4c59136b8e 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorTypeArgumentsInferenceWithPhantomTypes.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class Foo<A : Number>
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.fir.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.fir.kt
index 79aee5579fc..525bef71b3a 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 open class MyClass private constructor(val x: Int) {
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.kt
index d70ce56fb86..30fd030cf60 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasConstructorWrongVisibility.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 open class MyClass private constructor(val x: Int) {
diff --git a/compiler/testData/diagnostics/tests/typealias/typeAliasObjectWithInvoke.kt b/compiler/testData/diagnostics/tests/typealias/typeAliasObjectWithInvoke.kt
index 96b227857fc..597451ddc1a 100644
--- a/compiler/testData/diagnostics/tests/typealias/typeAliasObjectWithInvoke.kt
+++ b/compiler/testData/diagnostics/tests/typealias/typeAliasObjectWithInvoke.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 object ObjectWithInvoke {
diff --git a/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.fir.kt b/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.fir.kt
index 4d9f140bfed..6082beca0e4 100644
--- a/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.fir.kt
+++ b/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class Pair<T1, T2>(val x1: T1, val x2: T2)
diff --git a/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.kt b/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.kt
index 969cd7036c7..3c8e33aad33 100644
--- a/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.kt
+++ b/compiler/testData/diagnostics/tests/typealias/wrongNumberOfArgumentsInTypeAliasConstructor.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class Pair<T1, T2>(val x1: T1, val x2: T2)
diff --git a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.fir.kt b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.fir.kt
index 0503e7a49ec..3634de0816a 100644
--- a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.fir.kt
+++ b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 // FILE: annotation.kt
 
diff --git a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.kt b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.kt
index 1fdf84bdf72..50bf2b5a160 100644
--- a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.kt
+++ b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/conversionOfSignedToUnsigned.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 // FILE: annotation.kt
 
diff --git a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/inferenceForSignedAndUnsignedTypes.fir.kt b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/inferenceForSignedAndUnsignedTypes.fir.kt
index 360bb907206..41652b12938 100644
--- a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/inferenceForSignedAndUnsignedTypes.fir.kt
+++ b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/inferenceForSignedAndUnsignedTypes.fir.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 
 // Here we mostly trying to fix behaviour in order to track changes in inference rules for unsigned types later
 
diff --git a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/inferenceForSignedAndUnsignedTypes.kt b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/inferenceForSignedAndUnsignedTypes.kt
index 021a76d7ccc..6f552fbd67d 100644
--- a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/inferenceForSignedAndUnsignedTypes.kt
+++ b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/inferenceForSignedAndUnsignedTypes.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 
 // Here we mostly trying to fix behaviour in order to track changes in inference rules for unsigned types later
 
diff --git a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/signedToUnsignedConversionWithExpectedType.fir.kt b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/signedToUnsignedConversionWithExpectedType.fir.kt
index e03a172049a..fd93faf34f0 100644
--- a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/signedToUnsignedConversionWithExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/signedToUnsignedConversionWithExpectedType.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 fun takeUByte(u: UByte) {}
 fun takeUShort(u: UShort) {}
diff --git a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/signedToUnsignedConversionWithExpectedType.kt b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/signedToUnsignedConversionWithExpectedType.kt
index d6670de366b..67c0488a20c 100644
--- a/compiler/testData/diagnostics/tests/unsignedTypes/conversions/signedToUnsignedConversionWithExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/unsignedTypes/conversions/signedToUnsignedConversionWithExpectedType.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 fun takeUByte(u: UByte) {}
 fun takeUShort(u: UShort) {}
diff --git a/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.fir.kt b/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.fir.kt
index 1e596f43ef7..c482750f53f 100644
--- a/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.fir.kt
+++ b/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS:-UNUSED_PARAMETER
 
 // KT-9883 prohibit using spread operator for nullable value
diff --git a/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.kt b/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.kt
index 405e452a716..56f99761caf 100644
--- a/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.kt
+++ b/compiler/testData/diagnostics/tests/varargs/NullableTypeForVarargArgument.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS:-UNUSED_PARAMETER
 
 // KT-9883 prohibit using spread operator for nullable value
diff --git a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.fir.kt b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.fir.kt
index 86691dfabc5..33cd8b7db07 100644
--- a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.fir.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.fir.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: -AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 @Retention(AnnotationRetention.SOURCE)
 @Target(AnnotationTarget.EXPRESSION)
diff --git a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt
index 94171687179..800c844b1a0 100644
--- a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_3.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: -AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 @Retention(AnnotationRetention.SOURCE)
 @Target(AnnotationTarget.EXPRESSION)
diff --git a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.fir.kt b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.fir.kt
index 63fd72c7599..6cd1a2cee0e 100644
--- a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.fir.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.fir.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 @Retention(AnnotationRetention.SOURCE)
 @Target(AnnotationTarget.EXPRESSION)
diff --git a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.kt b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.kt
index 24dd6e14800..b153550462a 100644
--- a/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assignArrayToVararagInNamedForm_1_4.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 @Retention(AnnotationRetention.SOURCE)
 @Target(AnnotationTarget.EXPRESSION)
diff --git a/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.fir.kt b/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.fir.kt
index 7b1615467ed..1d53272c657 100644
--- a/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.fir.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ArrayLiteralsInAnnotations, +AssigningArraysToVarargsInNamedFormInAnnotations
 
 // FILE: JavaAnn.java
diff --git a/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt b/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt
index c74b302baae..9dfd03c0423 100644
--- a/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assigningArraysToVarargsInAnnotations.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ArrayLiteralsInAnnotations, +AssigningArraysToVarargsInNamedFormInAnnotations
 
 // FILE: JavaAnn.java
diff --git a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.fir.kt b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.fir.kt
index 4349a317c6c..c63c7ae3818 100644
--- a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.fir.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.fir.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +AssigningArraysToVarargsInNamedFormInAnnotations, +ProhibitAssigningSingleElementsToVarargsInNamedForm -AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 fun foo(vararg s: Int) {}
 
diff --git a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.kt b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.kt
index 6fe42670ea9..9417213e3de 100644
--- a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_after.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +AssigningArraysToVarargsInNamedFormInAnnotations, +ProhibitAssigningSingleElementsToVarargsInNamedForm -AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 fun foo(vararg s: Int) {}
 
diff --git a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.fir.kt b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.fir.kt
index af7880ac0f1..4155e2a6116 100644
--- a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.fir.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.fir.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +AssigningArraysToVarargsInNamedFormInAnnotations, -ProhibitAssigningSingleElementsToVarargsInNamedForm -AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 fun foo(vararg s: Int) {}
 
diff --git a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.kt b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.kt
index 19e64a41598..c27c3492786 100644
--- a/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.kt
+++ b/compiler/testData/diagnostics/tests/varargs/assigningSingleElementsInNamedFormFunDeprecation_before.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: +AssigningArraysToVarargsInNamedFormInAnnotations, -ProhibitAssigningSingleElementsToVarargsInNamedForm -AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 // !DIAGNOSTICS: -UNUSED_PARAMETER, -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 fun foo(vararg s: Int) {}
 
diff --git a/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.fir.kt b/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.fir.kt
index 8381c0b7e0c..f4ba6202a74 100644
--- a/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.fir.kt
+++ b/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ArrayLiteralsInAnnotations, -AssigningArraysToVarargsInNamedFormInAnnotations -AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 
 // FILE: JavaAnn.java
diff --git a/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.kt b/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.kt
index a3279d56229..c9e446d7eaa 100644
--- a/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.kt
+++ b/compiler/testData/diagnostics/tests/varargs/noAssigningArraysToVarargsFeature.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +ArrayLiteralsInAnnotations, -AssigningArraysToVarargsInNamedFormInAnnotations -AllowAssigningArrayElementsToVarargsInNamedFormForFunctions
 
 // FILE: JavaAnn.java
diff --git a/compiler/testData/diagnostics/tests/when/BranchBypassVal.fir.kt b/compiler/testData/diagnostics/tests/when/BranchBypassVal.fir.kt
index a2d147b56da..fedb6a293e5 100644
--- a/compiler/testData/diagnostics/tests/when/BranchBypassVal.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/BranchBypassVal.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
diff --git a/compiler/testData/diagnostics/tests/when/BranchBypassVal.kt b/compiler/testData/diagnostics/tests/when/BranchBypassVal.kt
index 2c368c2f65d..2b289f9d1a4 100644
--- a/compiler/testData/diagnostics/tests/when/BranchBypassVal.kt
+++ b/compiler/testData/diagnostics/tests/when/BranchBypassVal.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
diff --git a/compiler/testData/diagnostics/tests/when/BranchBypassVar.fir.kt b/compiler/testData/diagnostics/tests/when/BranchBypassVar.fir.kt
index b082ea2311e..7803b81ff76 100644
--- a/compiler/testData/diagnostics/tests/when/BranchBypassVar.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/BranchBypassVar.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
diff --git a/compiler/testData/diagnostics/tests/when/BranchBypassVar.kt b/compiler/testData/diagnostics/tests/when/BranchBypassVar.kt
index 6b89cbd0051..d20cdcaa1e1 100644
--- a/compiler/testData/diagnostics/tests/when/BranchBypassVar.kt
+++ b/compiler/testData/diagnostics/tests/when/BranchBypassVar.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
diff --git a/compiler/testData/diagnostics/tests/when/When.fir.kt b/compiler/testData/diagnostics/tests/when/When.fir.kt
index 3340e3c95ea..d9b6955b9bb 100644
--- a/compiler/testData/diagnostics/tests/when/When.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/When.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
diff --git a/compiler/testData/diagnostics/tests/when/When.kt b/compiler/testData/diagnostics/tests/when/When.kt
index 21e0f1b59bf..a04cb887c8f 100644
--- a/compiler/testData/diagnostics/tests/when/When.kt
+++ b/compiler/testData/diagnostics/tests/when/When.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
diff --git a/compiler/testData/diagnostics/tests/when/kt10439.fir.kt b/compiler/testData/diagnostics/tests/when/kt10439.fir.kt
index 87de67c97e7..7ca836e618b 100644
--- a/compiler/testData/diagnostics/tests/when/kt10439.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/kt10439.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
diff --git a/compiler/testData/diagnostics/tests/when/kt10439.kt b/compiler/testData/diagnostics/tests/when/kt10439.kt
index 45ee0a3a834..fafc694ac4d 100644
--- a/compiler/testData/diagnostics/tests/when/kt10439.kt
+++ b/compiler/testData/diagnostics/tests/when/kt10439.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
diff --git a/compiler/testData/diagnostics/tests/when/kt10809.fir.kt b/compiler/testData/diagnostics/tests/when/kt10809.fir.kt
index 6765d688134..8003826d118 100644
--- a/compiler/testData/diagnostics/tests/when/kt10809.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/kt10809.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEBUG_INFO_SMARTCAST
 // NI_EXPECTED_FILE
 /*
diff --git a/compiler/testData/diagnostics/tests/when/kt10809.kt b/compiler/testData/diagnostics/tests/when/kt10809.kt
index d7ae441fdfb..84dfd3c3d05 100644
--- a/compiler/testData/diagnostics/tests/when/kt10809.kt
+++ b/compiler/testData/diagnostics/tests/when/kt10809.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -DEBUG_INFO_SMARTCAST
 // NI_EXPECTED_FILE
 /*
diff --git a/compiler/testData/diagnostics/tests/when/kt9929.fir.kt b/compiler/testData/diagnostics/tests/when/kt9929.fir.kt
index 74a98288213..5a70d7b868b 100644
--- a/compiler/testData/diagnostics/tests/when/kt9929.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/kt9929.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 val test: Int = <!INITIALIZER_TYPE_MISMATCH!>if (true) {
     when (2) {
         1 -> 1
diff --git a/compiler/testData/diagnostics/tests/when/kt9929.kt b/compiler/testData/diagnostics/tests/when/kt9929.kt
index 5ca2059e1ee..cd78501d239 100644
--- a/compiler/testData/diagnostics/tests/when/kt9929.kt
+++ b/compiler/testData/diagnostics/tests/when/kt9929.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 val test: Int = if (true) <!TYPE_MISMATCH{NI}!>{
     when (2) {
         1 -> 1
diff --git a/compiler/testData/diagnostics/tests/when/kt9972.fir.kt b/compiler/testData/diagnostics/tests/when/kt9972.fir.kt
index cccc3ce4314..12843090fd3 100644
--- a/compiler/testData/diagnostics/tests/when/kt9972.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/kt9972.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
diff --git a/compiler/testData/diagnostics/tests/when/kt9972.kt b/compiler/testData/diagnostics/tests/when/kt9972.kt
index 591722f3354..dba27d433bc 100644
--- a/compiler/testData/diagnostics/tests/when/kt9972.kt
+++ b/compiler/testData/diagnostics/tests/when/kt9972.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (POSITIVE)
  *
diff --git a/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.fir.kt b/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.fir.kt
index 027c1ea2405..cdc33d4cf7f 100644
--- a/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
diff --git a/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.kt b/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.kt
index dba42c833c9..bd085494344 100644
--- a/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.kt
+++ b/compiler/testData/diagnostics/tests/when/whenAndLambdaWithExpectedType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
  *
diff --git a/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.fir.kt b/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.fir.kt
index f48235d51ab..9ed176bd000 100644
--- a/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
diff --git a/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.kt b/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.kt
index 3c96278cbf4..9edc89979ca 100644
--- a/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.kt
+++ b/compiler/testData/diagnostics/tests/when/whenWithNothingAndLambdas.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 /*
  * KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
diff --git a/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.fir.kt b/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.fir.kt
index e9f408fbd5c..f74066d400b 100644
--- a/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.fir.kt
+++ b/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.fir.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +VariableDeclarationInWhenSubject
-// !WITH_NEW_INFERENCE
 
 fun foo(s1: Int, s2: Int) = s1 + s2
 
diff --git a/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.kt b/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.kt
index 8aa1fd66c3b..198e47e358c 100644
--- a/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.kt
+++ b/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +VariableDeclarationInWhenSubject
-// !WITH_NEW_INFERENCE
 
 fun foo(s1: Int, s2: Int) = s1 + s2
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.fir.kt
index aceb78c572e..5965caa70c1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.fir.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNCHECKED_CAST -USELESS_CAST
 // !LANGUAGE: +ProhibitNonReifiedArraysAsReifiedTypeArguments
-// !WITH_NEW_INFERENCE
 class A<T>
 
 fun test1(
diff --git a/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.kt b/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.kt
index 4e5c11e9958..24fe9880e02 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/ArrayOfNothing.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE -UNCHECKED_CAST -USELESS_CAST
 // !LANGUAGE: +ProhibitNonReifiedArraysAsReifiedTypeArguments
-// !WITH_NEW_INFERENCE
 class A<T>
 
 fun test1(
diff --git a/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.fir.kt
index 808ca550b9c..6b45cf7601d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun test(mc: MutableCollection<out CharSequence>) {
     mc.addAll(mc)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.kt b/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.kt
index b84f5e7c54e..4aeeff61812 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/addAllProjection.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun test(mc: MutableCollection<out CharSequence>) {
     mc.addAll(<!TYPE_MISMATCH{NI}, TYPE_MISMATCH_DUE_TO_TYPE_PROJECTIONS{OI}!>mc<!>)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.fir.kt
index a5d2bdf8807..0ea87e691e2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See KT-15839
 
 val x = "1".let(@Suppress("DEPRECATION") Integer::parseInt)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.kt
index 5a5c919edf5..59f075bd98f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/suppressOnFunctionReference.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See KT-15839
 
 val x = "1".let(@<!DEBUG_INFO_MISSING_UNRESOLVED{NI}!>Suppress<!>("DEPRECATION") Integer::parseInt)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.fir.kt
index 07ca5e7b209..967766a3da7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 // FILE: A.java
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.kt
index ee2422d2d7e..391b0ab62c5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameters/valueArrayAndOtherDefault.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 // FILE: A.java
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.fir.kt
index 7a5f9cd9e05..d4e15bea6bd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 // FILE: A.java
 public @interface A {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt
index ae79a26a374..f41ac41f44d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/javaAnnotationWithVarargArgument.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 // FILE: A.java
 public @interface A {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.fir.kt
index e40d885f3df..69b0f7f3e92 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 annotation class B(vararg val args: String)
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt
index b6c06233464..67b5cc03b1f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationWithVarargParameter/kotlinAnnotationWithVarargArgument.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 annotation class B(vararg val args: String)
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.fir.kt
index 3a442cbe244..f2066aeea10 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KClass
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.kt
index a5d59fbb61a..3db186e15ad 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsInVariance.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KClass
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.fir.kt
index d7c81d3d00a..4d6f137d15f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KClass
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.kt b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.kt
index 50c73321702..b56f6a6e25f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/kClass/kClassArrayInAnnotationsOutVariance.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KClass
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/assert/cast.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/assert/cast.fir.kt
index b7bddc0ecd4..bb6ff23f751 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/assert/cast.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/assert/cast.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !IGNORE_DATA_FLOW_IN_ASSERT
 // SKIP_TXT
 // WITH_RUNTIME
diff --git a/compiler/testData/diagnostics/testsWithStdLib/assert/cast.kt b/compiler/testData/diagnostics/testsWithStdLib/assert/cast.kt
index 5210167b086..5385aa77265 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/assert/cast.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/assert/cast.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !IGNORE_DATA_FLOW_IN_ASSERT
 // SKIP_TXT
 // WITH_RUNTIME
diff --git a/compiler/testData/diagnostics/testsWithStdLib/assert/safeCall.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/assert/safeCall.fir.kt
index 5049110bfc8..909e8e8154d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/assert/safeCall.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/assert/safeCall.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !IGNORE_DATA_FLOW_IN_ASSERT
 // SKIP_TXT
 // WITH_RUNTIME
diff --git a/compiler/testData/diagnostics/testsWithStdLib/assert/safeCall.kt b/compiler/testData/diagnostics/testsWithStdLib/assert/safeCall.kt
index eca2c5f8a5d..1af96ff29fa 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/assert/safeCall.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/assert/safeCall.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !IGNORE_DATA_FLOW_IN_ASSERT
 // SKIP_TXT
 // WITH_RUNTIME
diff --git a/compiler/testData/diagnostics/testsWithStdLib/cast/AsInsideIn.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/cast/AsInsideIn.fir.kt
index 7ed4970bc2f..77716460e9d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/cast/AsInsideIn.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/cast/AsInsideIn.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See also KT-10386
 interface A
 class B : A
diff --git a/compiler/testData/diagnostics/testsWithStdLib/cast/AsInsideIn.kt b/compiler/testData/diagnostics/testsWithStdLib/cast/AsInsideIn.kt
index 5936a24c965..616e3154749 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/cast/AsInsideIn.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/cast/AsInsideIn.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // See also KT-10386
 interface A
 class B : A
diff --git a/compiler/testData/diagnostics/testsWithStdLib/commonCollections.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/commonCollections.fir.kt
index b9f33297b7a..0f699920a13 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/commonCollections.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/commonCollections.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 import java.util.*
 fun foo() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/commonCollections.kt b/compiler/testData/diagnostics/testsWithStdLib/commonCollections.kt
index f5f8a67df88..405a0c71626 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/commonCollections.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/commonCollections.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 import java.util.*
 fun foo() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/deeplyNested.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/deeplyNested.fir.kt
index 1f82b4ed9df..8c50697b594 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/deeplyNested.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/deeplyNested.fir.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/deeplyNested.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/deeplyNested.kt
index d16f7b0f3d8..e90d2f1664e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/deeplyNested.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/deeplyNested.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/externalArguments.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/externalArguments.fir.kt
index de95bc6b4e1..7bf2d8b1a94 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/externalArguments.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/externalArguments.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/externalArguments.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/externalArguments.kt
index 81a0eccec94..3104228db12 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/externalArguments.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/externalArguments.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 import kotlin.reflect.KProperty
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectingInfo.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectingInfo.fir.kt
index 989afc2c66e..791ee5ed247 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectingInfo.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectingInfo.fir.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectingInfo.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectingInfo.kt
index e9ca68cd1d5..a2ec7f07bde 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectingInfo.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectingInfo.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectionTypes.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectionTypes.fir.kt
index 7f17a0cdb27..bbf0af51250 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectionTypes.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectionTypes.fir.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectionTypes.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectionTypes.kt
index 72a7ff346dd..409bd49e579 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectionTypes.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/intersectionTypes.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/nullabilitySmartcastWhenNullability.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/nullabilitySmartcastWhenNullability.fir.kt
index b155a85fe99..eb2f895dda9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/nullabilitySmartcastWhenNullability.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/nullabilitySmartcastWhenNullability.fir.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/nullabilitySmartcastWhenNullability.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/nullabilitySmartcastWhenNullability.kt
index 247bcf9074c..c6fe19ee38e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/nullabilitySmartcastWhenNullability.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/nullabilitySmartcastWhenNullability.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/andOperator.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/andOperator.fir.kt
index e6851cbd1d1..068a42a58d0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/andOperator.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/andOperator.fir.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/andOperator.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/andOperator.kt
index 38ba78827b5..5ea59c8689e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/andOperator.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/andOperator.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/equalsOperator.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/equalsOperator.fir.kt
index 2d4b9aefc56..28c6d4d5972 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/equalsOperator.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/equalsOperator.fir.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/equalsOperator.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/equalsOperator.kt
index d5f7fcf1987..75dc03156f1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/equalsOperator.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/equalsOperator.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/orOperator.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/orOperator.fir.kt
index efcabeeb5ee..07fd4078f63 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/orOperator.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/orOperator.fir.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/orOperator.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/orOperator.kt
index 42ea9a96433..075411d5042 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/orOperator.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/operatorsTests/orOperator.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/receiver.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/receiver.fir.kt
index e26d902954e..bf485ab0d1e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/receiver.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/receiver.fir.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/receiver.kt b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/receiver.kt
index 5e506a0f54a..db562fd8342 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/receiver.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/contracts/smartcasts/receiver.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: +AllowContractsForCustomFunctions +UseReturnsEffect
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
 // !DIAGNOSTICS: -INVISIBLE_REFERENCE -INVISIBLE_MEMBER
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.fir.kt
index f829ef04e8f..a17fc61bc2f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.fir.kt
@@ -1,6 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class Controller<T> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.kt
index 713a118f9a8..3052e6f85c5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/applyInsideCoroutine.kt
@@ -1,6 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class Controller<T> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.fir.kt
index da066ee810a..c4e148f9937 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.fir.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 @file:OptIn(ExperimentalTypeInference::class)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt
index ffdda40308c..7910630ece8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionWithNonValuableConstraints.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 @file:OptIn(ExperimentalTypeInference::class)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.fir.kt
index 7811e1ce8ef..68b1292130c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.fir.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 @file:OptIn(ExperimentalTypeInference::class)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.kt
index 0b971c8be82..115445a6c11 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/extensionsWithNonValuableConstraintsGenericBase.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 @file:OptIn(ExperimentalTypeInference::class)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.fir.kt
index 955a0c766fd..5b01943415f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.fir.kt
@@ -1,6 +1,5 @@
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 @file:OptIn(ExperimentalTypeInference::class)
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.kt
index befdfa9876a..b4312f8d92f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/incorrectCalls.kt
@@ -1,6 +1,5 @@
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 @file:OptIn(ExperimentalTypeInference::class)
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferCoroutineTypeInOldVersion.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferCoroutineTypeInOldVersion.fir.kt
index b80ff0e4fd0..8a07eff2f12 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferCoroutineTypeInOldVersion.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferCoroutineTypeInOldVersion.fir.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: -ExperimentalBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 class Builder<T> {
     suspend fun add(t: T) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferCoroutineTypeInOldVersion.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferCoroutineTypeInOldVersion.kt
index 37c751dc857..72ef1eedcd3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferCoroutineTypeInOldVersion.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/inferCoroutineTypeInOldVersion.kt
@@ -1,6 +1,5 @@
 // !LANGUAGE: -ExperimentalBuilderInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 class Builder<T> {
     suspend fun add(t: T) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt15516.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt15516.fir.kt
index 523cb3de6ed..c0705a2b7e2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt15516.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt15516.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 class StateMachine<Q> internal constructor() {
     fun getInputStub(): Q = null as Q
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt15516.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt15516.kt
index 4bcfe8fe294..de07074bac2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt15516.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt15516.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 class StateMachine<Q> internal constructor() {
     fun getInputStub(): Q = null <!UNCHECKED_CAST!>as Q<!>
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.fir.kt
index 08380daa150..f6cbc1ccaf2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.fir.kt
@@ -1,6 +1,5 @@
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 import kotlin.experimental.ExperimentalTypeInference
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.kt
index f6cf08db1ce..93fd5d45844 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/kt36220.kt
@@ -1,6 +1,5 @@
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 import kotlin.experimental.ExperimentalTypeInference
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/nestedSuspendCallInsideLambda.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/nestedSuspendCallInsideLambda.kt
index 3ef76e7bb0c..606812dcfda 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/nestedSuspendCallInsideLambda.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/nestedSuspendCallInsideLambda.kt
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 suspend fun wrapUp2() {
     withContext<Unit> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.fir.kt
index ad6c02c3c56..1b8a0640c3d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.fir.kt
@@ -1,6 +1,5 @@
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 @file:OptIn(ExperimentalTypeInference::class)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt
index 44a15134fcc..b569bff1a4e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/recursiveGenerators2.kt
@@ -1,6 +1,5 @@
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 @file:OptIn(ExperimentalTypeInference::class)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/resolveUsualCallWithBuilderInference.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/resolveUsualCallWithBuilderInference.fir.kt
index 76fa4fb0803..b0e7f1eb751 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/resolveUsualCallWithBuilderInference.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/resolveUsualCallWithBuilderInference.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // FILE: annotation.kt
 
 package kotlin
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/resolveUsualCallWithBuilderInference.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/resolveUsualCallWithBuilderInference.kt
index 1a8fad0022b..b55df7a6889 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/resolveUsualCallWithBuilderInference.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/resolveUsualCallWithBuilderInference.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // FILE: annotation.kt
 
 package kotlin
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.fir.kt
index 6a20ce5cd52..f1b7973f436 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.fir.kt
@@ -1,6 +1,5 @@
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 @file:OptIn(ExperimentalTypeInference::class)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.kt
index e55c7eb1b07..0e7d974a068 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWithErrors.kt
@@ -1,6 +1,5 @@
 // !USE_EXPERIMENTAL: kotlin.RequiresOptIn
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 @file:OptIn(ExperimentalTypeInference::class)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.fir.kt
index c0a1aeee3d5..b58604aa740 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class Controller<T : Number> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.kt
index cef8b8759be..07dd66a6a42 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/suspendCallsWrongUpperBound.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class Controller<T : Number> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.fir.kt
index 897aceff9c5..7d3b5587ce2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 // FILE: annotation.kt
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.kt
index ed52208c740..c561fbdc54d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/useInferenceInformationFromExtension.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 // FILE: annotation.kt
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.fir.kt
index 67d9f1db67e..776b7b953ee 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class GenericController<T> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.kt
index ccd4f6cae80..0719b4dc4d8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/inference/withUninferredParameter.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_ANONYMOUS_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 class GenericController<T> {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.fir.kt
index 754ac2c36e5..3c95a4575ef 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt
index e49257af89e..0c7ea8dfdfe 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/kt18292.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 // WITH_RUNTIME
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.fir.kt
index ac8d2179daf..f8371b2cb46 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.fir.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: -SuspendConversion
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.kt
index 0c3b9342ed0..f558997fc5f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/lambdaExpectedType.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: -SuspendConversion
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_PARAMETER -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_VARIABLE
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.fir.kt
index 988fcda25db..d800749fa27 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 // SKIP_TXT
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt
index 39228ce35c4..0eb6b427707 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendCoroutineOrReturn.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
 // SKIP_TXT
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.fir.kt
index 80fb3b0e80c..19be74fed9e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.fir.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 suspend fun noParams() {
 }
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.kt
index b804a66d71b..5897c51aba7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendExternalFunctions.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 suspend fun noParams() {
 }
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.fir.kt
index 02d1088e025..c4c2de10b02 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.fir.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 import kotlin.coroutines.*
 
 class Controller {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt
index 85112d8a185..546b2f4e33a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/suspendFunctions.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 import kotlin.coroutines.*
 
 class Controller {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.fir.kt
index 12d21d39945..81e2d12c047 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 suspend fun <V> await(f: V): V = f
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.kt b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.kt
index 4e92e90e6b1..8f60a6c3d23 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/coroutines/tryCatchLambda.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 suspend fun <V> await(f: V): V = f
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.fir.kt
index 777bc808f19..e83d71ecc14 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 // FILE: P.java
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.kt b/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.kt
index 8fcea40f606..863e5f54f9f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/elvisOnJavaList.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 // FILE: P.java
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.fir.kt
index 86f3ab3c156..cebea49f3e9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 var longWords = 0
 val smallWords = hashSetOf<String>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.kt b/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.kt
index ac420b4dd63..dedba940c8a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/implicitCastToAny.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 var longWords = 0
 val smallWords = hashSetOf<String>()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.fir.kt
index 351ea75d8fc..fdc90a8c182 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.fir.kt
@@ -1,5 +1,4 @@
 //!DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 fun <T, U: T> List<@kotlin.internal.Exact T>.firstTyped(): U = throw Exception()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.kt
index 186d011443e..2face642281 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/exactAnnotation.kt
@@ -1,5 +1,4 @@
 //!DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 fun <T, U: T> List<@kotlin.internal.Exact T>.firstTyped(): U = throw Exception()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt26698.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt26698.fir.kt
index 059ea17eff5..75964e9c205 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt26698.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt26698.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 open class Base()
 class CX : Base()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt26698.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt26698.kt
index b4d5b204f21..2708e1985b4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt26698.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt26698.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 open class Base()
 class CX : Base()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.fir.kt
index 7c83c789fa5..b2dfcf0cf62 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // ISSUE: KT-29307
 
 fun test_1(map: Map<String, String>) {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.kt
index 727bba14f54..e508f647e6b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/kt29307.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // ISSUE: KT-29307
 
 fun test_1(map: Map<String, String>) {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.fir.kt
index ee14da52595..d062499baae 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.fir.kt
@@ -1,5 +1,4 @@
 //!DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 <!CONFLICTING_OVERLOADS!>@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 @kotlin.jvm.JvmName("containsAny")
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.kt
index 2a1a51baed4..e71b07198f4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAndLowPriority.kt
@@ -1,5 +1,4 @@
 //!DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 @kotlin.jvm.JvmName("containsAny")
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.fir.kt
index e1de728cd58..6ee7559f356 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.fir.kt
@@ -1,5 +1,4 @@
 //!DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 fun <T> test1(t1: T, t2: @kotlin.internal.NoInfer T): T = t1
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.kt
index 1b52856d113..c7346fdcbd9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/noInferAnnotation.kt
@@ -1,5 +1,4 @@
 //!DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 fun <T> test1(t1: T, t2: @kotlin.internal.NoInfer T): T = t1
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypes.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypes.fir.kt
index b72dfbd7e0d..9c3bcc87af9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypes.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypes.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 public fun <@kotlin.internal.OnlyInputTypes T> Iterable<T>.contains1(element: T): Boolean = null!!
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypes.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypes.kt
index 5e68d52b698..b80fbbd8833 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypes.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypes.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 public fun <@kotlin.internal.OnlyInputTypes T> Iterable<T>.contains1(element: T): Boolean = null!!
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.fir.kt
index 076edaa5ce5..f5e6dd99a31 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.fir.kt
@@ -1,5 +1,4 @@
 //!DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 <!CONFLICTING_OVERLOADS!>@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 @kotlin.jvm.JvmName("containsAny")
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.kt
index ce41196593b..fac3cf0b7ec 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndLowPriority.kt
@@ -1,5 +1,4 @@
 //!DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 @kotlin.jvm.JvmName("containsAny")
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndTopLevelCapturedTypes.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndTopLevelCapturedTypes.fir.kt
index 5fe3d54488e..ea185fdbb87 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndTopLevelCapturedTypes.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndTopLevelCapturedTypes.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 class Inv<T>
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndTopLevelCapturedTypes.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndTopLevelCapturedTypes.kt
index a27be5e96f9..c513c6303a9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndTopLevelCapturedTypes.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesAndTopLevelCapturedTypes.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 class Inv<T>
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCaptured.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCaptured.fir.kt
index a75fd93f946..1e66a7a7ae4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCaptured.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCaptured.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // Issue: KT-26698
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCaptured.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCaptured.kt
index d5fd7fb922c..b08fc6713ec 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCaptured.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCaptured.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
 // Issue: KT-26698
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCommonConstraintSystem.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCommonConstraintSystem.fir.kt
index 8c323891011..478d54a8285 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCommonConstraintSystem.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCommonConstraintSystem.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCommonConstraintSystem.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCommonConstraintSystem.kt
index 80fbd7071dc..cb593c0dc7a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCommonConstraintSystem.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesCommonConstraintSystem.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesUpperBound.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesUpperBound.fir.kt
index 2de3099b37c..ecbe41d72e4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesUpperBound.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesUpperBound.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesUpperBound.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesUpperBound.kt
index 7737464f651..ec114a88b18 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesUpperBound.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/onlyInputTypesUpperBound.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.fir.kt
index 2e80f60a8f4..e29973f346f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.fir.kt
@@ -1,5 +1,4 @@
 //!DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 fun <@kotlin.internal.OnlyInputTypes T> assertEquals1(t1: T, t2: T) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.kt
index 3167214902a..8be2afc0ec6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/annotationsForResolve/resolveWithOnlyInputTypesAnnotation.kt
@@ -1,5 +1,4 @@
 //!DIAGNOSTICS: -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 @Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
 fun <@kotlin.internal.OnlyInputTypes T> assertEquals1(t1: T, t2: T) {}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt31219.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt31219.kt
index 30b8cb4c167..61e8e8e0462 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt31219.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt31219.kt
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // !LANGUAGE: +NewInference
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // ISSUE: KT-31219
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt31679.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt31679.kt
index bb9dd9d2784..f5a297d2482 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt31679.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt31679.kt
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // !LANGUAGE: +NewInference
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // ISSUE: KT-31679
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt32249.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt32249.kt
index a846d709c44..1733c035bab 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt32249.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/delegates/kt32249.kt
@@ -1,6 +1,5 @@
 // FIR_IDENTICAL
 // !LANGUAGE: +NewInference
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // ISSUE: KT-32249
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/integerLiterals.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/integerLiterals.fir.kt
index a024bc2848f..bee5aa0b0e9 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/integerLiterals.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/integerLiterals.fir.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +NewInference
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -USELESS_ELVIS -UNUSED_EXPRESSION
 
 class X {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/integerLiterals.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/integerLiterals.kt
index 784a9bba14a..cdd5c742cfe 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/integerLiterals.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/integerLiterals.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +NewInference
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -USELESS_ELVIS -UNUSED_EXPRESSION
 
 class X {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt
index 4649f78fe29..b271a096627 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt11266.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 
 fun foo(first: Array<Any?>, second: Array<Any?>) = Pair(first.toCollection(<!NO_VALUE_FOR_PARAMETER!>)<!>, second.toCollection(<!NO_VALUE_FOR_PARAMETER!>)<!>)
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.fir.kt
index 702005d9ff0..eae4bac51fa 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <T> foo(resources: List<T>) {
     resources.map { runCatching { it } }.mapNotNull { it.getOrNull() }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.kt b/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.kt
index dcbcf3013bf..31e5a326aee 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/inference/kt27772.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <T> foo(resources: List<T>) {
     resources.map { runCatching { it } }.<!TYPE_INFERENCE_UPPER_BOUND_VIOLATED{OI}!>mapNotNull<!> { it.getOrNull() }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContains.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContains.fir.kt
index 04518b17d45..7f11960bfb7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContains.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContains.fir.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: -ProhibitConcurrentHashMapContains
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 class A : java.util.concurrent.ConcurrentHashMap<String, Int>() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContains.kt b/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContains.kt
index fd77d66b085..e72d8472b34 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContains.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContains.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: -ProhibitConcurrentHashMapContains
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 class A : java.util.concurrent.ConcurrentHashMap<String, Int>() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.fir.kt
index 1bb3d96ec2f..6c4d1f7418d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.fir.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +ProhibitConcurrentHashMapContains
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 class A : java.util.concurrent.ConcurrentHashMap<String, Int>() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.kt b/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.kt
index 1a9afcaa480..4fd107f37c6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/java/concurrentHashMapContainsError.kt
@@ -1,5 +1,4 @@
 // !LANGUAGE: +ProhibitConcurrentHashMapContains
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 class A : java.util.concurrent.ConcurrentHashMap<String, Int>() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.kt b/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.kt
index 352dc1bbce9..7e071fa4ecd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/kt7585/delegate.kt
@@ -1,5 +1,4 @@
 // FIR_IDENTICAL
-// !WITH_NEW_INFERENCE
 // NI_EXPECTED_FILE
 // JAVAC_EXPECTED_FILE
 // FILE: Base.java
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.fir.kt
index b2f9ec43367..93a854b424e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 import java.util.*
 
 fun bar(): String? = null
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.kt
index 00923da31df..10dc52d1f23 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayList.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 import java.util.*
 
 fun bar(): String? = null
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayListNullable.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayListNullable.fir.kt
index 17cb82eb4c8..9dca302f648 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayListNullable.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayListNullable.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 import java.util.*
 
 fun bar(): String? = null
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayListNullable.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayListNullable.kt
index 2ae79b83109..fad8fa935c2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayListNullable.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/arrayListNullable.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 import java.util.*
 
 fun bar(): String? = null
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.fir.kt
index 5bedf9d6c26..0f94c65da85 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // JAVAC_EXPECTED_FILE
 
 import java.util.*;
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.kt
index 1afb280e141..a02b987d6d4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableCollection.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // JAVAC_EXPECTED_FILE
 
 import java.util.*;
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.fir.kt
index 6a4b798bea1..6790c181614 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // JAVAC_EXPECTED_FILE
 
 import java.util.*;
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt
index 1c34e9d3988..2db8b8487dc 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/customClassMutableList.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // JAVAC_EXPECTED_FILE
 
 import java.util.*;
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.fir.kt
index d220473c0af..7dd02966ca7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 import java.util.*
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.kt
index 332d36329dd..4a9780e1474 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/maps.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 import java.util.*
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.fir.kt
index 3532b3cc0a4..91cd0c8b596 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 import java.util.*
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.kt
index c64c10ab4f8..00f4da2a757 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableKey.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 import java.util.*
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.fir.kt
index 4b5d2934f06..5b902849e25 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 import java.util.*
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.kt
index 7f2232822de..ad9f38ecdeb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/mapsWithNullableValues.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 import java.util.*
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.fir.kt
index b50262fefeb..ba7f62a8ac0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 import java.util.*
diff --git a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.kt b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.kt
index 20bffd938f8..b9b614f146a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/purelyImplementedCollection/sets.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 // FULL_JDK
 
 import java.util.*
diff --git a/compiler/testData/diagnostics/testsWithStdLib/regression/kt9820_javaFunctionTypeInheritor.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/regression/kt9820_javaFunctionTypeInheritor.fir.kt
index f03f4c96a20..336dc3922ef 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/regression/kt9820_javaFunctionTypeInheritor.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/regression/kt9820_javaFunctionTypeInheritor.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 // FILE: J.java
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/regression/kt9820_javaFunctionTypeInheritor.kt b/compiler/testData/diagnostics/testsWithStdLib/regression/kt9820_javaFunctionTypeInheritor.kt
index 3c5fa188739..40b4be9fcac 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/regression/kt9820_javaFunctionTypeInheritor.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/regression/kt9820_javaFunctionTypeInheritor.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 // FILE: J.java
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/arrayConstruction.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/reified/arrayConstruction.fir.kt
index fba40c1657f..846ac885b61 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/arrayConstruction.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/reified/arrayConstruction.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <T> fail1(): Array<T> = Array(1) { null!! }
 fun <T> ok1(block: () -> Array<T>): Array<T> = block()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/arrayConstruction.kt b/compiler/testData/diagnostics/testsWithStdLib/reified/arrayConstruction.kt
index 547e568f876..6c46aac5dc2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/arrayConstruction.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/reified/arrayConstruction.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 fun <T> fail1(): Array<T> = <!TYPE_PARAMETER_AS_REIFIED!>Array<!>(1) { null!! }
 fun <T> ok1(block: () -> Array<T>): Array<T> = block()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.fir.kt
index 0ce9a24f864..bad24a72390 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNREACHABLE_CODE -UNUSED_VARIABLE -DEPRECATION
-// !WITH_NEW_INFERENCE
 
 inline fun<reified T> foo(block: () -> T): String = block().toString()
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt
index 4dc8c7c7fcf..1ef08806039 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER -UNREACHABLE_CODE -UNUSED_VARIABLE -DEPRECATION
-// !WITH_NEW_INFERENCE
 
 inline fun<reified T> foo(block: () -> T): String = block().toString()
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.fir.kt
index dfa8092a62f..aadc9fb1e0f 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.fir.kt
@@ -1,6 +1,5 @@
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 // FILE: 2.kt
 package b
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.kt
index fd6989c1461..59b728e2021 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers.kt
@@ -1,6 +1,5 @@
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 // FILE: 2.kt
 package b
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.fir.kt
index b67b6649032..1a296925739 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.fir.kt
@@ -1,6 +1,5 @@
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 class A {
     fun forEach() = this
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.kt
index 4280141441d..9b7203ac3bd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/hidesMembers2.kt
@@ -1,6 +1,5 @@
 // !CHECK_TYPE
 // !DIAGNOSTICS: -UNUSED_EXPRESSION -UNUSED_PARAMETER -UNUSED_VARIABLE
-// !WITH_NEW_INFERENCE
 
 class A {
     fun forEach() = this
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.fir.kt
index e373b910122..dcdf6e557c7 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-4711 Error type with no error reported from type inference
 
 fun main() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt
index 0c9e380f3ab..ba0999324f0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/kt4711.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 //KT-4711 Error type with no error reported from type inference
 
 fun main() {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.fir.kt
index 8ee19af58f0..c35dd9409ca 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 // FILE: StaticOverrides.java
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.kt
index 46db0309bb9..0568159f4fa 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samAgainstFunctionalType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !CHECK_TYPE
 
 // FILE: StaticOverrides.java
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.fir.kt
index 60ed93ede03..8c946684397 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.fir.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 
 // FILE: Foo.java
 import kotlin.Unit;
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.kt
index d322cc0befb..f66e9679830 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenerics.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 
 // FILE: Foo.java
 import kotlin.Unit;
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.fir.kt
index 7109542cc20..a806eb5b43e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.fir.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: -RefinedSamAdaptersPriority -NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 
 // FILE: Foo.java
 import kotlin.Unit;
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.kt
index 1570fa4336c..2615131f591 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithGenericsWithoutRefinedSams.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: -RefinedSamAdaptersPriority -NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 
 // FILE: Foo.java
 import kotlin.Unit;
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.fir.kt
index 064aa69a9fb..fc08ccbb3da 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.fir.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: -RefinedSamAdaptersPriority -NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 
 // FILE: Foo.java
 import kotlin.Unit;
diff --git a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.kt b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.kt
index b012f4cfda0..a5c6a91657d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/resolve/samOverloadsWithKtFunctionWithoutRefinedSams.kt
@@ -1,7 +1,6 @@
 // !LANGUAGE: -RefinedSamAdaptersPriority -NewInference
 // !DIAGNOSTICS: -UNUSED_PARAMETER
 // !CHECK_TYPE
-// !WITH_NEW_INFERENCE
 
 // FILE: Foo.java
 import kotlin.Unit;
diff --git a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.fir.kt
index 623169cc967..76650fde7d0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-7186: False "Type mismatch" error
 
 fun indexOfMax(a: IntArray): Int? {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.kt b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.kt
index 7d2507945d1..ee3ecd7926d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/smartcasts/forEachSafe.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // KT-7186: False "Type mismatch" error
 
 fun indexOfMax(a: IntArray): Int? {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.fir.kt
index 2a8349677af..7f2b40b9908 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.fir.kt
@@ -1,6 +1,5 @@
 // !CHECK_TYPE
 // !LANGUAGE: -AdditionalBuiltInsMembers
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 // FULL_JDK
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.kt b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.kt
index ab99897f682..569e6094d48 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/targetedBuiltIns/unsupportedFeature.kt
@@ -1,6 +1,5 @@
 // !CHECK_TYPE
 // !LANGUAGE: -AdditionalBuiltInsMembers
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 // FULL_JDK
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.fir.kt
index 2c11962adef..2f3683bacfe 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 
 class ExcA : Exception()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.kt
index 318c72855e4..1f7a9ff95af 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/assignTry.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 
 class ExcA : Exception()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.fir.kt
index 5e7436f0400..84236834c81 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 // SKIP_TXT
 // Related issue: KT-28370
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.kt
index d3e56a84bab..e43759a23c6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 // SKIP_TXT
 // Related issue: KT-28370
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.fir.kt
index 5da0dd0a0d6..6b6715b544b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +NewDataFlowForTryExpressions
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 // SKIP_TXT
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.kt
index 4aa7fd2bdbf..86d84641cd6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/correctSmartcasts_after.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +NewDataFlowForTryExpressions
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 // SKIP_TXT
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts.fir.kt
index 80e1ae92909..96d61ff3763 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 // Related issue: KT-28370
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts.kt
index 9ca17f05112..dcdc9b41e25 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 // Related issue: KT-28370
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.fir.kt
index cf7cd637230..c26ed51a0fd 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +NewDataFlowForTryExpressions
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 // Related issue: KT-28370
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.kt
index c251e9505ca..f59a6f9bbbb 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falseNegativeSmartcasts_after.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +NewDataFlowForTryExpressions
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 // Related issue: KT-28370
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.fir.kt
index 7aa8bdbce75..e25de2a8790 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 // SKIP_TXT
 // Related issue: KT-28370
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.kt
index d1bfb3cce10..493e322b83a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 // SKIP_TXT
 // Related issue: KT-28370
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.fir.kt
index 7627cccf623..8be2fd96420 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +NewDataFlowForTryExpressions
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 // SKIP_TXT
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.kt
index 96a811dbff8..4b5243073a0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/falsePositiveSmartcasts_after.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !LANGUAGE: +NewDataFlowForTryExpressions
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_VALUE -VARIABLE_WITH_REDUNDANT_INITIALIZER
 // SKIP_TXT
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.fir.kt
index 1c38015fdf9..499101dc1f6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 
 class ExcA : Exception()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.kt b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.kt
index 78c0c735caa..77b468663c5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/tryCatch/tryExpression.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 
 class ExcA : Exception()
diff --git a/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.fir.kt
index d3314901a7c..cb6beac0ad4 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.fir.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 import java.util.*
 
diff --git a/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.kt b/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.kt
index a6037015e9f..d8a6e640302 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.kt
+++ b/compiler/testData/diagnostics/testsWithStdLib/when/noTypeArgumentsInConstructor.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 import java.util.*
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.fir.kt
index 3f7e88a86aa..e9c54daa6d0 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 // TESTCASE NUMBER: 1, 2, 3, 4, 5
 @Retention(AnnotationRetention.RUNTIME)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.kt b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.kt
index 436fb58d2ee..09e7c19f17c 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/11.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/6.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/6.fir.kt
index 623c64e2f89..f200e716961 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/6.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/6.fir.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 // TESTCASE NUMBER: 1, 2
 @Target(AnnotationTarget.TYPE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/6.kt b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/6.kt
index 565d33c4aa9..a12fd9717b0 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/6.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/6.kt
@@ -1,5 +1,4 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.fir.kt
index 2b0a070d581..6ef987fdf1a 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.fir.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 // TESTCASE NUMBER: 1, 2
 @Target(AnnotationTarget.TYPE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.kt b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.kt
index e27ee9b838b..f037f2b3251 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/annotations/type-annotations/neg/7.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/common/neg/1.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/common/neg/1.fir.kt
index 74282ed81cb..71aa474a01d 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/common/neg/1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/common/neg/1.fir.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 // FILE: contracts.kt
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/common/neg/1.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/common/neg/1.kt
index 1b18eb8e123..826cb90e88d 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/common/neg/1.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/common/neg/1.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/1.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/1.fir.kt
index e4c4e2e01b7..329e962da76 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/1.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/1.fir.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 
 // TESTCASE NUMBER: 1
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/1.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/1.kt
index e488e64b3de..730bafb89ef 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/1.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/1.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 
 /*
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/10.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/10.fir.kt
index f267c61b863..5677436a9fc 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/10.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/10.fir.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 // FILE: contracts.kt
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/10.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/10.kt
index 35d82883c83..f3382e5a11c 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/10.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/10.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/15.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/15.fir.kt
index ae077910249..0f20453a78a 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/15.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/15.fir.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 // FILE: contracts.kt
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/15.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/15.kt
index 00b288e938d..699c367cbca 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/15.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/15.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/2.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/2.fir.kt
index d71d493507c..2bacaacb953 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/2.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/2.fir.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 
 // TESTCASE NUMBER: 1
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/2.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/2.kt
index 5bec3f39667..584a04960cf 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/2.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/2.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 
 /*
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.fir.kt
index 5d0f640a453..0a811400e95 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.fir.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 // FILE: contracts.kt
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.kt
index cb125138bf6..ac8f7e9f4a5 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/4.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/5.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/5.fir.kt
index 5c200f212ea..c89d5019168 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/5.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/5.fir.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 // FILE: contracts.kt
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/5.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/5.kt
index e13517a7ef8..88aa37721bb 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/5.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/5.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/6.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/6.fir.kt
index 5795800edec..b63ebf9e6f2 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/6.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/6.fir.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 // FILE: contracts.kt
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/6.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/6.kt
index 4890ef13989..b13a62a8809 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/6.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/6.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.fir.kt
index 66499e6797d..078d75274db 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.fir.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 // FILE: contracts.kt
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.kt
index 39ba9f77be5..ba9f89b324e 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/7.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/8.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/8.fir.kt
index ab9f5489046..71525dd149a 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/8.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/8.fir.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 // FILE: contracts.kt
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/8.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/8.kt
index 6b88b86d5f5..34209919d59 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/8.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/neg/8.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/2.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/2.fir.kt
index 2941017f8f6..f535a627756 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/2.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/2.fir.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 
 // TESTCASE NUMBER: 1
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/2.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/2.kt
index 073cf4ab091..ad0763e7266 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/2.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/2.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 // SKIP_TXT
 
 /*
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.fir.kt
index a432ca8122a..29a780ce06a 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.fir.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 // FILE: contracts.kt
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.kt
index 4eadb0ac635..dab0535d913 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/4.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (POSITIVE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/8.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/8.fir.kt
index 727ad27b035..63d8d0a3b2b 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/8.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/8.fir.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 // FILE: contracts.kt
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/8.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/8.kt
index 890820cf8cb..69d44d2df6b 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/8.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/analysis/smartcasts/pos/8.kt
@@ -1,5 +1,4 @@
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (POSITIVE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/4.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/4.fir.kt
index 8136cb2eff9..891a3951127 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/4.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/4.fir.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -UNREACHABLE_CODE -UNUSED_EXPRESSION
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/4.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/4.kt
index 18c90a02217..c260f66cb35 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/4.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/4.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -UNREACHABLE_CODE -UNUSED_EXPRESSION
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE)
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/5.fir.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/5.fir.kt
index 10b33bf4e7c..72a281712d6 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/5.fir.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/5.fir.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -UNREACHABLE_CODE -UNUSED_EXPRESSION
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 import kotlin.contracts.*
 
diff --git a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/5.kt b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/5.kt
index fd05b41095b..ebee246c2f7 100644
--- a/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/5.kt
+++ b/compiler/tests-spec/testData/diagnostics/notLinked/contracts/declarations/contractBuilder/common/neg/5.kt
@@ -1,6 +1,5 @@
 // !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER -UNREACHABLE_CODE -UNUSED_EXPRESSION
 // !USE_EXPERIMENTAL: kotlin.contracts.ExperimentalContracts
-// !WITH_NEW_INFERENCE
 
 /*
  * KOTLIN DIAGNOSTICS NOT LINKED SPEC TEST (NEGATIVE)
diff --git a/idea/testData/quickfix/changeSignature/addFunctionParameter3.kt b/idea/testData/quickfix/changeSignature/addFunctionParameter3.kt
index e253bab74f5..a40732630e7 100644
--- a/idea/testData/quickfix/changeSignature/addFunctionParameter3.kt
+++ b/idea/testData/quickfix/changeSignature/addFunctionParameter3.kt
@@ -1,10 +1,9 @@
 // "Add parameter to function 'called'" "true"
 // WITH_RUNTIME
 // DISABLE-ERRORS
-// !WITH_NEW_INFERENCE
 
 fun caller() {
     called(<caret>setOf(1, 2, 3))
 }
 
-fun called() {}
\ No newline at end of file
+fun called() {}
diff --git a/idea/testData/quickfix/changeSignature/addFunctionParameter3.kt.after b/idea/testData/quickfix/changeSignature/addFunctionParameter3.kt.after
index 201b5a84940..72e0f7d14cb 100644
--- a/idea/testData/quickfix/changeSignature/addFunctionParameter3.kt.after
+++ b/idea/testData/quickfix/changeSignature/addFunctionParameter3.kt.after
@@ -1,10 +1,9 @@
 // "Add parameter to function 'called'" "true"
 // WITH_RUNTIME
 // DISABLE-ERRORS
-// !WITH_NEW_INFERENCE
 
 fun caller() {
     called(<caret>setOf(1, 2, 3))
 }
 
-fun called(of: Set<Int>) {}
\ No newline at end of file
+fun called(of: Set<Int>) {}
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/noReturnType.kt b/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/noReturnType.kt
index 57a4ca903c4..f37a5d322b7 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/noReturnType.kt
+++ b/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/noReturnType.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER,-UNUSED_VARIABLE
 
 // FILE: Sam.java
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/samConversionSimple.kt b/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/samConversionSimple.kt
index ef8b5bd01b2..34d2dec022a 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/samConversionSimple.kt
+++ b/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/samConversionSimple.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE
 
 // FILE: Sam.java
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/samWithAnnotation.kt b/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/samWithAnnotation.kt
index a38153f21b4..1c7425fa3af 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/samWithAnnotation.kt
+++ b/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/samWithAnnotation.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER,-UNUSED_VARIABLE
 
 // FILE: Sam.java
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/samWithoutAnnotation.kt b/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/samWithoutAnnotation.kt
index 2671b298423..a2e00d31562 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/samWithoutAnnotation.kt
+++ b/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/samWithoutAnnotation.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER,-UNUSED_VARIABLE
 
 // FILE: Sam.java
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/singleParameter.kt b/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/singleParameter.kt
index 15d987229ac..97615e88e55 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/singleParameter.kt
+++ b/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/singleParameter.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE
 
 // FILE: Sam.java
diff --git a/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/singleParameterWithoutAnnotation.kt b/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/singleParameterWithoutAnnotation.kt
index b6f1f790c56..e8e10528104 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/singleParameterWithoutAnnotation.kt
+++ b/plugins/sam-with-receiver/sam-with-receiver-cli/testData/diagnostics/singleParameterWithoutAnnotation.kt
@@ -1,4 +1,3 @@
-// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE
 
 // FILE: Sam.java