diff --git a/akka-docs/scala/code/akka/docs/actor/ActorDocSpec.scala b/akka-docs/scala/code/akka/docs/actor/ActorDocSpec.scala
index 38e4436389..cdba3d07f3 100644
--- a/akka-docs/scala/code/akka/docs/actor/ActorDocSpec.scala
+++ b/akka-docs/scala/code/akka/docs/actor/ActorDocSpec.scala
@@ -303,7 +303,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
 
     class WatchActor extends Actor {
       val child = context.actorOf(Props.empty, "child")
-      context.watch(child)                 // <-- this is the only call needed for registration
+      context.watch(child) // <-- this is the only call needed for registration
       var lastSender = system.deadLetters
 
       def receive = {
diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala
index dd3f978a5f..31abb52dac 100644
--- a/project/AkkaBuild.scala
+++ b/project/AkkaBuild.scala
@@ -314,10 +314,6 @@ object AkkaBuild extends Build {
       if (true || (System getProperty "java.runtime.version" startsWith "1.7")) Seq() else Seq("-optimize")), // -optimize fails with jdk7
     javacOptions  ++= Seq("-Xlint:unchecked", "-Xlint:deprecation"),
 
-    // add config dir to classpaths
-    unmanagedClasspath in Runtime <+= (baseDirectory in LocalProject("akka")) map { base => Attributed.blank(base / "config") },
-    unmanagedClasspath in Test    <+= (baseDirectory in LocalProject("akka")) map { base => Attributed.blank(base / "config") },
-
     parallelExecution in Test := System.getProperty("akka.parallelExecution", "true").toBoolean,
 
     // for excluding tests by name (or use system property: -Dakka.test.names.exclude=TimingSpec)