diff --git a/compiler/testData/codegen/box/controlStructures/kt2416.kt b/compiler/testData/codegen/box/controlStructures/kt2416.kt
index 19b5e5b8773..f1442680ff5 100644
--- a/compiler/testData/codegen/box/controlStructures/kt2416.kt
+++ b/compiler/testData/codegen/box/controlStructures/kt2416.kt
@@ -5,11 +5,12 @@ fun box(): String {
     val charRange = '0'..'9'
     '9' in charRange
     val byteRange = 0.toByte()..9.toByte()
-    9.toByte() in byteRange
+    // seems no stdlib available here, thus no contains as extension
+    9 in byteRange
     val longRange = 0.toLong()..9.toLong()
     9.toLong() in longRange
     val shortRange = 0.toShort()..9.toShort()
-    9.toShort() in shortRange
+    9 in shortRange
 
     return "OK"
 }
diff --git a/compiler/testData/codegen/boxWithStdlib/when/switchOptimizationTypes.kt b/compiler/testData/codegen/boxWithStdlib/when/switchOptimizationTypes.kt
index 6def00d03dd..8427ba9e35b 100644
--- a/compiler/testData/codegen/boxWithStdlib/when/switchOptimizationTypes.kt
+++ b/compiler/testData/codegen/boxWithStdlib/when/switchOptimizationTypes.kt
@@ -39,11 +39,11 @@ fun box(): String {
 
     if (result != "5, 6, 7, 8") return "int:" + result
 
-    result = (1.toShort()..4.toShort()).map(::shortFoo).joinToString()
+    result = (listOf<Short>(1, 2, 3, 4)).map(::shortFoo).joinToString()
 
     if (result != "5, 6, 7, 8") return "short:" + result
 
-    result = (1.toByte()..4.toByte()).map(::byteFoo).joinToString()
+    result = (listOf<Byte>(1, 2, 3, 4)).map(::byteFoo).joinToString()
 
     if (result != "5, 6, 7, 8") return "byte:" + result
 
diff --git a/compiler/testData/codegen/bytecodeText/boxingOptimization/progressions.kt b/compiler/testData/codegen/bytecodeText/boxingOptimization/progressions.kt
index 676e3a91e34..01b69592c8e 100644
--- a/compiler/testData/codegen/bytecodeText/boxingOptimization/progressions.kt
+++ b/compiler/testData/codegen/bytecodeText/boxingOptimization/progressions.kt
@@ -11,27 +11,19 @@ inline fun <R, T : Iterable<R>> foo(x : T, block : (R) -> R) : R {
 fun bar() {
     foo((1..100)) { x -> x + 1 }
     foo((1L..100L)) { x -> x + 1 }
-    foo((1.0.toDouble()..2.0.toDouble())) { x -> x + 1 }
-    foo((1.0f..2.0f)) { x -> x + 1 }
     foo((1.toByte()..100.toByte())) { x -> x }
     foo((1.toShort()..100.toShort())) { x -> x }
     foo(('a'..'z')) { x -> x }
 
     foo(IntRange(1, 100)) { x -> x + 1 }
     foo(LongRange(1L, 100L)) { x -> x + 1 }
-    foo(DoubleRange(1.0, 2.0)) { x -> x + 1 }
-    foo(FloatRange(1.0f, 2.0f)) { x -> x + 1 }
-    foo(ByteRange(1.toByte(), 100.toByte())) { x -> x }
-    foo(ShortRange(1.toShort(), 100.toShort())) { x -> x }
     foo(CharRange('a', 'z')) { x -> x }
 }
 
 // 1 next\s\(
-// 2 nextInt
+// 4 nextInt
 // 2 nextLong
-// 2 nextDouble
-// 2 nextFloat
-// 2 nextByte
-// 2 nextShort
+// 0 nextByte
+// 0 nextShort
 // 2 nextChar
 // 0 Value\s\(\)