diff --git a/compiler/testData/codegen/bytecodeText/inline/linenumberForNoParametersArgumentCallInExpression.kt b/compiler/testData/codegen/bytecodeText/inline/linenumberForNoParametersArgumentCallInExpression.kt
deleted file mode 100644
index 5506819e5e4..00000000000
--- a/compiler/testData/codegen/bytecodeText/inline/linenumberForNoParametersArgumentCallInExpression.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-fun box() {
-    lookAtMe {
-        12
-    }
-}
-
-inline fun lookAtMe(f: () -> Int): Int {
-    val a = 42
-    a + f() // Even this line already has meaningful instraction nop is still generated
-    return 13
-}
-
-// TODO: Less NOPs is better
-// 2 NOP
\ No newline at end of file
diff --git a/compiler/testData/lineNumber/custom/ifThen.kt b/compiler/testData/lineNumber/custom/ifThen.kt
index ddb3b7c7ae6..887ddee99d6 100644
--- a/compiler/testData/lineNumber/custom/ifThen.kt
+++ b/compiler/testData/lineNumber/custom/ifThen.kt
@@ -1,7 +1,9 @@
 fun foo() {
-    if (0 < 1) {
+    if (flag) {
         return
     }
 }
 
-// 2 3 5
+val flag = true
+
+// 2 3 5 7 7
\ No newline at end of file
diff --git a/compiler/testData/lineNumber/custom/ifThenElse.kt b/compiler/testData/lineNumber/custom/ifThenElse.kt
index fff753e0222..17d8515ccbd 100644
--- a/compiler/testData/lineNumber/custom/ifThenElse.kt
+++ b/compiler/testData/lineNumber/custom/ifThenElse.kt
@@ -1,15 +1,17 @@
 fun foo() {
-    if (0 < 1) {
+    if (flag) {
         System.out?.println()
     } else {
         System.out?.println()
     }
     
-    val b = if (1 < 2) {
+    val b = if (flag) {
         System.out?.println()
     } else {
         System.out?.println()
     }
 }
 
-// 2 3 5 6 +8 9 11 8 13
\ No newline at end of file
+val flag = true
+
+// 2 3 5 6 +8 9 11 8 13 15 15
\ No newline at end of file
diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
index c1998ba68df..43ae032a9e6 100644
--- a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
+++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java
@@ -1415,12 +1415,6 @@ public class BytecodeTextTestGenerated extends AbstractBytecodeTextTest {
             doTest(fileName);
         }
 
-        @TestMetadata("linenumberForNoParametersArgumentCallInExpression.kt")
-        public void testLinenumberForNoParametersArgumentCallInExpression() throws Exception {
-            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inline/linenumberForNoParametersArgumentCallInExpression.kt");
-            doTest(fileName);
-        }
-
         @TestMetadata("linenumberForOneParametersArgumentCall.kt")
         public void testLinenumberForOneParametersArgumentCall() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/bytecodeText/inline/linenumberForOneParametersArgumentCall.kt");