diff --git a/akka-actor/src/test/scala/akka/actor/actor/FSMTimingSpec.scala b/akka-actor/src/test/scala/akka/actor/actor/FSMTimingSpec.scala
index c0ed57c47c..2d39a4ee14 100644
--- a/akka-actor/src/test/scala/akka/actor/actor/FSMTimingSpec.scala
+++ b/akka-actor/src/test/scala/akka/actor/actor/FSMTimingSpec.scala
@@ -16,7 +16,7 @@ class FSMTimingSpec
 
   val fsm = Actor.actorOf(new StateMachine(testActor)).start
   fsm ! SubscribeTransitionCallBack(testActor)
-  expectMsg(50 millis, Initial)
+  expectMsg(100 millis, Initial)
 
   ignoreMsg {
     case Transition(Initial, _) => true
@@ -66,6 +66,10 @@ class FSMTimingSpec
         expectMsg(Unhandled(Tick))
         expectNoMsg
       }
+      within(100 millis) {
+        fsm ! Unhandled("test")
+        expectNoMsg
+      }
       within(100 millis) {
         fsm ! Cancel
         expectMsg(Transition(TestUnhandled, Initial))
@@ -123,8 +127,8 @@ object FSMTimingSpec {
     when(TestUnhandled) {
       case Ev(SetHandler) =>
         whenUnhandled {
-          case Ev(msg : AnyRef) =>
-            tester ! Unhandled(msg)
+          case Ev(Tick) =>
+            tester ! Unhandled(Tick)
             stay
         }
         stay