diff --git a/gradle.properties b/gradle.properties
index 5fbf33229e..a65c81612e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@ lincheck_version=2.12
 dokka_version=0.9.16-rdev-2-mpp-hacks
 byte_buddy_version=1.10.9
 reactor_version=3.4.1
-reactive_streams_version=1.0.2
+reactive_streams_version=1.0.3
 rxjava2_version=2.2.8
 rxjava3_version=3.0.2
 javafx_version=11.0.2
diff --git a/reactive/kotlinx-coroutines-jdk9/build.gradle.kts b/reactive/kotlinx-coroutines-jdk9/build.gradle.kts
index 38c6735cc4..be5eb421f1 100644
--- a/reactive/kotlinx-coroutines-jdk9/build.gradle.kts
+++ b/reactive/kotlinx-coroutines-jdk9/build.gradle.kts
@@ -3,8 +3,7 @@
  */
 
 dependencies {
-    compile(project(":kotlinx-coroutines-reactive"))
-    compile("org.reactivestreams:reactive-streams-flow-adapters:${version("reactive_streams")}")
+    implementation(project(":kotlinx-coroutines-reactive"))
 }
 
 tasks {
diff --git a/reactive/kotlinx-coroutines-reactive/test/IterableFlowTckTest.kt b/reactive/kotlinx-coroutines-reactive/test/IterableFlowTckTest.kt
index 906b2579d7..cf935f97dc 100644
--- a/reactive/kotlinx-coroutines-reactive/test/IterableFlowTckTest.kt
+++ b/reactive/kotlinx-coroutines-reactive/test/IterableFlowTckTest.kt
@@ -7,18 +7,12 @@
 package kotlinx.coroutines.reactive
 
 import kotlinx.coroutines.flow.*
-import org.junit.*
 import org.junit.Ignore
 import org.junit.Test
 import org.reactivestreams.*
 import org.reactivestreams.tck.*
-
-import org.reactivestreams.Subscription
-import org.reactivestreams.Subscriber
-import java.util.ArrayList
 import java.util.concurrent.*
-import java.util.concurrent.CountDownLatch
-import java.util.concurrent.ForkJoinPool.commonPool
+import java.util.concurrent.ForkJoinPool.*
 import kotlin.test.*
 
 class IterableFlowTckTest : PublisherVerification<Long>(TestEnvironment()) {
@@ -97,7 +91,7 @@ class IterableFlowTckTest : PublisherVerification<Long>(TestEnvironment()) {
 
             override fun onSubscribe(s: Subscription) {
                 this.s = s
-                for (i in 0 until n) {
+                for (i in 0..n) {
                     commonPool().execute { s.request(1) }
                 }
             }
@@ -115,7 +109,7 @@ class IterableFlowTckTest : PublisherVerification<Long>(TestEnvironment()) {
             }
         })
 
-        latch.await(50, TimeUnit.SECONDS)
+        latch.await()
         assertEquals(array.toList(), collected)
     }