diff --git a/idea/testData/intentions/addThrowsAnnotation/if.kt b/idea/testData/intentions/addThrowsAnnotation/if.kt
index 71de6c98ee0..b3b8eaa8856 100644
--- a/idea/testData/intentions/addThrowsAnnotation/if.kt
+++ b/idea/testData/intentions/addThrowsAnnotation/if.kt
@@ -1,3 +1,4 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 // WITH_RUNTIME
 
 fun a(b: Boolean) {
diff --git a/idea/testData/intentions/addThrowsAnnotation/if.kt.after b/idea/testData/intentions/addThrowsAnnotation/if.kt.after
index b031061a9cd..bfdcd7c57a9 100644
--- a/idea/testData/intentions/addThrowsAnnotation/if.kt.after
+++ b/idea/testData/intentions/addThrowsAnnotation/if.kt.after
@@ -1,3 +1,4 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 // WITH_RUNTIME
 
 @Throws(Throwable::class)
diff --git a/idea/testData/intentions/addThrowsAnnotation/if_ni.kt b/idea/testData/intentions/addThrowsAnnotation/if_ni.kt
new file mode 100644
index 00000000000..d73ce900a89
--- /dev/null
+++ b/idea/testData/intentions/addThrowsAnnotation/if_ni.kt
@@ -0,0 +1,6 @@
+// COMPILER_ARGUMENTS: -XXLanguage:+NewInference
+// WITH_RUNTIME
+
+fun a(b: Boolean) {
+    <caret>throw if (b) RuntimeException() else Exception()
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/addThrowsAnnotation/if_ni.kt.after b/idea/testData/intentions/addThrowsAnnotation/if_ni.kt.after
new file mode 100644
index 00000000000..54bd789f181
--- /dev/null
+++ b/idea/testData/intentions/addThrowsAnnotation/if_ni.kt.after
@@ -0,0 +1,7 @@
+// COMPILER_ARGUMENTS: -XXLanguage:+NewInference
+// WITH_RUNTIME
+
+@Throws(Exception::class)
+fun a(b: Boolean) {
+    throw if (b) RuntimeException() else Exception()
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/convertLambdaToReference/varargFunction2.kt b/idea/testData/intentions/convertLambdaToReference/varargFunction2.kt
index 92bbc44a452..724cd08832b 100644
--- a/idea/testData/intentions/convertLambdaToReference/varargFunction2.kt
+++ b/idea/testData/intentions/convertLambdaToReference/varargFunction2.kt
@@ -1,3 +1,4 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 // WITH_RUNTIME
 fun test(vararg i: Int): IntArray {
     return i.let { <caret>double(*it) }
diff --git a/idea/testData/intentions/convertLambdaToReference/varargFunction2.kt.after b/idea/testData/intentions/convertLambdaToReference/varargFunction2.kt.after
index 58a192dd7c1..8689602ab1b 100644
--- a/idea/testData/intentions/convertLambdaToReference/varargFunction2.kt.after
+++ b/idea/testData/intentions/convertLambdaToReference/varargFunction2.kt.after
@@ -1,3 +1,4 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 // WITH_RUNTIME
 fun test(vararg i: Int): IntArray {
     return i.let(::double)
diff --git a/idea/testData/intentions/convertReferenceToLambda/if1.kt b/idea/testData/intentions/convertReferenceToLambda/if1.kt
index 1ebfb03c327..17dddc3bba2 100644
--- a/idea/testData/intentions/convertReferenceToLambda/if1.kt
+++ b/idea/testData/intentions/convertReferenceToLambda/if1.kt
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar() = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/if1.kt.after b/idea/testData/intentions/convertReferenceToLambda/if1.kt.after
index 476cba7c212..14866c8e531 100644
--- a/idea/testData/intentions/convertReferenceToLambda/if1.kt.after
+++ b/idea/testData/intentions/convertReferenceToLambda/if1.kt.after
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar() = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/if2.kt b/idea/testData/intentions/convertReferenceToLambda/if2.kt
index 50ea90c1f4d..dc73da75483 100644
--- a/idea/testData/intentions/convertReferenceToLambda/if2.kt
+++ b/idea/testData/intentions/convertReferenceToLambda/if2.kt
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar() = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/if2.kt.after b/idea/testData/intentions/convertReferenceToLambda/if2.kt.after
index d3f04b752c8..a31ffa3b704 100644
--- a/idea/testData/intentions/convertReferenceToLambda/if2.kt.after
+++ b/idea/testData/intentions/convertReferenceToLambda/if2.kt.after
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar() = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/if3.kt b/idea/testData/intentions/convertReferenceToLambda/if3.kt
index 97d2e712196..94545fc3c99 100644
--- a/idea/testData/intentions/convertReferenceToLambda/if3.kt
+++ b/idea/testData/intentions/convertReferenceToLambda/if3.kt
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar() = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/if3.kt.after b/idea/testData/intentions/convertReferenceToLambda/if3.kt.after
index 0ff04fff880..26132d1a5a8 100644
--- a/idea/testData/intentions/convertReferenceToLambda/if3.kt.after
+++ b/idea/testData/intentions/convertReferenceToLambda/if3.kt.after
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar() = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/if4.kt b/idea/testData/intentions/convertReferenceToLambda/if4.kt
index e6cbc23f749..39dcd413d94 100644
--- a/idea/testData/intentions/convertReferenceToLambda/if4.kt
+++ b/idea/testData/intentions/convertReferenceToLambda/if4.kt
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar(a: String) = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/if4.kt.after b/idea/testData/intentions/convertReferenceToLambda/if4.kt.after
index d6bad6fd334..896d940632a 100644
--- a/idea/testData/intentions/convertReferenceToLambda/if4.kt.after
+++ b/idea/testData/intentions/convertReferenceToLambda/if4.kt.after
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar(a: String) = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/when1.kt b/idea/testData/intentions/convertReferenceToLambda/when1.kt
index 7105fbd2b94..7a615e28425 100644
--- a/idea/testData/intentions/convertReferenceToLambda/when1.kt
+++ b/idea/testData/intentions/convertReferenceToLambda/when1.kt
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar() = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/when1.kt.after b/idea/testData/intentions/convertReferenceToLambda/when1.kt.after
index 9cadec37492..9df84faa45f 100644
--- a/idea/testData/intentions/convertReferenceToLambda/when1.kt.after
+++ b/idea/testData/intentions/convertReferenceToLambda/when1.kt.after
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar() = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/when2.kt b/idea/testData/intentions/convertReferenceToLambda/when2.kt
index b20271c5f9e..3a3b1bb8bcb 100644
--- a/idea/testData/intentions/convertReferenceToLambda/when2.kt
+++ b/idea/testData/intentions/convertReferenceToLambda/when2.kt
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar() = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/when2.kt.after b/idea/testData/intentions/convertReferenceToLambda/when2.kt.after
index 39806fa5b19..38f4db61219 100644
--- a/idea/testData/intentions/convertReferenceToLambda/when2.kt.after
+++ b/idea/testData/intentions/convertReferenceToLambda/when2.kt.after
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar() = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/when3.kt b/idea/testData/intentions/convertReferenceToLambda/when3.kt
index 1beb36ac104..c8876039f95 100644
--- a/idea/testData/intentions/convertReferenceToLambda/when3.kt
+++ b/idea/testData/intentions/convertReferenceToLambda/when3.kt
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar() = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/when3.kt.after b/idea/testData/intentions/convertReferenceToLambda/when3.kt.after
index 02f3b630133..7cb9ac25c02 100644
--- a/idea/testData/intentions/convertReferenceToLambda/when3.kt.after
+++ b/idea/testData/intentions/convertReferenceToLambda/when3.kt.after
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar() = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/when4.kt b/idea/testData/intentions/convertReferenceToLambda/when4.kt
index ff21bc95dc0..24a982cb9d9 100644
--- a/idea/testData/intentions/convertReferenceToLambda/when4.kt
+++ b/idea/testData/intentions/convertReferenceToLambda/when4.kt
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar(a: String) = 1
 
diff --git a/idea/testData/intentions/convertReferenceToLambda/when4.kt.after b/idea/testData/intentions/convertReferenceToLambda/when4.kt.after
index 0403f33b5cf..402231ce798 100644
--- a/idea/testData/intentions/convertReferenceToLambda/when4.kt.after
+++ b/idea/testData/intentions/convertReferenceToLambda/when4.kt.after
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 class Test {
     fun bar(a: String) = 1
 
diff --git a/idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified.kt b/idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified.kt
index 0d9706e1075..e269859aeca 100644
--- a/idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified.kt
+++ b/idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified.kt
@@ -1,3 +1,4 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 // RUNTIME_WITH_FULL_JDK
 
 import java.util.*
diff --git a/idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified.kt.after b/idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified.kt.after
index 924a8dd240a..e5217d2f383 100644
--- a/idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified.kt.after
+++ b/idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified.kt.after
@@ -1,3 +1,4 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
 // RUNTIME_WITH_FULL_JDK
 
 import java.util.*
diff --git a/idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified_ni.kt b/idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified_ni.kt
new file mode 100644
index 00000000000..dbce3cbf495
--- /dev/null
+++ b/idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified_ni.kt
@@ -0,0 +1,10 @@
+// COMPILER_ARGUMENTS: -XXLanguage:+NewInference
+// RUNTIME_WITH_FULL_JDK
+
+import java.util.*
+
+fun foo(f: () -> ArrayDeque<*>) {}
+
+fun test() {
+    foo <caret>{ ArrayDeque<Int>() }
+}
diff --git a/idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified_ni.kt.after b/idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified_ni.kt.after
new file mode 100644
index 00000000000..9f04281b337
--- /dev/null
+++ b/idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified_ni.kt.after
@@ -0,0 +1,12 @@
+// COMPILER_ARGUMENTS: -XXLanguage:+NewInference
+// RUNTIME_WITH_FULL_JDK
+
+import java.util.*
+
+fun foo(f: () -> ArrayDeque<*>) {}
+
+fun test() {
+    foo(fun(): ArrayDeque<*> {
+        return ArrayDeque<Int>()
+    })
+}
diff --git a/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn.kt b/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn.kt
index 8a2e3a4464d..6ed3394fbd7 100644
--- a/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn.kt
+++ b/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn.kt
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 val s = Sam<caret> { b ->
     if (b) return@Sam "x"
     "y"
diff --git a/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn.kt.after b/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn.kt.after
index be58323e721..3941160f77f 100644
--- a/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn.kt.after
+++ b/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn.kt.after
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 val s = object : Sam {
     override fun test(b: Boolean): String {
         if (b) return "x"
diff --git a/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn_ni.1.java b/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn_ni.1.java
new file mode 100644
index 00000000000..f5575e47ae6
--- /dev/null
+++ b/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn_ni.1.java
@@ -0,0 +1,3 @@
+public interface Sam {
+    String test(Boolean b);
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn_ni.1.java.after b/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn_ni.1.java.after
new file mode 100644
index 00000000000..f5575e47ae6
--- /dev/null
+++ b/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn_ni.1.java.after
@@ -0,0 +1,3 @@
+public interface Sam {
+    String test(Boolean b);
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn_ni.kt b/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn_ni.kt
new file mode 100644
index 00000000000..508868be544
--- /dev/null
+++ b/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn_ni.kt
@@ -0,0 +1,6 @@
+// COMPILER_ARGUMENTS: -XXLanguage:+NewInference
+
+val s = Sam<caret> { b ->
+    if (b) return@Sam "x"
+    "y"
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn_ni.kt.after b/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn_ni.kt.after
new file mode 100644
index 00000000000..8110f7813b5
--- /dev/null
+++ b/idea/testData/intentions/samConversionToAnonymousObject/labeledReturn_ni.kt.after
@@ -0,0 +1,8 @@
+// COMPILER_ARGUMENTS: -XXLanguage:+NewInference
+
+val s = object : Sam {
+    override fun test(b: Boolean): String? {
+        if (b) return "x"
+        return "y"
+    }
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/samConversionToAnonymousObject/typeArgument.kt b/idea/testData/intentions/samConversionToAnonymousObject/typeArgument.kt
index f5e4fecfc1d..4a96ccce58c 100644
--- a/idea/testData/intentions/samConversionToAnonymousObject/typeArgument.kt
+++ b/idea/testData/intentions/samConversionToAnonymousObject/typeArgument.kt
@@ -1 +1,3 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 val a = <caret>A<Int, String> { "" }
\ No newline at end of file
diff --git a/idea/testData/intentions/samConversionToAnonymousObject/typeArgument.kt.after b/idea/testData/intentions/samConversionToAnonymousObject/typeArgument.kt.after
index 75a18c30a2f..e0e636613eb 100644
--- a/idea/testData/intentions/samConversionToAnonymousObject/typeArgument.kt.after
+++ b/idea/testData/intentions/samConversionToAnonymousObject/typeArgument.kt.after
@@ -1,3 +1,5 @@
+// COMPILER_ARGUMENTS: -XXLanguage:-NewInference
+
 val a = object : A<Int, String> {
     override fun foo(it: Int): String {
         return ""
diff --git a/idea/testData/intentions/samConversionToAnonymousObject/typeArgument_ni.1.java b/idea/testData/intentions/samConversionToAnonymousObject/typeArgument_ni.1.java
new file mode 100644
index 00000000000..ad5af42f392
--- /dev/null
+++ b/idea/testData/intentions/samConversionToAnonymousObject/typeArgument_ni.1.java
@@ -0,0 +1,3 @@
+public interface A <T, U> {
+    U foo(T x);
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/samConversionToAnonymousObject/typeArgument_ni.1.java.after b/idea/testData/intentions/samConversionToAnonymousObject/typeArgument_ni.1.java.after
new file mode 100644
index 00000000000..ad5af42f392
--- /dev/null
+++ b/idea/testData/intentions/samConversionToAnonymousObject/typeArgument_ni.1.java.after
@@ -0,0 +1,3 @@
+public interface A <T, U> {
+    U foo(T x);
+}
\ No newline at end of file
diff --git a/idea/testData/intentions/samConversionToAnonymousObject/typeArgument_ni.kt b/idea/testData/intentions/samConversionToAnonymousObject/typeArgument_ni.kt
new file mode 100644
index 00000000000..bbfba2d84b9
--- /dev/null
+++ b/idea/testData/intentions/samConversionToAnonymousObject/typeArgument_ni.kt
@@ -0,0 +1,3 @@
+// COMPILER_ARGUMENTS: -XXLanguage:+NewInference
+
+val a = <caret>A<Int, String> { "" }
\ No newline at end of file
diff --git a/idea/testData/intentions/samConversionToAnonymousObject/typeArgument_ni.kt.after b/idea/testData/intentions/samConversionToAnonymousObject/typeArgument_ni.kt.after
new file mode 100644
index 00000000000..dd099d4aa77
--- /dev/null
+++ b/idea/testData/intentions/samConversionToAnonymousObject/typeArgument_ni.kt.after
@@ -0,0 +1,7 @@
+// COMPILER_ARGUMENTS: -XXLanguage:+NewInference
+
+val a = object : A<Int, String> {
+    override fun foo(it: Int): String? {
+        return ""
+    }
+}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
index 15e43a87480..a4119faf57e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java
@@ -1810,6 +1810,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             runTest("idea/testData/intentions/addThrowsAnnotation/if.kt");
         }
 
+        @TestMetadata("if_ni.kt")
+        public void testIf_ni() throws Exception {
+            runTest("idea/testData/intentions/addThrowsAnnotation/if_ni.kt");
+        }
+
         @TestMetadata("inConstructor.kt")
         public void testInConstructor() throws Exception {
             runTest("idea/testData/intentions/addThrowsAnnotation/inConstructor.kt");
@@ -11115,6 +11120,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             runTest("idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified.kt");
         }
 
+        @TestMetadata("fullyQualified_ni.kt")
+        public void testFullyQualified_ni() throws Exception {
+            runTest("idea/testData/intentions/lambdaToAnonymousFunction/fullyQualified_ni.kt");
+        }
+
         @TestMetadata("hasComment.kt")
         public void testHasComment() throws Exception {
             runTest("idea/testData/intentions/lambdaToAnonymousFunction/hasComment.kt");
@@ -16148,6 +16158,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             runTest("idea/testData/intentions/samConversionToAnonymousObject/labeledReturn.kt");
         }
 
+        @TestMetadata("labeledReturn_ni.kt")
+        public void testLabeledReturn_ni() throws Exception {
+            runTest("idea/testData/intentions/samConversionToAnonymousObject/labeledReturn_ni.kt");
+        }
+
         @TestMetadata("notJavaInterface.kt")
         public void testNotJavaInterface() throws Exception {
             runTest("idea/testData/intentions/samConversionToAnonymousObject/notJavaInterface.kt");
@@ -16183,6 +16198,11 @@ public class IntentionTestGenerated extends AbstractIntentionTest {
             runTest("idea/testData/intentions/samConversionToAnonymousObject/typeArgument.kt");
         }
 
+        @TestMetadata("typeArgument_ni.kt")
+        public void testTypeArgument_ni() throws Exception {
+            runTest("idea/testData/intentions/samConversionToAnonymousObject/typeArgument_ni.kt");
+        }
+
         @TestMetadata("usedSameFunction.kt")
         public void testUsedSameFunction() throws Exception {
             runTest("idea/testData/intentions/samConversionToAnonymousObject/usedSameFunction.kt");