diff --git a/plugins/kotlin/idea/tests/testData/checker/codeFragments/binaryExpression.kt.fragment.k2 b/plugins/kotlin/idea/tests/testData/checker/codeFragments/binaryExpression.kt.fragment.k2
index b3fa0ce3bdcf..eb9fea713b84 100644
--- a/plugins/kotlin/idea/tests/testData/checker/codeFragments/binaryExpression.kt.fragment.k2
+++ b/plugins/kotlin/idea/tests/testData/checker/codeFragments/binaryExpression.kt.fragment.k2
@@ -1,7 +1 @@
-a <error descr="[OVERLOAD_RESOLUTION_AMBIGUITY] Overload resolution ambiguity between candidates:
-@IntrinsicConstEvaluation() fun plus(other: Byte): Int
-@IntrinsicConstEvaluation() fun plus(other: Double): Double
-@IntrinsicConstEvaluation() fun plus(other: Float): Float
-@IntrinsicConstEvaluation() fun plus(other: Int): Int
-@IntrinsicConstEvaluation() fun plus(other: Long): Long
-@IntrinsicConstEvaluation() fun plus(other: Short): Int">+</error> <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'b'.">b</error>
\ No newline at end of file
+a + <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'b'.">b</error>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/checker/codeFragments/blockCodeFragment.kt.fragment.k2 b/plugins/kotlin/idea/tests/testData/checker/codeFragments/blockCodeFragment.kt.fragment.k2
index 6430ee575ff9..1a9373e11a20 100644
--- a/plugins/kotlin/idea/tests/testData/checker/codeFragments/blockCodeFragment.kt.fragment.k2
+++ b/plugins/kotlin/idea/tests/testData/checker/codeFragments/blockCodeFragment.kt.fragment.k2
@@ -1,8 +1,2 @@
 val b = 1
