diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala b/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala
index 8fdb6f62e3..65a1335670 100755
--- a/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala
+++ b/akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala
@@ -6,9 +6,9 @@ trait AbstractRemoteActorMultiJvmSpec {
   def NrOfNodes: Int
   def commonConfig: Config
 
-  def remotes: List[String] = {
-    val listOpt = Option(System.getProperty("test.hosts")).map(_.split(",").toList)
-    listOpt getOrElse List.fill(NrOfNodes)("localhost")
+  def remotes: Array[String] = {
+    val arrayOpt = Option(System.getProperty("test.hosts")).map(_ split ",")
+    arrayOpt getOrElse Array.fill(NrOfNodes)("localhost")
   }
 
   def specString(count: Int): String = {
diff --git a/akka-remote/src/multi-jvm/scala/akka/remote/ZKClient.scala b/akka-remote/src/multi-jvm/scala/akka/remote/ZKClient.scala
index 44a50448ce..faf13c87d7 100755
--- a/akka-remote/src/multi-jvm/scala/akka/remote/ZKClient.scala
+++ b/akka-remote/src/multi-jvm/scala/akka/remote/ZKClient.scala
@@ -44,7 +44,7 @@ class ZKClient(config: Config) extends Watcher {
       zk.delete(root + "/" + name, -1)
       while (true) {
         ZKClient.this.synchronized {
-          if (zk.getChildren(root, true).size > 0) {
+          if (!zk.getChildren(root, true).isEmpty) {
             ZKClient.this.wait()
           }
         }