diff --git a/libraries/stdlib/test/numbers/NaNPropagationTest.kt b/libraries/stdlib/test/numbers/NaNPropagationTest.kt
index b4cc087568d..18f861da52e 100644
--- a/libraries/stdlib/test/numbers/NaNPropagationTest.kt
+++ b/libraries/stdlib/test/numbers/NaNPropagationTest.kt
@@ -5,10 +5,10 @@ import kotlin.test.assertTrue
 import kotlin.comparisons.*
 import kotlin.test.assertEquals
 
-class NaNPropagationTest {
+val Double.Companion.values get() = listOf(0.0, NEGATIVE_INFINITY, MIN_VALUE, MAX_VALUE, POSITIVE_INFINITY, NaN)
+val Float.Companion.values get() = listOf(0.0f, NEGATIVE_INFINITY, MIN_VALUE, MAX_VALUE, POSITIVE_INFINITY, NaN)
 
-    val Double.Companion.values get() = listOf(0.0, NEGATIVE_INFINITY, MIN_VALUE, MAX_VALUE, POSITIVE_INFINITY, NaN)
-    val Float.Companion.values get() = listOf(0.0f, NEGATIVE_INFINITY, MIN_VALUE, MAX_VALUE, POSITIVE_INFINITY, NaN)
+class NaNPropagationTest {
 
     private fun propagateOf2(f2d: (Double, Double) -> Double,
                              f2f: (Float, Float) -> Float,
@@ -104,7 +104,10 @@ class NaNPropagationTest {
                      "sequenceOf().max()")
     }
 
+}
 
+@JvmVersion
+class NaNTotalOrderTest {
 
     private fun <T : Comparable<T>> totalOrderMinOf2(f2t: (T, T) -> T, function: String) {
         @Suppress("UNCHECKED_CAST")
@@ -151,6 +154,4 @@ class NaNPropagationTest {
     @Test fun sequenceTMax() {
         totalOrderMaxOf2<Comparable<Any>>({ a, b -> sequenceOf(a, b).max()!! }, "sequenceOf().max()")
     }
-
-
 }
\ No newline at end of file