diff --git a/akka-actor/src/main/scala/akka/actor/Props.scala b/akka-actor/src/main/scala/akka/actor/Props.scala
index 88eb860980..ffd45dd733 100644
--- a/akka-actor/src/main/scala/akka/actor/Props.scala
+++ b/akka-actor/src/main/scala/akka/actor/Props.scala
@@ -78,7 +78,7 @@ object Props {
    * {{{
    * 'Props(new Actor with Stash { ... })
    * }}}
-   * Instead you must create a named class that mixin the trait, 
+   * Instead you must create a named class that mixin the trait,
    * e.g. `class MyActor extends Actor with Stash`.
    */
   def apply[T <: Actor: ClassTag](creator: ⇒ T): Props =
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala
index e7519b8ed4..d1fddef7b5 100644
--- a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala
+++ b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeRestartDeathWatchSpec.scala
@@ -82,8 +82,13 @@ abstract class RemoteNodeRestartDeathWatchSpec
 
         expectTerminated(subject, 15.seconds)
 
-        system.actorSelection(RootActorPath(secondAddress) / "user" / "subject") ! "shutdown"
-        expectMsg("shutdown-ack")
+        within(5.seconds) {
+          // retry because the Subject actor might not be started yet
+          awaitAssert {
+            system.actorSelection(RootActorPath(secondAddress) / "user" / "subject") ! "shutdown"
+            expectMsg(1.second, "shutdown-ack")
+          }
+        }
       }
 
       runOn(second) {