diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.jet b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.jet
index 94d44069aec..9464d13025c 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.jet
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.jet
@@ -6,8 +6,8 @@ fun foo() {
     bar(<!TYPE_MISMATCH!>x<!>)
     if (x != null) bar(x<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>)
     if (x == null) bar(x!!)
-    if (x != null) else bar(x!!)
+    if (x != null) else bar(x<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>)
     if (x == null) else bar(x<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>)
-    if (x != null) bar(x<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>) else bar(x!!)
-    if (x == null) bar(x!!) else bar(x<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>)
+    if (x != null) bar(x<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>) else bar(x<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>)
+    if (x == null) bar(x<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>) else bar(x<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>)
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/AssertNotNull.jet b/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/AssertNotNull.jet
index bf91b286d2b..6da7a053503 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/AssertNotNull.jet
+++ b/compiler/testData/diagnostics/tests/nullabilityAndAutoCasts/AssertNotNull.jet
@@ -2,11 +2,11 @@ fun main(args : Array<String>) {
     val a : Int? = null
     val b : Int? = null
     a!! : Int
-    a!! + 2
-    a!!.plus(2)
-    a!!.plus(b!!)
-    2.plus(b!!)
-    2 + b!!
+    a<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!> + 2
+    a<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.plus(2)
+    a<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>.plus(b!!)
+    2.plus(b<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>)
+    2 + b<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>
 
     val c = 1
     c<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!>
@@ -30,6 +30,6 @@ fun main(args : Array<String>) {
         }
     }
 
-    val <!UNUSED_VARIABLE!>f<!> : String = <!TYPE_MISMATCH!>a!!<!>
-    <!TYPE_MISMATCH!>a!!<!> : String
+    val <!UNUSED_VARIABLE!>f<!> : String = <!TYPE_MISMATCH!>a<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!><!>
+    <!TYPE_MISMATCH!>a<!UNNECESSARY_NOT_NULL_ASSERTION!>!!<!><!> : String
 }
\ No newline at end of file