diff --git a/libraries/stdlib/test/ExceptionJVMTest.kt b/libraries/stdlib/jvm/test/ExceptionJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/ExceptionJVMTest.kt
rename to libraries/stdlib/jvm/test/ExceptionJVMTest.kt
diff --git a/libraries/stdlib/test/collections/CollectionJVMTest.kt b/libraries/stdlib/jvm/test/collections/CollectionJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/collections/CollectionJVMTest.kt
rename to libraries/stdlib/jvm/test/collections/CollectionJVMTest.kt
diff --git a/libraries/stdlib/test/collections/IterableJVMTests.kt b/libraries/stdlib/jvm/test/collections/IterableJVMTests.kt
similarity index 100%
rename from libraries/stdlib/test/collections/IterableJVMTests.kt
rename to libraries/stdlib/jvm/test/collections/IterableJVMTests.kt
diff --git a/libraries/stdlib/test/collections/IteratorsJVMTest.kt b/libraries/stdlib/jvm/test/collections/IteratorsJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/collections/IteratorsJVMTest.kt
rename to libraries/stdlib/jvm/test/collections/IteratorsJVMTest.kt
diff --git a/libraries/stdlib/test/collections/MapJVMTest.kt b/libraries/stdlib/jvm/test/collections/MapJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/collections/MapJVMTest.kt
rename to libraries/stdlib/jvm/test/collections/MapJVMTest.kt
diff --git a/libraries/stdlib/test/collections/MutableCollectionsJVMTest.kt b/libraries/stdlib/jvm/test/collections/MutableCollectionsJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/collections/MutableCollectionsJVMTest.kt
rename to libraries/stdlib/jvm/test/collections/MutableCollectionsJVMTest.kt
diff --git a/libraries/stdlib/test/collections/SequenceJVMTest.kt b/libraries/stdlib/jvm/test/collections/SequenceJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/collections/SequenceJVMTest.kt
rename to libraries/stdlib/jvm/test/collections/SequenceJVMTest.kt
diff --git a/libraries/stdlib/test/concurrent/ThreadTest.kt b/libraries/stdlib/jvm/test/concurrent/ThreadTest.kt
similarity index 100%
rename from libraries/stdlib/test/concurrent/ThreadTest.kt
rename to libraries/stdlib/jvm/test/concurrent/ThreadTest.kt
diff --git a/libraries/stdlib/test/concurrent/TimerTest.kt b/libraries/stdlib/jvm/test/concurrent/TimerTest.kt
similarity index 100%
rename from libraries/stdlib/test/concurrent/TimerTest.kt
rename to libraries/stdlib/jvm/test/concurrent/TimerTest.kt
diff --git a/libraries/stdlib/test/io/Console.kt b/libraries/stdlib/jvm/test/io/Console.kt
similarity index 100%
rename from libraries/stdlib/test/io/Console.kt
rename to libraries/stdlib/jvm/test/io/Console.kt
diff --git a/libraries/stdlib/test/io/FileTreeWalks.kt b/libraries/stdlib/jvm/test/io/FileTreeWalks.kt
similarity index 100%
rename from libraries/stdlib/test/io/FileTreeWalks.kt
rename to libraries/stdlib/jvm/test/io/FileTreeWalks.kt
diff --git a/libraries/stdlib/test/io/Files.kt b/libraries/stdlib/jvm/test/io/Files.kt
similarity index 100%
rename from libraries/stdlib/test/io/Files.kt
rename to libraries/stdlib/jvm/test/io/Files.kt
diff --git a/libraries/stdlib/test/io/IOStreams.kt b/libraries/stdlib/jvm/test/io/IOStreams.kt
similarity index 100%
rename from libraries/stdlib/test/io/IOStreams.kt
rename to libraries/stdlib/jvm/test/io/IOStreams.kt
diff --git a/libraries/stdlib/test/io/ReadWrite.kt b/libraries/stdlib/jvm/test/io/ReadWrite.kt
similarity index 100%
rename from libraries/stdlib/test/io/ReadWrite.kt
rename to libraries/stdlib/jvm/test/io/ReadWrite.kt
diff --git a/libraries/stdlib/test/io/SerializableTest.kt b/libraries/stdlib/jvm/test/io/SerializableTest.kt
similarity index 100%
rename from libraries/stdlib/test/io/SerializableTest.kt
rename to libraries/stdlib/jvm/test/io/SerializableTest.kt
diff --git a/libraries/stdlib/test/js/StubsJVM.kt b/libraries/stdlib/jvm/test/js/StubsJVM.kt
similarity index 100%
rename from libraries/stdlib/test/js/StubsJVM.kt
rename to libraries/stdlib/jvm/test/js/StubsJVM.kt
diff --git a/libraries/stdlib/test/numbers/BigNumbersTest.kt b/libraries/stdlib/jvm/test/numbers/BigNumbersTest.kt
similarity index 100%
rename from libraries/stdlib/test/numbers/BigNumbersTest.kt
rename to libraries/stdlib/jvm/test/numbers/BigNumbersTest.kt
diff --git a/libraries/stdlib/test/numbers/CompanionIntrinsicObjectsJVMTest.kt b/libraries/stdlib/jvm/test/numbers/CompanionIntrinsicObjectsJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/numbers/CompanionIntrinsicObjectsJVMTest.kt
rename to libraries/stdlib/jvm/test/numbers/CompanionIntrinsicObjectsJVMTest.kt
diff --git a/libraries/stdlib/test/numbers/MathJVMTest.kt b/libraries/stdlib/jvm/test/numbers/MathJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/numbers/MathJVMTest.kt
rename to libraries/stdlib/jvm/test/numbers/MathJVMTest.kt
diff --git a/libraries/stdlib/test/numbers/NumbersJVMTest.kt b/libraries/stdlib/jvm/test/numbers/NumbersJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/numbers/NumbersJVMTest.kt
rename to libraries/stdlib/jvm/test/numbers/NumbersJVMTest.kt
diff --git a/libraries/stdlib/test/properties/delegation/lazy/LazyValuesJVMTest.kt b/libraries/stdlib/jvm/test/properties/delegation/lazy/LazyValuesJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/properties/delegation/lazy/LazyValuesJVMTest.kt
rename to libraries/stdlib/jvm/test/properties/delegation/lazy/LazyValuesJVMTest.kt
diff --git a/libraries/stdlib/test/ranges/RangeIterationJVMTest.kt b/libraries/stdlib/jvm/test/ranges/RangeIterationJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/ranges/RangeIterationJVMTest.kt
rename to libraries/stdlib/jvm/test/ranges/RangeIterationJVMTest.kt
diff --git a/libraries/stdlib/test/reflection/AnnotationsTest.kt b/libraries/stdlib/jvm/test/reflection/AnnotationsTest.kt
similarity index 100%
rename from libraries/stdlib/test/reflection/AnnotationsTest.kt
rename to libraries/stdlib/jvm/test/reflection/AnnotationsTest.kt
diff --git a/libraries/stdlib/test/testUtilsJVM.kt b/libraries/stdlib/jvm/test/testUtilsJVM.kt
similarity index 100%
rename from libraries/stdlib/test/testUtilsJVM.kt
rename to libraries/stdlib/jvm/test/testUtilsJVM.kt
diff --git a/libraries/stdlib/test/text/CharJVMTest.kt b/libraries/stdlib/jvm/test/text/CharJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/text/CharJVMTest.kt
rename to libraries/stdlib/jvm/test/text/CharJVMTest.kt
diff --git a/libraries/stdlib/test/text/RegexJVMTest.kt b/libraries/stdlib/jvm/test/text/RegexJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/text/RegexJVMTest.kt
rename to libraries/stdlib/jvm/test/text/RegexJVMTest.kt
diff --git a/libraries/stdlib/test/text/StringBuilderJVMTest.kt b/libraries/stdlib/jvm/test/text/StringBuilderJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/text/StringBuilderJVMTest.kt
rename to libraries/stdlib/jvm/test/text/StringBuilderJVMTest.kt
diff --git a/libraries/stdlib/test/text/StringJVMTest.kt b/libraries/stdlib/jvm/test/text/StringJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/text/StringJVMTest.kt
rename to libraries/stdlib/jvm/test/text/StringJVMTest.kt
diff --git a/libraries/stdlib/test/text/StringNumberConversionJVMTest.kt b/libraries/stdlib/jvm/test/text/StringNumberConversionJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/text/StringNumberConversionJVMTest.kt
rename to libraries/stdlib/jvm/test/text/StringNumberConversionJVMTest.kt
diff --git a/libraries/stdlib/test/utils/AssertionsJVMTest.kt b/libraries/stdlib/jvm/test/utils/AssertionsJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/utils/AssertionsJVMTest.kt
rename to libraries/stdlib/jvm/test/utils/AssertionsJVMTest.kt
diff --git a/libraries/stdlib/test/utils/LazyJVMTest.kt b/libraries/stdlib/jvm/test/utils/LazyJVMTest.kt
similarity index 100%
rename from libraries/stdlib/test/utils/LazyJVMTest.kt
rename to libraries/stdlib/jvm/test/utils/LazyJVMTest.kt
diff --git a/libraries/stdlib/test/language/EscapedTestNamesTest.kt b/libraries/stdlib/test/language/EscapedTestNamesTest.kt
deleted file mode 100644
index 415cfa0532c..00000000000
--- a/libraries/stdlib/test/language/EscapedTestNamesTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-@file:kotlin.jvm.JvmVersion // TODO: Can't run in JS: spaces in function name KT-4160
-package test.language
-
-import kotlin.test.*
-
-class EscapedTestNamesTest {
-
-    @Test fun `strings equal`() {
-        val actual = "abc"
-        assertEquals("abc", actual)
-    }
-
-    @Test fun `numbers equal`() {
-        val actual = 5
-        assertEquals(5, actual)
-    }
-}
\ No newline at end of file