diff --git a/compiler/testData/codegen/bytecodeText/forLoop/iincGeneration.kt b/compiler/testData/codegen/bytecodeText/forLoop/iincGeneration.kt
index a2c687a2f58..8e8b9505bdf 100644
--- a/compiler/testData/codegen/bytecodeText/forLoop/iincGeneration.kt
+++ b/compiler/testData/codegen/bytecodeText/forLoop/iincGeneration.kt
@@ -40,8 +40,8 @@ fun uShortRangeTo(a: UShort, b: UShort) { for (i in a .. b) {} }
 // 16 IINC
 
 // JVM_IR_TEMPLATES
-// 136 ILOAD
-// 56 ISTORE
+// 122 ILOAD
+// 42 ISTORE
 // 0 IADD
 // 0 ISUB
 // 20 IINC
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInDownToUIntMinValue.kt b/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInDownToUIntMinValue.kt
index 7e0422e2c95..187948b6f71 100644
--- a/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInDownToUIntMinValue.kt
+++ b/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInDownToUIntMinValue.kt
@@ -33,8 +33,8 @@ fun f(a: UInt): Int {
 
 
 // JVM_IR_TEMPLATES
-// 8 ILOAD
-// 6 ISTORE
+// 6 ILOAD
+// 4 ISTORE
 // 0 IADD
 // 0 ISUB
 // 2 IINC
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInOptimizableUnsignedRange.kt b/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInOptimizableUnsignedRange.kt
index 5b4b45838c4..0358ab236ff 100644
--- a/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInOptimizableUnsignedRange.kt
+++ b/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInOptimizableUnsignedRange.kt
@@ -70,8 +70,8 @@ fun testULongDownTo(a: ULong, b: ULong): Int {
 
 
 // JVM_IR_TEMPLATES
-// 40 ILOAD
-// 27 ISTORE
+// 34 ILOAD
+// 21 ISTORE
 // 6 IADD
 // 0 ISUB
 // 3 IINC
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInRangeToUIntMaxValue.kt b/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInRangeToUIntMaxValue.kt
index 187addbfb31..96f9dd17099 100644
--- a/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInRangeToUIntMaxValue.kt
+++ b/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInRangeToUIntMaxValue.kt
@@ -32,8 +32,8 @@ fun f(a: UInt): Int {
 // 0 INVOKE\w+ kotlin/UInt.(un)?box-impl
 
 // JVM_IR_TEMPLATES
-// 9 ILOAD
-// 6 ISTORE
+// 7 ILOAD
+// 4 ISTORE
 // 0 IADD
 // 0 ISUB
 // 2 IINC
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInUntilUIntMaxValue.kt b/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInUntilUIntMaxValue.kt
index ec46f0084ca..46fc00c3233 100644
--- a/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInUntilUIntMaxValue.kt
+++ b/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInUntilUIntMaxValue.kt
@@ -40,8 +40,8 @@ fun f(a: UInt): Int {
 // 1 IF
 
 // JVM_IR_TEMPLATES
-// 7 ILOAD
-// 6 ISTORE
+// 5 ILOAD
+// 4 ISTORE
 // 0 IADD
 // 0 ISUB
 // 2 IINC
\ No newline at end of file
diff --git a/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInUntilUIntMinValue.kt b/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInUntilUIntMinValue.kt
index 378396adb31..e7d50b82a4c 100644
--- a/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInUntilUIntMinValue.kt
+++ b/compiler/testData/codegen/bytecodeText/forLoop/unsigned/forInUntilUIntMinValue.kt
@@ -39,8 +39,8 @@ fun f(a: UInt): Int {
 // 1 IF
 
 // JVM_IR_TEMPLATES
-// 7 ILOAD
-// 6 ISTORE
+// 5 ILOAD
+// 4 ISTORE
 // 0 IADD
 // 0 ISUB
 // 2 IINC