diff --git a/js/js.libraries/test/core/JsonTest.kt b/js/js.libraries/test/core/JsonTest.kt
index 57687d83dc1..5a0cb644159 100644
--- a/js/js.libraries/test/core/JsonTest.kt
+++ b/js/js.libraries/test/core/JsonTest.kt
@@ -2,11 +2,10 @@ package test.js
 
 import kotlin.js.*
 import kotlin.test.*
-import org.junit.Test as test
 
 class JsonTest {
 
-    @test fun createJsonFromPairs() {
+    @Test fun createJsonFromPairs() {
         var obj = json(Pair("firstName", "John"), Pair("lastName", "Doe"), Pair("age", 30))
         assertEquals("John", obj["firstName"], "firstName")
         assertEquals("Doe", obj["lastName"], "lastName")
diff --git a/js/js.libraries/test/core/NumbersJsTest.kt b/js/js.libraries/test/core/NumbersJsTest.kt
index 94049c78849..59a8e993ab8 100644
--- a/js/js.libraries/test/core/NumbersJsTest.kt
+++ b/js/js.libraries/test/core/NumbersJsTest.kt
@@ -1,23 +1,22 @@
 package test.js
 
-import org.junit.Test as test
 import kotlin.test.*
 
 class NumbersJsTest {
 
-    @test fun longMinMaxValues() {
+    @Test fun longMinMaxValues() {
         assertEquals(js("Kotlin.Long.MIN_VALUE"), Long.MIN_VALUE)
         assertEquals(js("Kotlin.Long.MAX_VALUE"), Long.MAX_VALUE)
     }
 
-    @test fun doubleMinMaxValues() {
+    @Test fun doubleMinMaxValues() {
         assertEquals(js("Number.MIN_VALUE"), Double.MIN_VALUE)
         assertEquals(js("Number.MAX_VALUE"), Double.MAX_VALUE)
         assertEquals(js("Number.POSITIVE_INFINITY"), Double.POSITIVE_INFINITY)
         assertEquals(js("Number.NEGATIVE_INFINITY"), Double.NEGATIVE_INFINITY)
     }
 
-    @test fun floatMinMaxValues() {
+    @Test fun floatMinMaxValues() {
         assertEquals(js("Number.MIN_VALUE"), Float.MIN_VALUE)
         assertEquals(js("Number.MAX_VALUE"), Float.MAX_VALUE)
         assertEquals(js("Number.POSITIVE_INFINITY"), Float.POSITIVE_INFINITY)
diff --git a/js/js.libraries/test/core/RegExpTest.kt b/js/js.libraries/test/core/RegExpTest.kt
index bdfa8d51fde..dffe6740e0a 100644
--- a/js/js.libraries/test/core/RegExpTest.kt
+++ b/js/js.libraries/test/core/RegExpTest.kt
@@ -19,17 +19,16 @@ package test.js
 import kotlin.js.*
 
 import kotlin.test.*
-import org.junit.Test as test
 
 class RegExpTest {
 
-    @test fun regExpToString() {
+    @Test fun regExpToString() {
         val pattern = "q(\\d+)d"
         val re = RegExp(pattern, "i")
         assertEquals("/$pattern/i", re.toString())
     }
 
-    @test fun regExpProperties() {
+    @Test fun regExpProperties() {
         val re1 = RegExp("[a-z]", "img")
         assertTrue(re1.global)
         assertTrue(re1.ignoreCase)
@@ -40,7 +39,7 @@ class RegExpTest {
         assertFalse(re2.multiline)
     }
 
-    @test fun regExpTest() {
+    @Test fun regExpTest() {
         val pattern = "q(\\d+)d"
         val re = RegExp(pattern, "i")
 
@@ -51,7 +50,7 @@ class RegExpTest {
     }
 
 
-    @test fun regExpExec() {
+    @Test fun regExpExec() {
         val string = "R2D2 beats A5D5 "
         var re = RegExp("""(\w\d)(\w\d)""", "g")
         val m1 = re.exec(string)!!
diff --git a/libraries/stdlib/test/ExceptionJVMTest.kt b/libraries/stdlib/test/ExceptionJVMTest.kt
index 206bde789a2..dedfcfc9fbb 100644
--- a/libraries/stdlib/test/ExceptionJVMTest.kt
+++ b/libraries/stdlib/test/ExceptionJVMTest.kt
@@ -4,7 +4,6 @@ package test.exceptions
 import kotlin.test.*
 import test.collections.assertArrayNotSameButEquals
 
-import org.junit.Test
 import java.io.PrintWriter
 import java.io.*
 import java.nio.charset.Charset
diff --git a/libraries/stdlib/test/OrderingTest.kt b/libraries/stdlib/test/OrderingTest.kt
index 651a1d7929e..407442c9e36 100644
--- a/libraries/stdlib/test/OrderingTest.kt
+++ b/libraries/stdlib/test/OrderingTest.kt
@@ -1,7 +1,6 @@
 package test.comparisons
 
 import kotlin.test.*
-import org.junit.Test
 import kotlin.comparisons.*
 
 data class Item(val name: String, val rating: Int) : Comparable<Item> {
diff --git a/libraries/stdlib/test/TuplesTest.kt b/libraries/stdlib/test/TuplesTest.kt
index 49354c1d68e..89d40d47ac0 100644
--- a/libraries/stdlib/test/TuplesTest.kt
+++ b/libraries/stdlib/test/TuplesTest.kt
@@ -1,9 +1,6 @@
 package test.tuples
 
-import org.junit.Test
-import kotlin.test.assertTrue
-import kotlin.test.assertEquals
-import kotlin.test.assertNotEquals
+import kotlin.test.*
 
 class PairTest {
     val p = Pair(1, "a")
diff --git a/libraries/stdlib/test/collections/ArraysTest.kt b/libraries/stdlib/test/collections/ArraysTest.kt
index ef5660b751a..71d687a44ff 100644
--- a/libraries/stdlib/test/collections/ArraysTest.kt
+++ b/libraries/stdlib/test/collections/ArraysTest.kt
@@ -19,7 +19,6 @@ package test.collections
 import test.collections.behaviors.*
 import test.comparisons.STRING_CASE_INSENSITIVE_ORDER
 import kotlin.test.*
-import org.junit.Test
 import kotlin.comparisons.*
 
 fun <T> assertArrayNotSameButEquals(expected: Array<out T>, actual: Array<out T>, message: String = "") { assertTrue(expected !== actual && expected contentEquals actual, message) }
diff --git a/libraries/stdlib/test/collections/CollectionJVMTest.kt b/libraries/stdlib/test/collections/CollectionJVMTest.kt
index 0c641dc479a..074e38f2623 100644
--- a/libraries/stdlib/test/collections/CollectionJVMTest.kt
+++ b/libraries/stdlib/test/collections/CollectionJVMTest.kt
@@ -9,7 +9,6 @@ import kotlin.test.*
 import kotlin.comparisons.*
 import java.util.*
 
-import org.junit.Test
 import test.io.deserializeFromHex
 import test.io.serializeAndDeserialize
 
diff --git a/libraries/stdlib/test/collections/CollectionTest.kt b/libraries/stdlib/test/collections/CollectionTest.kt
index cbe4ff73dcc..39b954afbae 100644
--- a/libraries/stdlib/test/collections/CollectionTest.kt
+++ b/libraries/stdlib/test/collections/CollectionTest.kt
@@ -17,7 +17,6 @@
 package test.collections
 
 import kotlin.test.*
-import org.junit.Test
 import test.collections.behaviors.*
 import test.comparisons.STRING_CASE_INSENSITIVE_ORDER
 import kotlin.comparisons.*
diff --git a/libraries/stdlib/test/collections/GroupingTest.kt b/libraries/stdlib/test/collections/GroupingTest.kt
index d6fba98d6fc..4654f7b1796 100644
--- a/libraries/stdlib/test/collections/GroupingTest.kt
+++ b/libraries/stdlib/test/collections/GroupingTest.kt
@@ -1,6 +1,5 @@
 package test.collections
 
-import org.junit.Test
 import kotlin.test.*
 
 class GroupingTest {
diff --git a/libraries/stdlib/test/collections/IterableTests.kt b/libraries/stdlib/test/collections/IterableTests.kt
index aecd5523583..adc730e847a 100644
--- a/libraries/stdlib/test/collections/IterableTests.kt
+++ b/libraries/stdlib/test/collections/IterableTests.kt
@@ -16,7 +16,6 @@
 
 package test.collections
 
-import org.junit.Test
 import test.*
 import kotlin.test.*
 
diff --git a/libraries/stdlib/test/collections/IteratorsJVMTest.kt b/libraries/stdlib/test/collections/IteratorsJVMTest.kt
index fdcc829fc30..0a91b93222c 100644
--- a/libraries/stdlib/test/collections/IteratorsJVMTest.kt
+++ b/libraries/stdlib/test/collections/IteratorsJVMTest.kt
@@ -1,7 +1,6 @@
 @file:kotlin.jvm.JvmVersion
 package test.collections
 
-import org.junit.Test
 import kotlin.test.*
 import java.util.*
 
diff --git a/libraries/stdlib/test/collections/IteratorsTest.kt b/libraries/stdlib/test/collections/IteratorsTest.kt
index e58b076acf4..40fb41cc189 100644
--- a/libraries/stdlib/test/collections/IteratorsTest.kt
+++ b/libraries/stdlib/test/collections/IteratorsTest.kt
@@ -1,7 +1,6 @@
 package test.collections
 
 import kotlin.test.*
-import org.junit.Test
 
 class IteratorsTest {
     @Test fun iterationOverIterator() {
diff --git a/libraries/stdlib/test/collections/ListBinarySearchTest.kt b/libraries/stdlib/test/collections/ListBinarySearchTest.kt
index 78ebbdd732d..e87fac4d643 100644
--- a/libraries/stdlib/test/collections/ListBinarySearchTest.kt
+++ b/libraries/stdlib/test/collections/ListBinarySearchTest.kt
@@ -1,7 +1,6 @@
 package test.collections.binarySearch
 
-import org.junit.Test
-import kotlin.test.assertEquals
+import kotlin.test.*
 import kotlin.comparisons.*
 
 class ListBinarySearchTest {
diff --git a/libraries/stdlib/test/collections/ListSpecificTest.kt b/libraries/stdlib/test/collections/ListSpecificTest.kt
index 6ef66ec8de1..ea1491762df 100644
--- a/libraries/stdlib/test/collections/ListSpecificTest.kt
+++ b/libraries/stdlib/test/collections/ListSpecificTest.kt
@@ -1,7 +1,6 @@
 package test.collections
 
 import kotlin.test.*
-import org.junit.Test
 
 class ListSpecificTest {
     val data = listOf("foo", "bar")
diff --git a/libraries/stdlib/test/collections/MapJVMTest.kt b/libraries/stdlib/test/collections/MapJVMTest.kt
index 13dd86cc42a..5ef1b2c4a4d 100644
--- a/libraries/stdlib/test/collections/MapJVMTest.kt
+++ b/libraries/stdlib/test/collections/MapJVMTest.kt
@@ -3,10 +3,7 @@ package test.collections
 
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ConcurrentMap
-import kotlin.test.assertEquals
-import kotlin.test.assertFails
-import kotlin.test.expect
-import org.junit.Test
+import kotlin.test.*
 import kotlin.comparisons.*
 
 class MapJVMTest {
diff --git a/libraries/stdlib/test/collections/MapTest.kt b/libraries/stdlib/test/collections/MapTest.kt
index 6cf7d6dced3..7c25ad3c948 100644
--- a/libraries/stdlib/test/collections/MapTest.kt
+++ b/libraries/stdlib/test/collections/MapTest.kt
@@ -2,7 +2,6 @@ package test.collections
 
 import kotlin.test.*
 import test.*
-import org.junit.Test
 
 class MapTest {
 
diff --git a/libraries/stdlib/test/collections/MutableCollectionsTest.kt b/libraries/stdlib/test/collections/MutableCollectionsTest.kt
index 40d2324f0b2..cd2bb6ffeed 100644
--- a/libraries/stdlib/test/collections/MutableCollectionsTest.kt
+++ b/libraries/stdlib/test/collections/MutableCollectionsTest.kt
@@ -2,7 +2,6 @@ package test.collections
 
 import kotlin.test.*
 
-import org.junit.Test
 
 class MutableCollectionTest {
     fun <T, C: MutableCollection<T>> testOperation(before: List<T>, after: List<T>, expectedModified: Boolean, toMutableCollection: (List<T>) -> C)
diff --git a/libraries/stdlib/test/collections/ReversedViewsTest.kt b/libraries/stdlib/test/collections/ReversedViewsTest.kt
index 1d623df0ae1..f97e5cbfc30 100644
--- a/libraries/stdlib/test/collections/ReversedViewsTest.kt
+++ b/libraries/stdlib/test/collections/ReversedViewsTest.kt
@@ -18,10 +18,7 @@ package test.collections
 
 import test.collections.behaviors.listBehavior
 import test.collections.compare
-import kotlin.test.assertEquals
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
-import org.junit.Test
+import kotlin.test.*
 
 class ReversedViewsTest {
 
diff --git a/libraries/stdlib/test/collections/SequenceJVMTest.kt b/libraries/stdlib/test/collections/SequenceJVMTest.kt
index 0df9c1fbd3b..786dea59fe3 100644
--- a/libraries/stdlib/test/collections/SequenceJVMTest.kt
+++ b/libraries/stdlib/test/collections/SequenceJVMTest.kt
@@ -1,8 +1,7 @@
 @file:kotlin.jvm.JvmVersion
 package test.collections
 
-import org.junit.Test
-import kotlin.test.assertEquals
+import kotlin.test.*
 
 class SequenceJVMTest {
 
diff --git a/libraries/stdlib/test/collections/SequenceTest.kt b/libraries/stdlib/test/collections/SequenceTest.kt
index 1aafce5fbc6..520e45c79e3 100644
--- a/libraries/stdlib/test/collections/SequenceTest.kt
+++ b/libraries/stdlib/test/collections/SequenceTest.kt
@@ -16,7 +16,6 @@
 
 package test.collections
 
-import org.junit.Test
 import kotlin.test.*
 import kotlin.comparisons.*
 
diff --git a/libraries/stdlib/test/collections/SetOperationsTest.kt b/libraries/stdlib/test/collections/SetOperationsTest.kt
index 6847a8c148c..2b3be13eb84 100644
--- a/libraries/stdlib/test/collections/SetOperationsTest.kt
+++ b/libraries/stdlib/test/collections/SetOperationsTest.kt
@@ -1,7 +1,6 @@
 package test.collections
 
 import kotlin.test.*
-import org.junit.Test
 
 class SetOperationsTest {
     @Test fun distinct() {
diff --git a/libraries/stdlib/test/concurrent/ThreadTest.kt b/libraries/stdlib/test/concurrent/ThreadTest.kt
index 2677091ad88..93ef2566535 100644
--- a/libraries/stdlib/test/concurrent/ThreadTest.kt
+++ b/libraries/stdlib/test/concurrent/ThreadTest.kt
@@ -4,7 +4,6 @@ package test.concurrent
 import kotlin.concurrent.*
 import kotlin.test.*
 
-import org.junit.Test
 
 import java.util.concurrent.*
 import java.util.concurrent.TimeUnit.*
diff --git a/libraries/stdlib/test/concurrent/TimerTest.kt b/libraries/stdlib/test/concurrent/TimerTest.kt
index be97064c4af..3e4009f1098 100644
--- a/libraries/stdlib/test/concurrent/TimerTest.kt
+++ b/libraries/stdlib/test/concurrent/TimerTest.kt
@@ -7,7 +7,6 @@ import kotlin.test.*
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.Timer
 
-import org.junit.Test
 
 class TimerTest {
     @Test fun scheduledTask() {
diff --git a/libraries/stdlib/test/coroutines/CoroutineContextTest.kt b/libraries/stdlib/test/coroutines/CoroutineContextTest.kt
index aa8fbc407f3..6b25261eeff 100644
--- a/libraries/stdlib/test/coroutines/CoroutineContextTest.kt
+++ b/libraries/stdlib/test/coroutines/CoroutineContextTest.kt
@@ -17,7 +17,6 @@
 package test.coroutines
 
 import kotlin.test.*
-import org.junit.Test
 import kotlin.coroutines.experimental.*
 
 class CoroutineContextTest {
diff --git a/libraries/stdlib/test/coroutines/CoroutinesReferenceValuesTest.kt b/libraries/stdlib/test/coroutines/CoroutinesReferenceValuesTest.kt
index 05abad979a8..f391606c130 100644
--- a/libraries/stdlib/test/coroutines/CoroutinesReferenceValuesTest.kt
+++ b/libraries/stdlib/test/coroutines/CoroutinesReferenceValuesTest.kt
@@ -17,7 +17,6 @@
 package test.coroutines
 
 import kotlin.test.*
-import org.junit.Test
 import kotlin.coroutines.experimental.*
 
 /**
diff --git a/libraries/stdlib/test/coroutines/SequenceBuilderTest.kt b/libraries/stdlib/test/coroutines/SequenceBuilderTest.kt
index 3b43257cf5e..27fd572eba8 100644
--- a/libraries/stdlib/test/coroutines/SequenceBuilderTest.kt
+++ b/libraries/stdlib/test/coroutines/SequenceBuilderTest.kt
@@ -16,7 +16,6 @@
 
 package test.coroutines
 
-import org.junit.Test
 import kotlin.test.*
 import kotlin.coroutines.experimental.buildSequence
 import kotlin.coroutines.experimental.buildIterator
diff --git a/libraries/stdlib/test/io/FileTreeWalks.kt b/libraries/stdlib/test/io/FileTreeWalks.kt
index 98271e4a6e7..377b2f6ae61 100644
--- a/libraries/stdlib/test/io/FileTreeWalks.kt
+++ b/libraries/stdlib/test/io/FileTreeWalks.kt
@@ -1,7 +1,6 @@
 @file:kotlin.jvm.JvmVersion
 package test.io
 
-import org.junit.Test
 import java.io.File
 import java.io.IOException
 import java.util.*
diff --git a/libraries/stdlib/test/io/Files.kt b/libraries/stdlib/test/io/Files.kt
index eeffcde32ab..471ca5f90df 100644
--- a/libraries/stdlib/test/io/Files.kt
+++ b/libraries/stdlib/test/io/Files.kt
@@ -3,7 +3,6 @@ package test.io
 
 import java.io.*
 import java.util.*
-import org.junit.Test
 import kotlin.io.walkTopDown
 import kotlin.test.*
 
diff --git a/libraries/stdlib/test/io/IOStreams.kt b/libraries/stdlib/test/io/IOStreams.kt
index b36ebc66f52..4bf9d25c217 100644
--- a/libraries/stdlib/test/io/IOStreams.kt
+++ b/libraries/stdlib/test/io/IOStreams.kt
@@ -1,7 +1,6 @@
 @file:kotlin.jvm.JvmVersion
 package test.io
 
-import org.junit.Test
 import kotlin.test.*
 import java.io.Writer
 import java.io.BufferedReader
diff --git a/libraries/stdlib/test/io/ReadWrite.kt b/libraries/stdlib/test/io/ReadWrite.kt
index 4ac64f703a3..fafac936479 100644
--- a/libraries/stdlib/test/io/ReadWrite.kt
+++ b/libraries/stdlib/test/io/ReadWrite.kt
@@ -1,15 +1,12 @@
 @file:kotlin.jvm.JvmVersion
 package test.io
 
-import org.junit.Test
+import kotlin.test.*
 import java.io.File
-import kotlin.test.assertEquals
 import java.io.Reader
 import java.io.StringReader
 import java.net.URL
 import java.util.ArrayList
-import kotlin.test.assertFalse
-import kotlin.test.assertTrue
 
 fun sample(): Reader = StringReader("Hello\nWorld");
 
diff --git a/libraries/stdlib/test/io/SerializableTest.kt b/libraries/stdlib/test/io/SerializableTest.kt
index 305a34d1734..9aac9979b73 100644
--- a/libraries/stdlib/test/io/SerializableTest.kt
+++ b/libraries/stdlib/test/io/SerializableTest.kt
@@ -2,7 +2,6 @@
 package test.io
 
 import java.io.*
-import org.junit.Test
 import kotlin.test.*
 
 private class Serial(val name: String) : Serializable {
diff --git a/libraries/stdlib/test/js/JsArrayTest.kt b/libraries/stdlib/test/js/JsArrayTest.kt
index 9233780f291..9492ea515f1 100644
--- a/libraries/stdlib/test/js/JsArrayTest.kt
+++ b/libraries/stdlib/test/js/JsArrayTest.kt
@@ -16,7 +16,6 @@
 
 package test.collections.js
 
-import org.junit.Test
 import kotlin.test.*
 
 class JsArrayTest {
diff --git a/libraries/stdlib/test/js/JsCollectionsTest.kt b/libraries/stdlib/test/js/JsCollectionsTest.kt
index 312ba0330ae..3cf5fe2170e 100644
--- a/libraries/stdlib/test/js/JsCollectionsTest.kt
+++ b/libraries/stdlib/test/js/JsCollectionsTest.kt
@@ -2,7 +2,6 @@ package test.collections.js
 
 import kotlin.test.*
 import kotlin.comparisons.*
-import org.junit.Test
 
 class JsCollectionsTest {
     val TEST_LIST = arrayOf(2, 0, 9, 7, 1).toList()
diff --git a/libraries/stdlib/test/js/MapJsTest.kt b/libraries/stdlib/test/js/MapJsTest.kt
index 703d1db273f..47af167de38 100644
--- a/libraries/stdlib/test/js/MapJsTest.kt
+++ b/libraries/stdlib/test/js/MapJsTest.kt
@@ -1,7 +1,6 @@
 package test.collections.js
 
 import kotlin.test.*
-import org.junit.Test
 import test.collections.*
 import test.collections.behaviors.*
 
diff --git a/libraries/stdlib/test/js/SetJsTest.kt b/libraries/stdlib/test/js/SetJsTest.kt
index f05efe7de33..a23ebf01cb1 100644
--- a/libraries/stdlib/test/js/SetJsTest.kt
+++ b/libraries/stdlib/test/js/SetJsTest.kt
@@ -1,7 +1,6 @@
 package test.collections.js
 
 import kotlin.test.*
-import org.junit.Test
 import test.collections.*
 import test.collections.behaviors.*
 
diff --git a/libraries/stdlib/test/language/EscapedTestNamesTest.kt b/libraries/stdlib/test/language/EscapedTestNamesTest.kt
index 5781c7e18eb..415cfa0532c 100644
--- a/libraries/stdlib/test/language/EscapedTestNamesTest.kt
+++ b/libraries/stdlib/test/language/EscapedTestNamesTest.kt
@@ -1,7 +1,6 @@
 @file:kotlin.jvm.JvmVersion // TODO: Can't run in JS: spaces in function name KT-4160
 package test.language
 
-import org.junit.Test
 import kotlin.test.*
 
 class EscapedTestNamesTest {
diff --git a/libraries/stdlib/test/numbers/BigNumbersTest.kt b/libraries/stdlib/test/numbers/BigNumbersTest.kt
index 8e2caac8a0e..beca7e7d542 100644
--- a/libraries/stdlib/test/numbers/BigNumbersTest.kt
+++ b/libraries/stdlib/test/numbers/BigNumbersTest.kt
@@ -5,7 +5,6 @@ import java.math.BigInteger
 import java.math.BigDecimal
 
 import kotlin.test.*
-import org.junit.Test
 import java.math.MathContext
 import java.math.RoundingMode
 
diff --git a/libraries/stdlib/test/numbers/BitwiseOperationsTest.kt b/libraries/stdlib/test/numbers/BitwiseOperationsTest.kt
index 0aef714d1de..6ed7a0c5b6d 100644
--- a/libraries/stdlib/test/numbers/BitwiseOperationsTest.kt
+++ b/libraries/stdlib/test/numbers/BitwiseOperationsTest.kt
@@ -1,7 +1,6 @@
 package test.numbers
 
 import kotlin.test.*
-import org.junit.Test
 
 // TODO: Run these tests during compiler test only (JVM & JS)
 class BitwiseOperationsTest {
diff --git a/libraries/stdlib/test/numbers/CompanionIntrinsicObjectsJVMTest.kt b/libraries/stdlib/test/numbers/CompanionIntrinsicObjectsJVMTest.kt
index d540edd6544..69e50702343 100644
--- a/libraries/stdlib/test/numbers/CompanionIntrinsicObjectsJVMTest.kt
+++ b/libraries/stdlib/test/numbers/CompanionIntrinsicObjectsJVMTest.kt
@@ -19,7 +19,6 @@ package test.numbers
 
 import kotlin.test.*
 
-import org.junit.Test
 
 class CompanionIntrinsicObjectsJVMTest {
     @Test fun intTest() {
diff --git a/libraries/stdlib/test/numbers/MathJVMTest.kt b/libraries/stdlib/test/numbers/MathJVMTest.kt
index 26c36813e5d..4095bb9777c 100644
--- a/libraries/stdlib/test/numbers/MathJVMTest.kt
+++ b/libraries/stdlib/test/numbers/MathJVMTest.kt
@@ -2,7 +2,6 @@
 package test.numbers
 
 import kotlin.test.*
-import org.junit.Test
 import kotlin.math.*
 
 class MathJVMTest {
diff --git a/libraries/stdlib/test/numbers/MathTest.kt b/libraries/stdlib/test/numbers/MathTest.kt
index ab5ba26a625..4944b75cde2 100644
--- a/libraries/stdlib/test/numbers/MathTest.kt
+++ b/libraries/stdlib/test/numbers/MathTest.kt
@@ -16,7 +16,6 @@
 
 package test.numbers
 
-import org.junit.Test
 import kotlin.math.*
 import kotlin.test.*
 
diff --git a/libraries/stdlib/test/numbers/NaNPropagationTest.kt b/libraries/stdlib/test/numbers/NaNPropagationTest.kt
index 18f861da52e..fabd48b7b4e 100644
--- a/libraries/stdlib/test/numbers/NaNPropagationTest.kt
+++ b/libraries/stdlib/test/numbers/NaNPropagationTest.kt
@@ -1,9 +1,7 @@
 package numbers
 
-import org.junit.Test
-import kotlin.test.assertTrue
+import kotlin.test.*
 import kotlin.comparisons.*
-import kotlin.test.assertEquals
 
 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)
diff --git a/libraries/stdlib/test/numbers/NumbersJVMTest.kt b/libraries/stdlib/test/numbers/NumbersJVMTest.kt
index bc43ed780b6..050a68b5738 100644
--- a/libraries/stdlib/test/numbers/NumbersJVMTest.kt
+++ b/libraries/stdlib/test/numbers/NumbersJVMTest.kt
@@ -2,7 +2,6 @@
 package test.numbers
 
 import java.math.BigDecimal
-import org.junit.Test
 import kotlin.test.*
 
 class NumbersJVMTest {
diff --git a/libraries/stdlib/test/numbers/NumbersTest.kt b/libraries/stdlib/test/numbers/NumbersTest.kt
index ede491f8340..b38026fcb02 100644
--- a/libraries/stdlib/test/numbers/NumbersTest.kt
+++ b/libraries/stdlib/test/numbers/NumbersTest.kt
@@ -1,6 +1,5 @@
 package test.numbers
 
-import org.junit.Test
 import kotlin.test.*
 
 object NumbersTestConstants {
diff --git a/libraries/stdlib/test/properties/delegation/DelegationTest.kt b/libraries/stdlib/test/properties/delegation/DelegationTest.kt
index 97538bec34b..4f3e59c4e6e 100644
--- a/libraries/stdlib/test/properties/delegation/DelegationTest.kt
+++ b/libraries/stdlib/test/properties/delegation/DelegationTest.kt
@@ -1,6 +1,5 @@
 package test.properties.delegation
 
-import org.junit.Test
 import kotlin.test.*
 import kotlin.properties.*
 
diff --git a/libraries/stdlib/test/properties/delegation/MapAccessorsTest.kt b/libraries/stdlib/test/properties/delegation/MapAccessorsTest.kt
index 4a40c82d36d..12c0b3ff78a 100644
--- a/libraries/stdlib/test/properties/delegation/MapAccessorsTest.kt
+++ b/libraries/stdlib/test/properties/delegation/MapAccessorsTest.kt
@@ -1,7 +1,6 @@
 package test.properties.delegation.map
 
 import kotlin.test.*
-import org.junit.Test
 
 class ValByMapExtensionsTest {
     val map: Map<String, String> = hashMapOf("a" to "all", "b" to "bar", "c" to "code")
diff --git a/libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt b/libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt
index 82935f5c6ad..b44f03112b9 100644
--- a/libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt
+++ b/libraries/stdlib/test/properties/delegation/lazy/LazyValuesTest.kt
@@ -1,6 +1,5 @@
 package test.properties.delegation.lazy
 
-import org.junit.Test
 import kotlin.properties.*
 import kotlin.test.*
 
diff --git a/libraries/stdlib/test/ranges/CoercionTest.kt b/libraries/stdlib/test/ranges/CoercionTest.kt
index 1813be922f1..bcceb4dfa41 100644
--- a/libraries/stdlib/test/ranges/CoercionTest.kt
+++ b/libraries/stdlib/test/ranges/CoercionTest.kt
@@ -1,6 +1,5 @@
 package test.ranges
 
-import org.junit.Test
 import kotlin.test.*
 
 class CoercionTest {
diff --git a/libraries/stdlib/test/ranges/ProgressionLastElementTest.kt b/libraries/stdlib/test/ranges/ProgressionLastElementTest.kt
index e54eed274ef..c4b43e76578 100644
--- a/libraries/stdlib/test/ranges/ProgressionLastElementTest.kt
+++ b/libraries/stdlib/test/ranges/ProgressionLastElementTest.kt
@@ -1,8 +1,7 @@
 package test.ranges
 
-import org.junit.Test
 import kotlin.comparisons.*
-import kotlin.test.assertEquals
+import kotlin.test.*
 
 
 class ProgressionLastElementTest  {
diff --git a/libraries/stdlib/test/ranges/RangeIterationJVMTest.kt b/libraries/stdlib/test/ranges/RangeIterationJVMTest.kt
index 0a7b7d9ca30..cf22ee604da 100644
--- a/libraries/stdlib/test/ranges/RangeIterationJVMTest.kt
+++ b/libraries/stdlib/test/ranges/RangeIterationJVMTest.kt
@@ -11,7 +11,6 @@ import java.lang.Long.MAX_VALUE as MaxL
 import java.lang.Long.MIN_VALUE as MinL
 import java.lang.Character.MAX_VALUE as MaxC
 import java.lang.Character.MIN_VALUE as MinC
-import org.junit.Test
 import kotlin.test.*
 
 // Test data for codegen is generated from this class. If you change it, rerun GenerateTests
diff --git a/libraries/stdlib/test/ranges/RangeIterationTest.kt b/libraries/stdlib/test/ranges/RangeIterationTest.kt
index 54b6da5459e..4298a4d3b74 100644
--- a/libraries/stdlib/test/ranges/RangeIterationTest.kt
+++ b/libraries/stdlib/test/ranges/RangeIterationTest.kt
@@ -1,6 +1,5 @@
 package test.ranges
 
-import org.junit.Test
 import test.collections.behaviors.iteratorBehavior
 import test.collections.compare
 import kotlin.test.*
diff --git a/libraries/stdlib/test/ranges/RangeTest.kt b/libraries/stdlib/test/ranges/RangeTest.kt
index d2586782677..2c6d1acdc2e 100644
--- a/libraries/stdlib/test/ranges/RangeTest.kt
+++ b/libraries/stdlib/test/ranges/RangeTest.kt
@@ -1,7 +1,6 @@
 package test.ranges
 
 import kotlin.test.*
-import org.junit.Test
 
 public class RangeTest {
     @Test fun intRange() {
diff --git a/libraries/stdlib/test/reflection/AnnotationsTest.kt b/libraries/stdlib/test/reflection/AnnotationsTest.kt
index b1e9214241a..095cc8b4b5f 100644
--- a/libraries/stdlib/test/reflection/AnnotationsTest.kt
+++ b/libraries/stdlib/test/reflection/AnnotationsTest.kt
@@ -3,7 +3,6 @@
 package test.reflection
 
 import kotlin.test.*
-import org.junit.Test
 
 @Retention(AnnotationRetention.RUNTIME)
 annotation class MyAnno
diff --git a/libraries/stdlib/test/text/CharJVMTest.kt b/libraries/stdlib/test/text/CharJVMTest.kt
index d05e075b786..0fb05b23cd6 100644
--- a/libraries/stdlib/test/text/CharJVMTest.kt
+++ b/libraries/stdlib/test/text/CharJVMTest.kt
@@ -2,7 +2,6 @@
 package test.text
 
 import kotlin.test.*
-import org.junit.Test
 
 class CharJVMTest {
 
diff --git a/libraries/stdlib/test/text/RegexJVMTest.kt b/libraries/stdlib/test/text/RegexJVMTest.kt
index 3b9578c241d..3f5abb34d60 100644
--- a/libraries/stdlib/test/text/RegexJVMTest.kt
+++ b/libraries/stdlib/test/text/RegexJVMTest.kt
@@ -18,7 +18,6 @@
 package test.text
 
 import kotlin.test.*
-import org.junit.Test
 import test.collections.compare
 import test.io.*
 import java.util.regex.Pattern
diff --git a/libraries/stdlib/test/text/RegexTest.kt b/libraries/stdlib/test/text/RegexTest.kt
index fdd670fd64d..929f0b34c25 100644
--- a/libraries/stdlib/test/text/RegexTest.kt
+++ b/libraries/stdlib/test/text/RegexTest.kt
@@ -3,7 +3,6 @@ package test.text
 import kotlin.text.*
 
 import kotlin.test.*
-import org.junit.Test
 
 class RegexTest {
 
diff --git a/libraries/stdlib/test/text/StringBuilderJVMTest.kt b/libraries/stdlib/test/text/StringBuilderJVMTest.kt
index 97ff2b553b5..74d348f5847 100644
--- a/libraries/stdlib/test/text/StringBuilderJVMTest.kt
+++ b/libraries/stdlib/test/text/StringBuilderJVMTest.kt
@@ -2,7 +2,6 @@
 package test.text
 
 import kotlin.test.*
-import org.junit.Test
 
 class StringBuilderJVMTest() {
 
diff --git a/libraries/stdlib/test/text/StringBuilderTest.kt b/libraries/stdlib/test/text/StringBuilderTest.kt
index aa271aba4e7..7cc11a4a2be 100644
--- a/libraries/stdlib/test/text/StringBuilderTest.kt
+++ b/libraries/stdlib/test/text/StringBuilderTest.kt
@@ -1,7 +1,6 @@
 package test.text
 
 import kotlin.test.*
-import org.junit.Test
 
 class StringBuilderTest {
 
diff --git a/libraries/stdlib/test/text/StringJVMTest.kt b/libraries/stdlib/test/text/StringJVMTest.kt
index 898f363962f..7def6d620b6 100644
--- a/libraries/stdlib/test/text/StringJVMTest.kt
+++ b/libraries/stdlib/test/text/StringJVMTest.kt
@@ -5,7 +5,6 @@ import test.collections.assertArrayNotSameButEquals
 import java.util.*
 import kotlin.test.*
 
-import org.junit.Test
 
 class StringJVMTest {
 
diff --git a/libraries/stdlib/test/text/StringNumberConversionTest.kt b/libraries/stdlib/test/text/StringNumberConversionTest.kt
index e08db482c60..bdddb9c290e 100644
--- a/libraries/stdlib/test/text/StringNumberConversionTest.kt
+++ b/libraries/stdlib/test/text/StringNumberConversionTest.kt
@@ -1,7 +1,6 @@
 package test.text
 
 import kotlin.test.*
-import org.junit.Test
 
 class StringNumberConversionTest {
 
diff --git a/libraries/stdlib/test/text/StringTest.kt b/libraries/stdlib/test/text/StringTest.kt
index e632533e2b1..642afb3b192 100644
--- a/libraries/stdlib/test/text/StringTest.kt
+++ b/libraries/stdlib/test/text/StringTest.kt
@@ -18,7 +18,6 @@ package test.text
 
 import kotlin.test.*
 import test.*
-import org.junit.Test
 import test.collections.behaviors.iteratorBehavior
 import test.collections.compare
 
diff --git a/libraries/stdlib/test/utils/KotlinVersionTest.kt b/libraries/stdlib/test/utils/KotlinVersionTest.kt
index 52b04c76b31..39b3ef847bc 100644
--- a/libraries/stdlib/test/utils/KotlinVersionTest.kt
+++ b/libraries/stdlib/test/utils/KotlinVersionTest.kt
@@ -1,6 +1,5 @@
 package test.utils
 
-import org.junit.Test
 import kotlin.test.*
 
 
diff --git a/libraries/stdlib/test/utils/LazyJVMTest.kt b/libraries/stdlib/test/utils/LazyJVMTest.kt
index c758669b233..0c638d9ae26 100644
--- a/libraries/stdlib/test/utils/LazyJVMTest.kt
+++ b/libraries/stdlib/test/utils/LazyJVMTest.kt
@@ -8,7 +8,6 @@ import java.io.*
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicInteger
 import kotlin.concurrent.thread
-import org.junit.Test
 import test.io.serializeAndDeserialize
 
 class LazyJVMTest {
diff --git a/libraries/stdlib/test/utils/LazyTest.kt b/libraries/stdlib/test/utils/LazyTest.kt
index 08df7455555..2da65b61814 100644
--- a/libraries/stdlib/test/utils/LazyTest.kt
+++ b/libraries/stdlib/test/utils/LazyTest.kt
@@ -2,7 +2,6 @@ package test.utils
 
 import kotlin.*
 import kotlin.test.*
-import org.junit.Test
 
 class LazyTest {
 
diff --git a/libraries/stdlib/test/utils/PreconditionsTest.kt b/libraries/stdlib/test/utils/PreconditionsTest.kt
index 581f0815bda..03bb2c5bff6 100644
--- a/libraries/stdlib/test/utils/PreconditionsTest.kt
+++ b/libraries/stdlib/test/utils/PreconditionsTest.kt
@@ -1,6 +1,5 @@
 package test.utils
 
-import org.junit.Test
 import kotlin.test.*
 
 class PreconditionsTest() {
diff --git a/libraries/stdlib/test/utils/TODOTest.kt b/libraries/stdlib/test/utils/TODOTest.kt
index d6d14ea246a..44cb831749c 100644
--- a/libraries/stdlib/test/utils/TODOTest.kt
+++ b/libraries/stdlib/test/utils/TODOTest.kt
@@ -18,7 +18,6 @@ package test.utils
 
 import kotlin.*
 import kotlin.test.*
-import org.junit.Test
 
 class TODOTest {
     private class PartiallyImplementedClass {