diff --git a/akka-http-testkit/src/main/scala/akka/http/testkit/RouteTest.scala b/akka-http-testkit/src/main/scala/akka/http/testkit/RouteTest.scala
index 2aae703489..e938171433 100644
--- a/akka-http-testkit/src/main/scala/akka/http/testkit/RouteTest.scala
+++ b/akka-http-testkit/src/main/scala/akka/http/testkit/RouteTest.scala
@@ -4,7 +4,6 @@
 
 package akka.http.testkit
 
-import akka.http.util.Deferrable
 import com.typesafe.config.{ ConfigFactory, Config }
 import scala.collection.immutable
 import scala.concurrent.duration._
@@ -13,6 +12,8 @@ import scala.reflect.ClassTag
 import org.scalatest.Suite
 import akka.actor.ActorSystem
 import akka.stream.FlowMaterializer
+import akka.http.client.RequestBuilding
+import akka.http.util.Deferrable
 import akka.http.server._
 import akka.http.unmarshalling._
 import akka.http.model._
diff --git a/akka-http-testkit/src/main/scala/akka/http/testkit/RequestBuilding.scala b/akka-http/src/main/scala/akka/http/client/RequestBuilding.scala
similarity index 97%
rename from akka-http-testkit/src/main/scala/akka/http/testkit/RequestBuilding.scala
rename to akka-http/src/main/scala/akka/http/client/RequestBuilding.scala
index f6f7d0421c..5328c0f539 100644
--- a/akka-http-testkit/src/main/scala/akka/http/testkit/RequestBuilding.scala
+++ b/akka-http/src/main/scala/akka/http/client/RequestBuilding.scala
@@ -2,10 +2,10 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.testkit
+package akka.http.client
 
 import scala.collection.immutable
-import scala.concurrent.{ Await, ExecutionContext }
+import scala.concurrent.ExecutionContext
 import scala.concurrent.duration._
 import scala.reflect.ClassTag
 import akka.util.Timeout
diff --git a/akka-http-testkit/src/main/scala/akka/http/testkit/TransformerPipelineSupport.scala b/akka-http/src/main/scala/akka/http/client/TransformerPipelineSupport.scala
similarity index 98%
rename from akka-http-testkit/src/main/scala/akka/http/testkit/TransformerPipelineSupport.scala
rename to akka-http/src/main/scala/akka/http/client/TransformerPipelineSupport.scala
index 7c7531253d..0a03f3f93b 100644
--- a/akka-http-testkit/src/main/scala/akka/http/testkit/TransformerPipelineSupport.scala
+++ b/akka-http/src/main/scala/akka/http/client/TransformerPipelineSupport.scala
@@ -2,11 +2,10 @@
  * Copyright (C) 2009-2014 Typesafe Inc. <http://www.typesafe.com>
  */
 
-package akka.http.testkit
-
-import akka.event.{ Logging, LoggingAdapter }
+package akka.http.client
 
 import scala.concurrent.{ Future, ExecutionContext }
+import akka.event.{ Logging, LoggingAdapter }
 
 trait TransformerPipelineSupport {