diff --git a/akka-http-core/src/test/resources/reference.conf b/akka-http-core/src/test/resources/reference.conf
deleted file mode 100644
index 85f3c7ab62..0000000000
--- a/akka-http-core/src/test/resources/reference.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# override strange reference.conf setting in akka-stream test scope
-akka.actor.default-mailbox.mailbox-type = akka.dispatch.UnboundedMailbox
diff --git a/akka-http-testkit/src/test/resources/reference.conf b/akka-http-testkit/src/test/resources/reference.conf
deleted file mode 100644
index 85f3c7ab62..0000000000
--- a/akka-http-testkit/src/test/resources/reference.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# override strange reference.conf setting in akka-stream test scope
-akka.actor.default-mailbox.mailbox-type = akka.dispatch.UnboundedMailbox
diff --git a/akka-http-tests/src/test/resources/reference.conf b/akka-http-tests/src/test/resources/reference.conf
deleted file mode 100644
index 85f3c7ab62..0000000000
--- a/akka-http-tests/src/test/resources/reference.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# override strange reference.conf setting in akka-stream test scope
-akka.actor.default-mailbox.mailbox-type = akka.dispatch.UnboundedMailbox
diff --git a/akka-http-tests/src/test/scala/akka/http/marshalling/MarshallingSpec.scala b/akka-http-tests/src/test/scala/akka/http/marshalling/MarshallingSpec.scala
index 6878ab6fe3..03541ae596 100644
--- a/akka-http-tests/src/test/scala/akka/http/marshalling/MarshallingSpec.scala
+++ b/akka-http-tests/src/test/scala/akka/http/marshalling/MarshallingSpec.scala
@@ -20,7 +20,6 @@ class MarshallingSpec extends FreeSpec with Matchers with BeforeAndAfterAll with
   import system.dispatcher
 
   val materializerSettings = MaterializerSettings(system)
-    .withDispatcher("akka.test.stream-dispatcher")
 
   implicit val materializer = FlowMaterializer(materializerSettings)
 
