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 9191cf2eb5e..57a4ca903c4 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,3 +1,4 @@
+// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER,-UNUSED_VARIABLE
 
 // FILE: Sam.java
@@ -10,9 +11,9 @@ public interface Sam {
 annotation class SamWithReceiver
 
 fun test() {
-    Sam { <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>a, <!CANNOT_INFER_PARAMETER_TYPE!>b<!><!> ->
+    Sam <!NI;TYPE_MISMATCH!>{ <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>a, <!CANNOT_INFER_PARAMETER_TYPE!>b<!><!> ->
         System.out.println(a)
-    }
+    }<!>
 
     Sam { b ->
         val a: String = this
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 35e4aa2b000..ef8b5bd01b2 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,3 +1,4 @@
+// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE
 
 // FILE: Sam.java
@@ -17,6 +18,6 @@ annotation class SamWithReceiver
 fun test() {
     val e = Exec()
 
-    e.exec <!TYPE_MISMATCH!>{ <!CANNOT_INFER_PARAMETER_TYPE!>a<!> -> System.out.println(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>) }<!>
+    e.exec <!TYPE_MISMATCH!>{ <!CANNOT_INFER_PARAMETER_TYPE, NI;EXPECTED_PARAMETERS_NUMBER_MISMATCH!>a<!> -> System.out.<!NI;OVERLOAD_RESOLUTION_AMBIGUITY!>println<!>(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>) }<!>
     e.exec { System.out.println(this) }
 }
\ No newline at end of file
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 374bdb3fb52..a38153f21b4 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,3 +1,4 @@
+// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER,-UNUSED_VARIABLE
 
 // FILE: Sam.java
@@ -10,10 +11,10 @@ public interface Sam {
 annotation class SamWithReceiver
 
 fun test() {
-    Sam { <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>a, <!CANNOT_INFER_PARAMETER_TYPE!>b<!><!> ->
+    Sam <!NI;TYPE_MISMATCH!>{ <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>a, <!CANNOT_INFER_PARAMETER_TYPE!>b<!><!> ->
         System.out.println(a)
         ""
-    }
+    }<!>
 
     Sam { b ->
         val a: String = this
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 cbc1a3503f2..2671b298423 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,3 +1,4 @@
+// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_ANONYMOUS_PARAMETER,-UNUSED_VARIABLE
 
 // FILE: Sam.java
@@ -12,9 +13,9 @@ fun test() {
         ""
     }
 
-    Sam { <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>b<!> ->
+    Sam <!NI;TYPE_MISMATCH!>{ <!EXPECTED_PARAMETERS_NUMBER_MISMATCH!>b<!> ->
         val a = <!NO_THIS!>this@Sam<!>
-        System.out.println(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>)
+        System.out.<!NI;OVERLOAD_RESOLUTION_AMBIGUITY!>println<!>(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>)
         ""
-    }
+    }<!>
 }
\ No newline at end of file
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 cb7bc7aac4b..15d987229ac 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,3 +1,4 @@
+// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE
 
 // FILE: Sam.java
@@ -10,9 +11,9 @@ public interface Sam {
 annotation class SamWithReceiver
 
 fun test() {
-    Sam { <!CANNOT_INFER_PARAMETER_TYPE, EXPECTED_PARAMETERS_NUMBER_MISMATCH!>a<!> ->
-        System.out.println(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>)
-    }
+    Sam <!NI;TYPE_MISMATCH!>{ <!CANNOT_INFER_PARAMETER_TYPE, EXPECTED_PARAMETERS_NUMBER_MISMATCH!>a<!> ->
+        System.out.<!NI;OVERLOAD_RESOLUTION_AMBIGUITY!>println<!>(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>)
+    }<!>
 
     Sam {
         val a: String = this
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 b46a5dae94c..b6f1f790c56 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,3 +1,4 @@
+// !WITH_NEW_INFERENCE
 // !DIAGNOSTICS: -UNUSED_PARAMETER,-UNUSED_VARIABLE
 
 // FILE: Sam.java
@@ -13,6 +14,6 @@ fun test() {
 
     Sam {
         val a = <!NO_THIS!>this<!>
-        System.out.println(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>)
+        System.out.<!NI;OVERLOAD_RESOLUTION_AMBIGUITY!>println<!>(<!DEBUG_INFO_ELEMENT_WITH_ERROR_TYPE!>a<!>)
     }
 }
\ No newline at end of file