diff --git a/akka-actor-tests/src/test/scala/akka/performance/workbench/BenchResultRepository.scala b/akka-actor-tests/src/test/scala/akka/performance/workbench/BenchResultRepository.scala
index c1b2456b2d..bc9d6593f3 100644
--- a/akka-actor-tests/src/test/scala/akka/performance/workbench/BenchResultRepository.scala
+++ b/akka-actor-tests/src/test/scala/akka/performance/workbench/BenchResultRepository.scala
@@ -14,7 +14,6 @@ import java.util.Date
 import scala.collection.mutable.{ Map ⇒ MutableMap }
 import akka.AkkaApplication
 
-
 trait BenchResultRepository {
   def add(stats: Stats)
 
diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
index 913b30ce88..dc5678e9e9 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
@@ -50,7 +50,7 @@ private[akka] trait ActorContext extends ActorRefFactory {
   def handleChildTerminated(child: ActorRef): Unit
 
   def app: AkkaApplication
-  
+
 }
 
 case class ChildRestartStats(val child: ActorRef, var maxNrOfRetriesCount: Int = 0, var restartTimeWindowStartNanos: Long = 0L) {
diff --git a/akka-actor/src/main/scala/akka/actor/TypedActor.scala b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
index 1d300e38fa..0dd44db75c 100644
--- a/akka-actor/src/main/scala/akka/actor/TypedActor.scala
+++ b/akka-actor/src/main/scala/akka/actor/TypedActor.scala
@@ -55,12 +55,10 @@ object TypedActor {
    */
   case class SerializedMethodCall(ownerType: Class[_], methodName: String, parameterTypes: Array[Class[_]], serializerIdentifiers: Array[Serializer.Identifier], serializedParameters: Array[Array[Byte]]) {
 
-    import akka.serialization.Serialization.application
-
     //TODO implement writeObject and readObject to serialize
     //TODO Possible optimization is to special encode the parameter-types to conserve space
     private def readResolve(): AnyRef = {
-      val app = application.value
+      val app = akka.serialization.Serialization.application.value
       if (app eq null) throw new IllegalStateException(
         "Trying to deserialize a SerializedMethodCall without an AkkaApplication in scope." +
           " Use akka.serialization.Serialization.application.withValue(akkaApplication) { ... }")
diff --git a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala
index 5a267c24fc..e5c5cf198b 100644
--- a/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/BalancingDispatcher.scala
@@ -28,7 +28,7 @@ import akka.AkkaApplication
  * @author Viktor Klang
  */
 class BalancingDispatcher(
-    _app: AkkaApplication,
+  _app: AkkaApplication,
   _name: String,
   throughput: Int,
   throughputDeadlineTime: Int,
diff --git a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala b/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala
index 7455f7970b..e44806b206 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Dispatcher.scala
@@ -64,7 +64,7 @@ import akka.AkkaApplication
  *                   Larger values (or zero or negative) increase throughput, smaller values increase fairness
  */
 class Dispatcher(
-    _app: AkkaApplication,
+  _app: AkkaApplication,
   _name: String,
   val throughput: Int,
   val throughputDeadlineTime: Int,
diff --git a/akka-actor/src/main/scala/akka/event/Logging.scala b/akka-actor/src/main/scala/akka/event/Logging.scala
index 92ff0da5e1..12ead94967 100644
--- a/akka-actor/src/main/scala/akka/event/Logging.scala
+++ b/akka-actor/src/main/scala/akka/event/Logging.scala
@@ -69,7 +69,7 @@ trait Logging {
 
 }
 
-trait ActorLogging extends Logging { this: Actor =>
+trait ActorLogging extends Logging { this: Actor ⇒
 
   import EventHandler._
 
diff --git a/akka-docs/scala/code/ActorDocSpec.scala b/akka-docs/scala/code/ActorDocSpec.scala
index 0efe85a6cb..c263b02ea1 100644
--- a/akka-docs/scala/code/ActorDocSpec.scala
+++ b/akka-docs/scala/code/ActorDocSpec.scala
@@ -14,8 +14,8 @@ import akka.event.EventHandler
 //#my-actor
 class MyActor extends Actor {
   def receive = {
-    case "test" ⇒ EventHandler.info(this, "received test")
-    case _      ⇒ EventHandler.info(this, "received unknown message")
+    case "test" ⇒ app.eventHandler.info(this, "received test")
+    case _      ⇒ app.eventHandler.info(this, "received unknown message")
   }
 }
 //#my-actor
@@ -29,13 +29,14 @@ class ActorDocSpec extends AkkaSpec {
 
     // testing the actor
 
-    EventHandler.notify(TestEvent.Mute(EventFilter.custom {
+    // TODO: convert docs to AkkaSpec(Configuration(...))
+    app.eventHandler.notify(TestEvent.Mute(EventFilter.custom {
       case e: EventHandler.Info ⇒ true
       case _                    ⇒ false
     }))
-    EventHandler.addListener(testActor)
-    val eventLevel = EventHandler.level
-    EventHandler.level = EventHandler.InfoLevel
+    app.eventHandler.addListener(testActor)
+    val eventLevel = app.eventHandler.level
+    app.eventHandler.level = EventHandler.InfoLevel
 
     myActor ! "test"
     expectMsgPF(1 second) { case EventHandler.Info(_, "received test") ⇒ true }
@@ -43,9 +44,9 @@ class ActorDocSpec extends AkkaSpec {
     myActor ! "unknown"
     expectMsgPF(1 second) { case EventHandler.Info(_, "received unknown message") ⇒ true }
 
-    EventHandler.level = eventLevel
-    EventHandler.removeListener(testActor)
-    EventHandler.notify(TestEvent.UnMuteAll)
+    app.eventHandler.level = eventLevel
+    app.eventHandler.removeListener(testActor)
+    app.eventHandler.notify(TestEvent.UnMuteAll)
 
     myActor.stop()
   }
diff --git a/akka-http/src/main/scala/akka/http/JettyContinuation.scala b/akka-http/src/main/scala/akka/http/JettyContinuation.scala
index 8fcd6b21a9..6d03d24636 100644
--- a/akka-http/src/main/scala/akka/http/JettyContinuation.scala
+++ b/akka-http/src/main/scala/akka/http/JettyContinuation.scala
@@ -16,7 +16,7 @@ import akka.AkkaApplication
  */
 trait JettyContinuation extends ContinuationListener {
   import javax.servlet.http.HttpServletResponse
-  
+
   def app: AkkaApplication
 
   val builder: () ⇒ tAsyncRequestContext
diff --git a/akka-http/src/main/scala/akka/http/Mist.scala b/akka-http/src/main/scala/akka/http/Mist.scala
index 6d530ad0f3..06eafdf650 100644
--- a/akka-http/src/main/scala/akka/http/Mist.scala
+++ b/akka-http/src/main/scala/akka/http/Mist.scala
@@ -294,7 +294,7 @@ class RootEndpoint extends Actor with Endpoint {
 trait RequestMethod {
   import java.io.IOException
   import javax.servlet.http.{ HttpServletResponse, HttpServletRequest }
-  
+
   def app: AkkaApplication
 
   // required implementations
diff --git a/akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala b/akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala
index 18dea7136d..b4507b4534 100644
--- a/akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala
+++ b/akka-stm/src/test/scala/transactor/CoordinatedIncrementSpec.scala
@@ -56,15 +56,14 @@ object CoordinatedIncrement {
 class CoordinatedIncrementSpec extends AkkaSpec with BeforeAndAfterAll {
   import CoordinatedIncrement._
 
-  val application = AkkaApplication("CoordinatedIncrementSpec")
   implicit val timeout = Timeout(5.seconds.dilated)
 
   val numCounters = 5
 
   def createActors = {
-    def createCounter(i: Int) = application.createActor(Props(new Counter("counter" + i)))
+    def createCounter(i: Int) = app.createActor(Props(new Counter("counter" + i)))
     val counters = (1 to numCounters) map createCounter
-    val failer = application.createActor(Props(new Failer))
+    val failer = app.createActor(Props(new Failer))
     (counters, failer)
   }
 
diff --git a/akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala b/akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala
index e7144ee755..201b34904a 100644
--- a/akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala
+++ b/akka-stm/src/test/scala/transactor/FickleFriendsSpec.scala
@@ -101,15 +101,14 @@ object FickleFriends {
 class FickleFriendsSpec extends AkkaSpec with BeforeAndAfterAll {
   import FickleFriends._
 
-  val application = AkkaApplication("FickleFriendsSpec")
   implicit val timeout = Timeout(5.seconds.dilated)
 
   val numCounters = 2
 
   def createActors = {
-    def createCounter(i: Int) = application.createActor(Props(new FickleCounter("counter" + i)))
+    def createCounter(i: Int) = app.createActor(Props(new FickleCounter("counter" + i)))
     val counters = (1 to numCounters) map createCounter
-    val coordinator = application.createActor(Props(new Coordinator("coordinator")))
+    val coordinator = app.createActor(Props(new Coordinator("coordinator")))
     (counters, coordinator)
   }
 
diff --git a/akka-stm/src/test/scala/transactor/TransactorSpec.scala b/akka-stm/src/test/scala/transactor/TransactorSpec.scala
index 5ebbc0d5d3..1ebb79d81c 100644
--- a/akka-stm/src/test/scala/transactor/TransactorSpec.scala
+++ b/akka-stm/src/test/scala/transactor/TransactorSpec.scala
@@ -79,15 +79,14 @@ class TransactorSpec extends AkkaSpec {
   import TransactorIncrement._
   import SimpleTransactor._
 
-  val application = AkkaApplication("TransactorSpec")
   implicit val timeout = Timeout(5.seconds.dilated)
 
   val numCounters = 5
 
   def createTransactors = {
-    def createCounter(i: Int) = application.createActor(Props(new Counter("counter" + i)))
+    def createCounter(i: Int) = app.createActor(Props(new Counter("counter" + i)))
     val counters = (1 to numCounters) map createCounter
-    val failer = application.createActor(Props(new Failer))
+    val failer = app.createActor(Props(new Failer))
     (counters, failer)
   }
 
@@ -125,7 +124,7 @@ class TransactorSpec extends AkkaSpec {
 
   "Transactor" should {
     "be usable without overriding normally" in {
-      val transactor = application.createActor(Props(new Setter))
+      val transactor = app.createActor(Props(new Setter))
       val ref = Ref(0)
       val latch = TestLatch(1)
       transactor ! Set(ref, 5, latch)