diff --git a/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala
index bfda48fba9..e2dc9f098e 100644
--- a/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/actor/FSMTimingSpec.scala
@@ -181,12 +181,11 @@ object FSMTimingSpec {
     }
     when(TestCancelTimer) {
       case Ev(Tick) ⇒
-        tester ! Tick
         setTimer("hallo", Tock, 1 milli, false)
         TestKit.awaitCond(context.hasMessages, 1 second)
         cancelTimer("hallo")
         setTimer("hallo", Tock, 500 millis, false)
-        stay
+        stay replying Tick
       case Ev(Tock) ⇒
         tester ! Tock
         stay
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 5e34a3c2ed..305d70e00a 100644
--- a/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala
+++ b/akka-actor-tests/src/test/scala/akka/routing/ActorPoolSpec.scala
@@ -329,8 +329,6 @@ class ActorPoolSpec extends AkkaSpec {
     }
 
     "support typed actors" in {
-      import RoutingSpec._
-
       val pool = app.createProxy[Foo](new Actor with DefaultActorPool with BoundedCapacityStrategy with MailboxPressureCapacitor with SmallestMailboxSelector with Filter with RunningMeanBackoff with BasicRampup {
         def lowerBound = 1
         def upperBound = 5
diff --git a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
index 734973cc13..86c47522b0 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorSystem.scala
@@ -91,7 +91,10 @@ class ActorSystem(val name: String, val config: Configuration) extends ActorRefF
     val ActorTimeoutMillis = ActorTimeout.duration.toMillis
     val SerializeAllMessages = getBool("akka.actor.serialize-messages", false)
 
-    val TestTimeFactor = getDouble("akka.test.timefactor", 1.0)
+    val TestTimeFactor =
+      try java.lang.Double.parseDouble(System.getProperty("akka.test.timefactor")) catch {
+        case _: Exception ⇒ getDouble("akka.test.timefactor", 1.0)
+      }
     val TestEventFilterLeeway = Duration(getDouble("akka.test.filter-leeway", 0.5), DefaultTimeUnit)
 
     val LogLevel = getString("akka.loglevel", "INFO")
diff --git a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
index 026ad67875..ae54c5bf50 100644
--- a/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
+++ b/akka-actor/src/main/scala/akka/dispatch/Mailbox.scala
@@ -205,7 +205,7 @@ abstract class Mailbox(val actor: ActorCell) extends AbstractMailbox with Messag
       }
     } catch {
       case e ⇒
-        actor.app.eventStream.publish(Error(e, this, "exception during processing system messages, dropping " + SystemMessage.size(nextMessage) + " messages!"))
+        actor.app.eventStream.publish(Error(e, actor.self, "exception during processing system messages, dropping " + SystemMessage.size(nextMessage) + " messages!"))
         throw e
     }
   }