diff --git a/akka-http-tests/src/test/scala/akka/http/unmarshalling/UnmarshallingSpec.scala b/akka-http-tests/src/test/scala/akka/http/unmarshalling/UnmarshallingSpec.scala
index d042c8d330..152452abf2 100644
--- a/akka-http-tests/src/test/scala/akka/http/unmarshalling/UnmarshallingSpec.scala
+++ b/akka-http-tests/src/test/scala/akka/http/unmarshalling/UnmarshallingSpec.scala
@@ -23,7 +23,6 @@ class UnmarshallingSpec extends FreeSpec with Matchers with BeforeAndAfterAll {
   import system.dispatcher
 
   val materializerSettings = MaterializerSettings(system)
-    .withDispatcher("akka.test.stream-dispatcher")
 
   implicit val materializer = FlowMaterializer(materializerSettings)
 
diff --git a/akka-stream/src/test/scala/akka/stream/tck/ActorPublisherTest.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/ActorPublisherTest.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/tck/ActorPublisherTest.scala
rename to akka-stream-tck/src/test/scala/akka/stream/tck/ActorPublisherTest.scala
diff --git a/akka-stream/src/test/scala/akka/stream/tck/ActorSubscriberTest.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/ActorSubscriberTest.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/tck/ActorSubscriberTest.scala
rename to akka-stream-tck/src/test/scala/akka/stream/tck/ActorSubscriberTest.scala
diff --git a/akka-stream/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala
rename to akka-stream-tck/src/test/scala/akka/stream/tck/AkkaIdentityProcessorVerification.scala
diff --git a/akka-stream/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala
rename to akka-stream-tck/src/test/scala/akka/stream/tck/AkkaPublisherVerification.scala
diff --git a/akka-stream/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala
similarity index 98%
rename from akka-stream/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala
rename to akka-stream-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala
index b4049eed5c..f28e41307f 100644
--- a/akka-stream/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala
+++ b/akka-stream-tck/src/test/scala/akka/stream/tck/AkkaSubscriberVerification.scala
@@ -6,7 +6,6 @@ package akka.stream.tck
 import akka.actor.ActorSystem
 import akka.stream.FlowMaterializer
 import akka.stream.MaterializerSettings
-import akka.stream.Timeouts
 import akka.stream.scaladsl.Flow
 import akka.stream.testkit.AkkaSpec
 import org.reactivestreams.Publisher
diff --git a/akka-stream/src/test/scala/akka/stream/tck/BlackholeSubscriberTest.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/BlackholeSubscriberTest.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/tck/BlackholeSubscriberTest.scala
rename to akka-stream-tck/src/test/scala/akka/stream/tck/BlackholeSubscriberTest.scala
diff --git a/akka-stream/src/test/scala/akka/stream/tck/FanoutProcessorTest.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/FanoutProcessorTest.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/tck/FanoutProcessorTest.scala
rename to akka-stream-tck/src/test/scala/akka/stream/tck/FanoutProcessorTest.scala
diff --git a/akka-stream/src/test/scala/akka/stream/tck/IterablePublisherTest.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/IterablePublisherTest.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/tck/IterablePublisherTest.scala
rename to akka-stream-tck/src/test/scala/akka/stream/tck/IterablePublisherTest.scala
diff --git a/akka-stream/src/test/scala/akka/stream/tck/IteratorPublisherTest.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/IteratorPublisherTest.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/tck/IteratorPublisherTest.scala
rename to akka-stream-tck/src/test/scala/akka/stream/tck/IteratorPublisherTest.scala
diff --git a/akka-stream/src/test/scala/akka/stream/tck/SimpleCallbackPublisherTest.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/SimpleCallbackPublisherTest.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/tck/SimpleCallbackPublisherTest.scala
rename to akka-stream-tck/src/test/scala/akka/stream/tck/SimpleCallbackPublisherTest.scala
diff --git a/akka-stream/src/test/scala/akka/stream/Timeouts.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/Timeouts.scala
similarity index 94%
rename from akka-stream/src/test/scala/akka/stream/Timeouts.scala
rename to akka-stream-tck/src/test/scala/akka/stream/tck/Timeouts.scala
index 4656a663f6..f75f97f042 100644
--- a/akka-stream/src/test/scala/akka/stream/Timeouts.scala
+++ b/akka-stream-tck/src/test/scala/akka/stream/tck/Timeouts.scala
@@ -1,7 +1,7 @@
 /**
  * Copyright (C) 2014 Typesafe Inc. <http://www.typesafe.com>
  */
-package akka.stream
+package akka.stream.tck
 
 import akka.actor.ActorSystem
 import scala.concurrent.duration._
diff --git a/akka-stream/src/test/scala/akka/stream/tck/TransformProcessorTest.scala b/akka-stream-tck/src/test/scala/akka/stream/tck/TransformProcessorTest.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/tck/TransformProcessorTest.scala
rename to akka-stream-tck/src/test/scala/akka/stream/tck/TransformProcessorTest.scala
diff --git a/akka-stream/src/test/resources/reference.conf b/akka-stream-testkit/src/test/resources/reference.conf
similarity index 100%
rename from akka-stream/src/test/resources/reference.conf
rename to akka-stream-testkit/src/test/resources/reference.conf
diff --git a/akka-stream/src/test/scala/akka/stream/testkit/AkkaSpec.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/AkkaSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/testkit/AkkaSpec.scala
rename to akka-stream-testkit/src/test/scala/akka/stream/testkit/AkkaSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/testkit/ChainSetup.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/ChainSetup.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/testkit/ChainSetup.scala
rename to akka-stream-testkit/src/test/scala/akka/stream/testkit/ChainSetup.scala
diff --git a/akka-stream/src/test/scala/akka/stream/testkit/Coroner.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/Coroner.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/testkit/Coroner.scala
rename to akka-stream-testkit/src/test/scala/akka/stream/testkit/Coroner.scala
diff --git a/akka-stream/src/test/scala/akka/stream/testkit/ScriptedTest.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/ScriptedTest.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/testkit/ScriptedTest.scala
rename to akka-stream-testkit/src/test/scala/akka/stream/testkit/ScriptedTest.scala
diff --git a/akka-stream/src/test/scala/akka/stream/testkit/StreamTestDefaultMailbox.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestDefaultMailbox.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/testkit/StreamTestDefaultMailbox.scala
rename to akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestDefaultMailbox.scala
diff --git a/akka-stream/src/test/scala/akka/stream/testkit/StreamTestKit.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestKit.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/testkit/StreamTestKit.scala
rename to akka-stream-testkit/src/test/scala/akka/stream/testkit/StreamTestKit.scala
diff --git a/akka-stream/src/test/scala/akka/stream/testkit2/ChainSetup.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit2/ChainSetup.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/testkit2/ChainSetup.scala
rename to akka-stream-testkit/src/test/scala/akka/stream/testkit2/ChainSetup.scala
diff --git a/akka-stream/src/test/scala/akka/stream/testkit2/ScriptedTest.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit2/ScriptedTest.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/testkit2/ScriptedTest.scala
rename to akka-stream-testkit/src/test/scala/akka/stream/testkit2/ScriptedTest.scala
diff --git a/akka-stream/src/test/scala/akka/stream/testkit2/TwoStreamsSetup.scala b/akka-stream-testkit/src/test/scala/akka/stream/testkit2/TwoStreamsSetup.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/testkit2/TwoStreamsSetup.scala
rename to akka-stream-testkit/src/test/scala/akka/stream/testkit2/TwoStreamsSetup.scala
diff --git a/akka-stream/src/test/java/akka/stream/actor/ActorPublisherTest.java b/akka-stream-tests/src/test/java/akka/stream/actor/ActorPublisherTest.java
similarity index 100%
rename from akka-stream/src/test/java/akka/stream/actor/ActorPublisherTest.java
rename to akka-stream-tests/src/test/java/akka/stream/actor/ActorPublisherTest.java
diff --git a/akka-stream/src/test/java/akka/stream/actor/ActorSubscriberTest.java b/akka-stream-tests/src/test/java/akka/stream/actor/ActorSubscriberTest.java
similarity index 100%
rename from akka-stream/src/test/java/akka/stream/actor/ActorSubscriberTest.java
rename to akka-stream-tests/src/test/java/akka/stream/actor/ActorSubscriberTest.java
diff --git a/akka-stream/src/test/java/akka/stream/javadsl/AkkaJUnitActorSystemResource.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/AkkaJUnitActorSystemResource.java
similarity index 100%
rename from akka-stream/src/test/java/akka/stream/javadsl/AkkaJUnitActorSystemResource.java
rename to akka-stream-tests/src/test/java/akka/stream/javadsl/AkkaJUnitActorSystemResource.java
diff --git a/akka-stream/src/test/java/akka/stream/javadsl/DuctTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/DuctTest.java
similarity index 100%
rename from akka-stream/src/test/java/akka/stream/javadsl/DuctTest.java
rename to akka-stream-tests/src/test/java/akka/stream/javadsl/DuctTest.java
diff --git a/akka-stream/src/test/java/akka/stream/javadsl/FlowTest.java b/akka-stream-tests/src/test/java/akka/stream/javadsl/FlowTest.java
similarity index 100%
rename from akka-stream/src/test/java/akka/stream/javadsl/FlowTest.java
rename to akka-stream-tests/src/test/java/akka/stream/javadsl/FlowTest.java
diff --git a/akka-stream/src/test/resources/keystore b/akka-stream-tests/src/test/resources/keystore
similarity index 100%
rename from akka-stream/src/test/resources/keystore
rename to akka-stream-tests/src/test/resources/keystore
diff --git a/akka-stream/src/test/resources/truststore b/akka-stream-tests/src/test/resources/truststore
similarity index 100%
rename from akka-stream/src/test/resources/truststore
rename to akka-stream-tests/src/test/resources/truststore
diff --git a/akka-stream/src/test/scala/akka/persistence/stream/PersistenceSpec.scala b/akka-stream-tests/src/test/scala/akka/persistence/stream/PersistenceSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/persistence/stream/PersistenceSpec.scala
rename to akka-stream-tests/src/test/scala/akka/persistence/stream/PersistenceSpec.scala
diff --git a/akka-stream/src/test/scala/akka/persistence/stream/PersistentPublisherExample.scala b/akka-stream-tests/src/test/scala/akka/persistence/stream/PersistentPublisherExample.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/persistence/stream/PersistentPublisherExample.scala
rename to akka-stream-tests/src/test/scala/akka/persistence/stream/PersistentPublisherExample.scala
diff --git a/akka-stream/src/test/scala/akka/persistence/stream/PersistentPublisherSpec.scala b/akka-stream-tests/src/test/scala/akka/persistence/stream/PersistentPublisherSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/persistence/stream/PersistentPublisherSpec.scala
rename to akka-stream-tests/src/test/scala/akka/persistence/stream/PersistentPublisherSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/DslConsistencySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/DslConsistencySpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/DslConsistencySpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/DslConsistencySpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/DuctSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/DuctSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/DuctSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/DuctSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowBroadcastSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowBroadcastSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowBroadcastSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowBroadcastSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowBufferSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowBufferSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowBufferSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowBufferSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowCollectSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowCollectSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowCollectSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowCollectSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowConcatAllSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowConcatAllSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowConcatAllSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowConcatAllSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowConcatSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowConcatSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowConcatSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowConflateSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowConflateSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowConflateSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowConflateSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowDispatcherSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowDispatcherSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowDispatcherSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowDispatcherSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowDropSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowDropSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowDropSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowDropSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowDropWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowDropWithinSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowDropWithinSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowDropWithinSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowExpandSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowExpandSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowExpandSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowExpandSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowFilterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowFilterSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowFilterSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowFilterSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowFoldSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowFoldSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowFoldSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowFoldSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowForeachSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowForeachSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowForeachSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowForeachSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowFromFutureSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowFromFutureSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowFromFutureSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowFromFutureSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowGroupBySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowGroupBySpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowGroupBySpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowGroupBySpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowGroupedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowGroupedSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowGroupedSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowGroupedSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowGroupedWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowGroupedWithinSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowGroupedWithinSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowGroupedWithinSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowIterableSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowIterableSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowIterableSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowIterableSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowIteratorSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowIteratorSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowIteratorSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowIteratorSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowMapConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowMapConcatSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowMapConcatSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowMapConcatSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowMapFutureSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowMapFutureSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowMapFutureSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowMapFutureSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowMapSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowMapSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowMapSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowMapSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowMergeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowMergeSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowMergeSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowMergeSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowOnCompleteSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowOnCompleteSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowOnCompleteSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowOnCompleteSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowPrefixAndTailSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowPrefixAndTailSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowPrefixAndTailSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowPrefixAndTailSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowProduceToSubscriberSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowProduceToSubscriberSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowProduceToSubscriberSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowProduceToSubscriberSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowSplitWhenSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowSplitWhenSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowSplitWhenSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowSplitWhenSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowTakeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowTakeSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowTakeSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowTakeSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowTakeWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowTakeWithinSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowTakeWithinSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowTakeWithinSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowTimerTransformerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowTimerTransformerSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowTimerTransformerSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowTimerTransformerSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowToFutureSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowToFutureSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowToFutureSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowToFutureSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowTransformRecoverSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowTransformRecoverSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowTransformRecoverSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowTransformRecoverSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowTransformSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowTransformSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowTransformSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowTransformSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/FlowZipSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/FlowZipSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/FlowZipSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/FlowZipSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/ImplicitFlowMaterializerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/ImplicitFlowMaterializerSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/ImplicitFlowMaterializerSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/ImplicitFlowMaterializerSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/TickPublisherSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/TickPublisherSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/TickPublisherSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/TickPublisherSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/TimerTransformerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/TimerTransformerSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/TimerTransformerSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/TimerTransformerSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/TwoStreamsSetup.scala b/akka-stream-tests/src/test/scala/akka/stream/TwoStreamsSetup.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/TwoStreamsSetup.scala
rename to akka-stream-tests/src/test/scala/akka/stream/TwoStreamsSetup.scala
diff --git a/akka-stream/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/actor/ActorPublisherSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/actor/ActorSubscriberSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/actor/ActorSubscriberSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/actor/ActorSubscriberSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/actor/ActorSubscriberSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/extra/FlowTimedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/extra/FlowTimedSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/extra/FlowTimedSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/extra/FlowTimedSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/impl/FixedBufferSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/FixedBufferSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/impl/FixedBufferSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/impl/FixedBufferSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/impl/ResizableMultiReaderRingBufferSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/ResizableMultiReaderRingBufferSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/impl/ResizableMultiReaderRingBufferSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/impl/ResizableMultiReaderRingBufferSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/impl/SynchronousPublisherFromIterableSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/impl/SynchronousPublisherFromIterableSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/impl/SynchronousPublisherFromIterableSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/impl/SynchronousPublisherFromIterableSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/io/SslTlsFlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/SslTlsFlowSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/io/SslTlsFlowSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/io/SslTlsFlowSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/io/TcpFlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/io/TcpFlowSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/io/TcpFlowSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/io/TcpFlowSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/io/TcpHelper.scala b/akka-stream-tests/src/test/scala/akka/stream/io/TcpHelper.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/io/TcpHelper.scala
rename to akka-stream-tests/src/test/scala/akka/stream/io/TcpHelper.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowAppendSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowAppendSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowAppendSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowAppendSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowBufferSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowBufferSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowBufferSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowBufferSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowCollectSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowCollectSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowCollectSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowCollectSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowCompileSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowCompileSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowCompileSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowCompileSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowConcatAllSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowConcatAllSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowConcatAllSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowConcatAllSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowConflateSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowConflateSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowConflateSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowConflateSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowDispatcherSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowDispatcherSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowDispatcherSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowDispatcherSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowDropSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowDropSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowDropSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowDropSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowDropWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowDropWithinSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowDropWithinSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowDropWithinSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowExpandSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowExpandSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowExpandSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowExpandSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowFilterSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowFilterSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowFilterSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowFilterSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowFoldSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowFoldSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowFoldSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowFoldSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowForeachSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowForeachSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowForeachSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowForeachSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowFromFutureSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowFromFutureSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowFromFutureSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowFromFutureSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowGraphCompileSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowGraphCompileSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowGraphCompileSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowGraphCompileSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowGroupBySpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowGroupBySpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowGroupBySpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowGroupBySpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowGroupedSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowGroupedSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowGroupedSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowGroupedSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowGroupedWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowGroupedWithinSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowGroupedWithinSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowGroupedWithinSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowIterableSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowIterableSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowIterableSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowIterableSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowIteratorSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowIteratorSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowIteratorSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowIteratorSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowMapConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowMapConcatSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowMapConcatSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowMapConcatSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowMapFutureSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowMapFutureSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowMapFutureSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowMapFutureSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowMapSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowMapSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowMapSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowMapSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowOnCompleteSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowOnCompleteSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowOnCompleteSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowOnCompleteSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowPrefixAndTailSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowPrefixAndTailSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowPrefixAndTailSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowPrefixAndTailSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowPrependSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowPrependSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowPrependSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowPrependSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowPublishToSubscriberSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowPublishToSubscriberSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowPublishToSubscriberSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowPublishToSubscriberSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowSplitWhenSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowSplitWhenSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowSplitWhenSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowSplitWhenSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowTakeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowTakeSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowTakeSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowTakeSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowTakeWithinSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowTakeWithinSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowTakeWithinSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowTakeWithinSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowTimerTransformerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowTimerTransformerSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowTimerTransformerSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowTimerTransformerSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowToFutureSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowToFutureSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowToFutureSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowToFutureSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowTransformRecoverSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowTransformRecoverSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowTransformRecoverSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowTransformRecoverSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/FlowTransformSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowTransformSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/FlowTransformSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/FlowTransformSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/GraphBroadcastSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/GraphBroadcastSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/GraphBroadcastSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/GraphBroadcastSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/GraphConcatSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/GraphConcatSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/GraphConcatSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/GraphConcatSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/GraphMergeSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/GraphMergeSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/GraphMergeSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/GraphMergeSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/GraphOpsIntegrationSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/GraphOpsIntegrationSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/GraphOpsIntegrationSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/GraphOpsIntegrationSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/GraphZipSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/GraphZipSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/GraphZipSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/GraphZipSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/ImplicitFlowMaterializerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/ImplicitFlowMaterializerSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/ImplicitFlowMaterializerSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/ImplicitFlowMaterializerSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/TickPublisherSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/TickPublisherSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/TickPublisherSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/TickPublisherSpec.scala
diff --git a/akka-stream/src/test/scala/akka/stream/scaladsl2/TimerTransformerSpec.scala b/akka-stream-tests/src/test/scala/akka/stream/scaladsl2/TimerTransformerSpec.scala
similarity index 100%
rename from akka-stream/src/test/scala/akka/stream/scaladsl2/TimerTransformerSpec.scala
rename to akka-stream-tests/src/test/scala/akka/stream/scaladsl2/TimerTransformerSpec.scala