diff --git a/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala
index f290ca1ae6..5ea6902b97 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala
@@ -345,7 +345,7 @@ class ActorPoolSpec extends AkkaSpec {
         def receive = _route
       }, Props().withTimeout(10 seconds).withFaultHandler(faultHandler))
 
-      val results = for (i ← 1 to 20) yield (i, pool.sq(i, 100))
+      val results = for (i ← 1 to 20) yield (i, pool.sq(i, 10))
 
       for ((i, r) ← results) {
         val value = r.get
diff --git a/akka-actor/src/main/scala/akka/actor/Props.scala b/akka-actor/src/main/scala/akka/actor/Props.scala
index 393c442b51..c6732b6eca 100644
--- a/akka-actor/src/main/scala/akka/actor/Props.scala
+++ b/akka-actor/src/main/scala/akka/actor/Props.scala
@@ -28,7 +28,7 @@ object Props {
     case _                               ⇒ Escalate
   }
   final val defaultFaultHandler: FaultHandlingStrategy = OneForOneStrategy(defaultDecider, None, None)
-  final val defaultSupervisor: Option[ActorRef] = None
+
   final val noHotSwap: Stack[Actor.Receive] = Stack.empty
   final val randomAddress: String = ""