diff --git a/akka-docs/intro/code/tutorials/first/Pi.scala b/akka-docs/intro/code/tutorials/first/Pi.scala
index 09d67e955e..f77c328ee2 100644
--- a/akka-docs/intro/code/tutorials/first/Pi.scala
+++ b/akka-docs/intro/code/tutorials/first/Pi.scala
@@ -5,8 +5,8 @@
 //#imports
 package akka.tutorial.first.scala
 
+import akka.AkkaApplication
 import akka.actor.{ Actor, PoisonPill }
-import akka.actor.Actor._
 import akka.routing.Routing.Broadcast
 import akka.routing.{ RoutedProps, Routing }
 import java.util.concurrent.CountDownLatch
@@ -15,6 +15,8 @@ import java.util.concurrent.CountDownLatch
 //#app
 object Pi extends App {
 
+  val app = AkkaApplication()
+
   calculate(nrOfWorkers = 4, nrOfElements = 10000, nrOfMessages = 10000)
 
   //#actors-and-messages
@@ -66,10 +68,10 @@ object Pi extends App {
 
     //#create-workers
     // create the workers
-    val workers = Vector.fill(nrOfWorkers)(actorOf[Worker])
+    val workers = Vector.fill(nrOfWorkers)(app.createActor[Worker])
 
     // wrap them with a load-balancing router
-    val router = Routing.actorOf(RoutedProps().withRoundRobinRouter.withConnections(workers), "pi")
+    val router = app.routing.actorOf(RoutedProps().withRoundRobinRouter.withConnections(workers), "pi")
     //#create-workers
 
     //#master-receive
@@ -119,7 +121,7 @@ object Pi extends App {
     val latch = new CountDownLatch(1)
 
     // create the master
-    val master = actorOf(new Master(nrOfWorkers, nrOfMessages, nrOfElements, latch))
+    val master = app.createActor(new Master(nrOfWorkers, nrOfMessages, nrOfElements, latch))
 
     // start the calculation
     master ! Calculate
diff --git a/akka-docs/scala/code/ActorDocSpec.scala b/akka-docs/scala/code/ActorDocSpec.scala
index 6ebf93c986..0efe85a6cb 100644
--- a/akka-docs/scala/code/ActorDocSpec.scala
+++ b/akka-docs/scala/code/ActorDocSpec.scala
@@ -20,11 +20,11 @@ class MyActor extends Actor {
 }
 //#my-actor
 
-class ActorDocSpec extends WordSpec with MustMatchers with TestKit {
+class ActorDocSpec extends AkkaSpec {
 
-  "creating actor with Actor.actorOf" in {
+  "creating actor with AkkaSpec.createActor" in {
     //#creating-actorOf
-    val myActor = Actor.actorOf[MyActor]
+    val myActor = createActor[MyActor]
     //#creating-actorOf
 
     // testing the actor
@@ -50,26 +50,14 @@ class ActorDocSpec extends WordSpec with MustMatchers with TestKit {
     myActor.stop()
   }
 
-  "creating actor with imported Actor._" in {
-    //#creating-imported
-    import akka.actor.Actor._
-
-    val myActor = actorOf[MyActor]
-    //#creating-imported
-
-    myActor.stop()
-  }
-
   "creating actor with constructor" in {
     class MyActor(arg: String) extends Actor {
       def receive = { case _ ⇒ () }
     }
 
-    import akka.actor.Actor.actorOf
-
     //#creating-constructor
     // allows passing in arguments to the MyActor constructor
-    val myActor = actorOf(new MyActor("..."))
+    val myActor = createActor(new MyActor("..."))
     //#creating-constructor
 
     myActor.stop()
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index 3bb48a6afc..6a529657cb 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -304,7 +304,7 @@ object AkkaBuild extends Build {
   lazy val docs = Project(
     id = "akka-docs",
     base = file("akka-docs"),
-    dependencies = Seq(actor, testkit, stm, http, remote, slf4j),
+    dependencies = Seq(actor, testkit % "test->test", stm, http, remote, slf4j),
     settings = defaultSettings ++ Seq(
       unmanagedSourceDirectories in Test <<= baseDirectory { _ ** "code" get },
       libraryDependencies ++= Dependencies.docs,