-a + b <error descr="[OVERLOAD_RESOLUTION_AMBIGUITY] Overload resolution ambiguity between candidates:
-@IntrinsicConstEvaluation() fun plus(other: Byte): Int
-@IntrinsicConstEvaluation() fun plus(other: Double): Double
-@IntrinsicConstEvaluation() fun plus(other: Float): Float
-@IntrinsicConstEvaluation() fun plus(other: Int): Int
-@IntrinsicConstEvaluation() fun plus(other: Long): Long
-@IntrinsicConstEvaluation() fun plus(other: Short): Int">+</error> <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'c'.">c</error>
\ No newline at end of file
+a + b + <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'c'.">c</error>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/checker/codeFragments/contextElementAsStatement.kt.fragment.k2 b/plugins/kotlin/idea/tests/testData/checker/codeFragments/contextElementAsStatement.kt.fragment.k2
index 18001d0a1fbd..d1e32878efc3 100644
--- a/plugins/kotlin/idea/tests/testData/checker/codeFragments/contextElementAsStatement.kt.fragment.k2
+++ b/plugins/kotlin/idea/tests/testData/checker/codeFragments/contextElementAsStatement.kt.fragment.k2
@@ -1,7 +1 @@
-a <error descr="[OVERLOAD_RESOLUTION_AMBIGUITY] Overload resolution ambiguity between candidates:
-@IntrinsicConstEvaluation() fun plus(other: Byte): Int
-@IntrinsicConstEvaluation() fun plus(other: Double): Double
-@IntrinsicConstEvaluation() fun plus(other: Float): Float
-@IntrinsicConstEvaluation() fun plus(other: Int): Int
-@IntrinsicConstEvaluation() fun plus(other: Long): Long
-@IntrinsicConstEvaluation() fun plus(other: Short): Int">+</error> <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'c'.">c</error>
\ No newline at end of file
+a + <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'c'.">c</error>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/checker/codeFragments/localVariables.kt.fragment.k2 b/plugins/kotlin/idea/tests/testData/checker/codeFragments/localVariables.kt.fragment.k2
index c7d87e561042..27a8fa803013 100644
--- a/plugins/kotlin/idea/tests/testData/checker/codeFragments/localVariables.kt.fragment.k2
+++ b/plugins/kotlin/idea/tests/testData/checker/codeFragments/localVariables.kt.fragment.k2
@@ -1,7 +1 @@
-aaa1 <error descr="[OVERLOAD_RESOLUTION_AMBIGUITY] Overload resolution ambiguity between candidates:
-@IntrinsicConstEvaluation() fun plus(other: Byte): Int
-@IntrinsicConstEvaluation() fun plus(other: Double): Double
-@IntrinsicConstEvaluation() fun plus(other: Float): Float
-@IntrinsicConstEvaluation() fun plus(other: Int): Int
-@IntrinsicConstEvaluation() fun plus(other: Long): Long
-@IntrinsicConstEvaluation() fun plus(other: Short): Int">+</error> <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'aaa3'.">aaa3</error>
\ No newline at end of file
+aaa1 + <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'aaa3'.">aaa3</error>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/checker/codeFragments/primaryConstructor.kt.fragment.k2 b/plugins/kotlin/idea/tests/testData/checker/codeFragments/primaryConstructor.kt.fragment.k2
index c6250a384548..f8ef5bff0152 100644
--- a/plugins/kotlin/idea/tests/testData/checker/codeFragments/primaryConstructor.kt.fragment.k2
+++ b/plugins/kotlin/idea/tests/testData/checker/codeFragments/primaryConstructor.kt.fragment.k2
@@ -1,7 +1 @@
-a <error descr="[OVERLOAD_RESOLUTION_AMBIGUITY] Overload resolution ambiguity between candidates:
-@IntrinsicConstEvaluation() fun plus(other: Byte): Int
-@IntrinsicConstEvaluation() fun plus(other: Double): Double
-@IntrinsicConstEvaluation() fun plus(other: Float): Float
-@IntrinsicConstEvaluation() fun plus(other: Int): Int
-@IntrinsicConstEvaluation() fun plus(other: Long): Long
-@IntrinsicConstEvaluation() fun plus(other: Short): Int">+</error> <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'c'.">c</error> + <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'd'.">d</error> + <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'e'.">e</error>
\ No newline at end of file
+a + <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'c'.">c</error> + <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'd'.">d</error> + <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'e'.">e</error>
\ No newline at end of file
diff --git a/plugins/kotlin/idea/tests/testData/checker/codeFragments/primaryConstructorLocal.kt.fragment.k2 b/plugins/kotlin/idea/tests/testData/checker/codeFragments/primaryConstructorLocal.kt.fragment.k2
index eb2655f8d5b5..a9f997be7572 100644
--- a/plugins/kotlin/idea/tests/testData/checker/codeFragments/primaryConstructorLocal.kt.fragment.k2
+++ b/plugins/kotlin/idea/tests/testData/checker/codeFragments/primaryConstructorLocal.kt.fragment.k2
@@ -1,7 +1 @@
-local + a <error descr="[OVERLOAD_RESOLUTION_AMBIGUITY] Overload resolution ambiguity between candidates:
-@IntrinsicConstEvaluation() fun plus(other: Byte): Int
-@IntrinsicConstEvaluation() fun plus(other: Double): Double
-@IntrinsicConstEvaluation() fun plus(other: Float): Float
-@IntrinsicConstEvaluation() fun plus(other: Int): Int
-@IntrinsicConstEvaluation() fun plus(other: Long): Long
-@IntrinsicConstEvaluation() fun plus(other: Short): Int">+</error> <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'c'.">c</error> + <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'd'.">d</error> + <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'e'.">e</error>
\ No newline at end of file
+local + a + <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'c'.">c</error> + <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'd'.">d</error> + <error descr="[UNRESOLVED_REFERENCE] Unresolved reference 'e'.">e</error>
\ No newline at end of file