diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.kt b/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.kt
index 053c23e3092..1899bc29b10 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.kt
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt25432.kt
@@ -5,7 +5,7 @@ class Data<T>(val s: T)
 
 fun test(d: Data<out Any>) {
     if (d.s is String) {
-        <!OI;DEBUG_INFO_SMARTCAST!>d.s<!>.<!NI;UNRESOLVED_REFERENCE!>length<!>
+        <!DEBUG_INFO_SMARTCAST!>d.s<!>.length
     }
 }
 
diff --git a/compiler/testData/diagnostics/tests/typeParameters/implicitNothingAsTypeParameter.kt b/compiler/testData/diagnostics/tests/typeParameters/implicitNothingAsTypeParameter.kt
index 3e7657019bf..9751ede91ab 100644
--- a/compiler/testData/diagnostics/tests/typeParameters/implicitNothingAsTypeParameter.kt
+++ b/compiler/testData/diagnostics/tests/typeParameters/implicitNothingAsTypeParameter.kt
@@ -91,9 +91,9 @@ interface Worker<out T>
 interface RenderContext<StateT, in OutputT : Any>
 
 val emptyOrNull: List<Nothing>? = null
-val x = emptyOrNull?.<!OI;IMPLICIT_NOTHING_AS_TYPE_PARAMETER!>get<!>(0)
+val x = emptyOrNull?.<!IMPLICIT_NOTHING_AS_TYPE_PARAMETER!>get<!>(0)
 
-val errorCompletion = { <!OI;UNUSED_ANONYMOUS_PARAMETER!>e<!>: Throwable -> throw Exception() }
+val errorCompletion = { <!UNUSED_ANONYMOUS_PARAMETER!>e<!>: Throwable -> throw Exception() }
 
 fun test1() {
     errorCompletion(Exception("fail"))
diff --git a/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.kt b/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.kt
index 87ffe272222..760822a5509 100644
--- a/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.kt
+++ b/compiler/testData/diagnostics/tests/when/withSubjectVariable/smartCastOnValueBoundToSubjectVariable.kt
@@ -44,6 +44,6 @@ fun test5(x: Inv<out Any?>) {
 
 fun test6(x: Inv<out String?>) {
     when (val <!UNUSED_VARIABLE!>y<!> = x.data) {
-        is String -> <!OI;DEBUG_INFO_SMARTCAST!>x.data<!><!NI;UNSAFE_CALL!>.<!>length // should be ok
+        is String -> <!DEBUG_INFO_SMARTCAST!>x.data<!>.length // should be ok
     }
 }
\ No newline at end of file