diff --git a/compiler/testData/codegen/bytecodeText/deadCodeElimination/boxing.kt b/compiler/testData/codegen/bytecodeText/deadCodeElimination/boxing.kt
index 57a5709bef9..eb89c83d477 100644
--- a/compiler/testData/codegen/bytecodeText/deadCodeElimination/boxing.kt
+++ b/compiler/testData/codegen/bytecodeText/deadCodeElimination/boxing.kt
@@ -16,13 +16,12 @@ fun box() {
 }
 
 // 0 IFNULL
-// 0 checkNotNull
+// 0 IFNONULL
+// 0 throwNpe
 // 0 ATHROW
 
 // JVM_TEMPLATES:
-// 1 IFNONNULL
-// 1 throwNpe
+// 1 checkNotNull \(Ljava/lang/Object;\)V
 
 // JVM_IR_TEMPLATES:
-// 0 IFNONULL
-// 0 throwNpe
+// 0 checkNotNull \(Ljava/lang/Object;\)V
diff --git a/compiler/testData/codegen/bytecodeText/deadCodeElimination/boxingNotOptimizable.kt b/compiler/testData/codegen/bytecodeText/deadCodeElimination/boxingNotOptimizable.kt
index aa68d3445b7..bbe5e729ed0 100644
--- a/compiler/testData/codegen/bytecodeText/deadCodeElimination/boxingNotOptimizable.kt
+++ b/compiler/testData/codegen/bytecodeText/deadCodeElimination/boxingNotOptimizable.kt
@@ -16,7 +16,7 @@ fun box(u: Int) {
 }
 
 // 0 IFNULL
-// 1 IFNONNULL
-// 1 throwNpe
+// 0 IFNONNULL
+// 0 throwNpe
 // 0 ATHROW
-// 0 checkNotNull
+// 1 checkNotNull \(Ljava/lang/Object;\)V
diff --git a/compiler/testData/codegen/bytecodeText/deadCodeElimination/simpleConstructorNotRedundant.kt b/compiler/testData/codegen/bytecodeText/deadCodeElimination/simpleConstructorNotRedundant.kt
index 5b97c21b4a7..90f94a53c27 100644
--- a/compiler/testData/codegen/bytecodeText/deadCodeElimination/simpleConstructorNotRedundant.kt
+++ b/compiler/testData/codegen/bytecodeText/deadCodeElimination/simpleConstructorNotRedundant.kt
@@ -13,12 +13,7 @@ fun box() {
 }
 
 // 0 IFNULL
-// 0 ATHROW
-// 0 checkNotNull
-// 1 throwNpe
-
-// JVM_TEMPLATES:
-// 1 IFNONNULL
-
-// JVM_IR_TEMPLATES:
 // 0 IFNONNULL
+// 0 ATHROW
+// 1 checkNotNull \(Ljava/lang/Object;\)V
+// 0 throwNpe
diff --git a/compiler/testData/codegen/bytecodeText/deadCodeElimination/simpleConstructorNotRedundantNotOptimizable.kt b/compiler/testData/codegen/bytecodeText/deadCodeElimination/simpleConstructorNotRedundantNotOptimizable.kt
index cd2c75cc163..7c884311f4a 100644
--- a/compiler/testData/codegen/bytecodeText/deadCodeElimination/simpleConstructorNotRedundantNotOptimizable.kt
+++ b/compiler/testData/codegen/bytecodeText/deadCodeElimination/simpleConstructorNotRedundantNotOptimizable.kt
@@ -13,7 +13,7 @@ fun box(u: Int) {
 }
 
 // 0 IFNULL
-// 1 IFNONNULL
-// 1 throwNpe
+// 0 IFNONNULL
+// 0 throwNpe
+// 1 checkNotNull \(Ljava/lang/Object;\)V
 // 0 ATHROW
-// 0 checkNotNull
diff --git a/compiler/testData/codegen/bytecodeText/inlineClasses/assertionsForParametersOfInlineClassTypes.kt b/compiler/testData/codegen/bytecodeText/inlineClasses/assertionsForParametersOfInlineClassTypes.kt
index 3e57e407647..6f2c8d0fa1e 100644
--- a/compiler/testData/codegen/bytecodeText/inlineClasses/assertionsForParametersOfInlineClassTypes.kt
+++ b/compiler/testData/codegen/bytecodeText/inlineClasses/assertionsForParametersOfInlineClassTypes.kt
@@ -18,5 +18,5 @@ fun asNullableReference(c: AsNonNullReference?) {}
 // 6 checkNotNullParameter
 
 // JVM_IR_TEMPLATES
-// 4 checkParameterIsNotNull
-// 0 checkNotNullParameter
+// 0 checkParameterIsNotNull
+// 4 checkNotNullParameter
diff --git a/compiler/testData/codegen/bytecodeText/intConstantNullable.kt b/compiler/testData/codegen/bytecodeText/intConstantNullable.kt
index 648b9154190..0d51344a0a6 100644
--- a/compiler/testData/codegen/bytecodeText/intConstantNullable.kt
+++ b/compiler/testData/codegen/bytecodeText/intConstantNullable.kt
@@ -2,4 +2,4 @@ val a : Int? = 10
 
 fun foo() = a!!.toString()
 
-// 1 IFNONNULL
+// 1 checkNotNull \(Ljava/lang/Object;\)V
diff --git a/compiler/testData/codegen/bytecodeText/lazyCodegen/negateObjectComp.kt b/compiler/testData/codegen/bytecodeText/lazyCodegen/negateObjectComp.kt
index 97a4da19884..33e31b07b63 100644
--- a/compiler/testData/codegen/bytecodeText/lazyCodegen/negateObjectComp.kt
+++ b/compiler/testData/codegen/bytecodeText/lazyCodegen/negateObjectComp.kt
@@ -6,5 +6,5 @@ fun test3() {
         val p = 1
     }
 }
-// 2 IFNONNULL
-// 3 IF
+// 2 checkNotNull \(Ljava/lang/Object;\)V
+// 1 IF_ICMP
diff --git a/compiler/testData/codegen/bytecodeText/lazyCodegen/negateObjectCompChaing.kt b/compiler/testData/codegen/bytecodeText/lazyCodegen/negateObjectCompChaing.kt
index 697e7bc0927..df7c89c547e 100644
--- a/compiler/testData/codegen/bytecodeText/lazyCodegen/negateObjectCompChaing.kt
+++ b/compiler/testData/codegen/bytecodeText/lazyCodegen/negateObjectCompChaing.kt
@@ -6,5 +6,5 @@ fun test3() {
         val p = 1
     }
 }
-// 2 IFNONNULL
-// 3 IF
+// 2 checkNotNull \(Ljava/lang/Object;\)V
+// 1 IF_ICMP
diff --git a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/expressionValueIsNotNullAfterExclExcl.kt b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/expressionValueIsNotNullAfterExclExcl.kt
index c751a9fe5b7..ddb02abc4a9 100644
--- a/compiler/testData/codegen/bytecodeText/nullCheckOptimization/expressionValueIsNotNullAfterExclExcl.kt
+++ b/compiler/testData/codegen/bytecodeText/nullCheckOptimization/expressionValueIsNotNullAfterExclExcl.kt
@@ -20,5 +20,5 @@ fun test() {
 
 // @KKt.class:
 // 0 IFNULL
-// 1 IFNONNULL
+// 1 checkNotNull \(Ljava/lang/Object;\)V
 // 0 NULL-1
\ No newline at end of file