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 1d2199bc54..98d838c343 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
@@ -9,7 +9,7 @@ import scala.concurrent.Await
 import scala.concurrent.duration._
 import org.scalatest.{ BeforeAndAfterAll, FreeSpec, Matchers }
 import akka.actor.ActorSystem
-import akka.stream.{ FlowMaterializer, MaterializerSettings }
+import akka.stream.FlowMaterializer
 import akka.http.util._
 import akka.http.model._
 import headers._
@@ -18,12 +18,9 @@ import MediaTypes._
 
 class MarshallingSpec extends FreeSpec with Matchers with BeforeAndAfterAll with MultipartMarshallers {
   implicit val system = ActorSystem(getClass.getSimpleName)
+  implicit val materializer = FlowMaterializer()
   import system.dispatcher
 
-  val materializerSettings = MaterializerSettings(system)
-
-  implicit val materializer = FlowMaterializer(materializerSettings)
-
   "The PredefinedToEntityMarshallers." - {
     "StringMarshaller should marshal strings to `text/plain` content in UTF-8" in {
       marshal("Ha“llo") shouldEqual HttpEntity("Ha“llo")
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 df6afd5cf2..e2a635d308 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
@@ -11,7 +11,7 @@ import org.scalatest.matchers.Matcher
 import org.scalatest.{ BeforeAndAfterAll, FreeSpec, Matchers }
 import akka.actor.ActorSystem
 import akka.stream.scaladsl.Flow
-import akka.stream.{ FlowMaterializer, MaterializerSettings }
+import akka.stream.FlowMaterializer
 import akka.http.model._
 import akka.http.util._
 import headers._
@@ -20,13 +20,9 @@ import FastFuture._
 
 class UnmarshallingSpec extends FreeSpec with Matchers with BeforeAndAfterAll {
   implicit val system = ActorSystem(getClass.getSimpleName)
-
+  implicit val materializer = FlowMaterializer()
   import system.dispatcher
 
-  val materializerSettings = MaterializerSettings(system)
-
-  implicit val materializer = FlowMaterializer(materializerSettings)
-
   "The PredefinedFromEntityUnmarshallers." - {
     "stringUnmarshaller should unmarshal `text/plain` content in UTF-8 to Strings" in {
       Unmarshal(HttpEntity("Hällö")).to[String] should evaluateTo("Hällö")