diff --git a/akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala b/akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala
index 78613820b2..c648217410 100644
--- a/akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala
+++ b/akka-remote/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala
@@ -173,10 +173,11 @@ class ServerInitiatedRemoteActorSpec extends AkkaRemoteTest {
       remoteFoo.!(10)(Some(remoteBar))
 
       val latch = new CountDownLatch(100)
-      while(
-        (remoteFoo !! "done").as[Boolean].getOrElse(false) &&
-        (remoteBar !! "done").as[Boolean].getOrElse(false)
-      ) {
+
+      def testDone() = (remoteFoo !! "done").as[Boolean].getOrElse(false) &&
+                       (remoteBar !! "done").as[Boolean].getOrElse(false)
+
+      while(!testDone()) {
         if (latch.await(200, TimeUnit.MILLISECONDS))
           error("Test didn't complete within 100 cycles")
         else