diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala
index de734088f1..bb537091c3 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala
@@ -33,31 +33,31 @@ abstract class NodeMembershipSpec extends MultiNodeSpec(NodeMembershipMultiJvmSp
 
   override def initialParticipants = 3
 
-  def node() = Cluster(system)
+  def cluster: Cluster = Cluster(system)
 
   after {
     testConductor.enter("after")
   }
 
-  "A set of connected cluster systems" must {
+  val firstAddress = node(first).address
+  val secondAddress = node(second).address
+  val thirdAddress = node(third).address
 
-    val firstAddress = testConductor.getAddressFor(first).await
-    val secondAddress = testConductor.getAddressFor(second).await
-    val thirdAddress = testConductor.getAddressFor(third).await
+  "A set of connected cluster systems" must {
 
     "(when two systems) start gossiping to each other so that both systems gets the same gossip info" in {
 
       runOn(first, second) {
-        node().join(firstAddress)
-        awaitCond(node().latestGossip.members.size == 2)
-        val members = node().latestGossip.members.toIndexedSeq
+        cluster.join(firstAddress)
+        awaitCond(cluster.latestGossip.members.size == 2)
+        val members = cluster.latestGossip.members.toIndexedSeq
         members.size must be(2)
         members(0).address must be(firstAddress)
         members(1).address must be(secondAddress)
         awaitCond {
-          node().latestGossip.members.forall(_.status == MemberStatus.Up)
+          cluster.latestGossip.members.forall(_.status == MemberStatus.Up)
         }
-        awaitCond(node().convergence.isDefined)
+        awaitCond(cluster.convergence.isDefined)
       }
 
     }
@@ -65,20 +65,20 @@ abstract class NodeMembershipSpec extends MultiNodeSpec(NodeMembershipMultiJvmSp
     "(when three systems) start gossiping to each other so that both systems gets the same gossip info" in {
 
       runOn(third) {
-        node().join(firstAddress)
+        cluster.join(firstAddress)
       }
 
       // runOn all
-      awaitCond(node().latestGossip.members.size == 3)
-      val members = node().latestGossip.members.toIndexedSeq
+      awaitCond(cluster.latestGossip.members.size == 3)
+      val members = cluster.latestGossip.members.toIndexedSeq
       members.size must be(3)
       members(0).address must be(firstAddress)
       members(1).address must be(secondAddress)
       members(2).address must be(thirdAddress)
       awaitCond {
-        node().latestGossip.members.forall(_.status == MemberStatus.Up)
+        cluster.latestGossip.members.forall(_.status == MemberStatus.Up)
       }
-      awaitCond(node().convergence.isDefined)
+      awaitCond(cluster.convergence.isDefined)
 
     }
   }
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeStartupSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeStartupSpec.scala
index 8bb76fb613..f2206f8d89 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeStartupSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/NodeStartupSpec.scala
@@ -31,27 +31,28 @@ abstract class NodeStartupSpec extends MultiNodeSpec(NodeStartupMultiJvmSpec) wi
 
   override def initialParticipants = 2
 
-  def node() = Cluster(system)
+  def cluster: Cluster = Cluster(system)
 
   after {
     testConductor.enter("after")
   }
 
-  val firstAddress = testConductor.getAddressFor(first).await
+  val firstAddress = node(first).address
+  val secondAddress = node(second).address
 
   "A first cluster node with a 'node-to-join' config set to empty string (singleton cluster)" must {
 
     "be a singleton cluster when started up" in {
       runOn(first) {
-        awaitCond(node().isSingletonCluster)
+        awaitCond(cluster.isSingletonCluster)
         // FIXME #2117 singletonCluster should reach convergence
-        //awaitCond(node().convergence.isDefined)
+        //awaitCond(cluster.convergence.isDefined)
       }
     }
 
     "be in 'Joining' phase when started up" in {
       runOn(first) {
-        val members = node().latestGossip.members
+        val members = cluster.latestGossip.members
         members.size must be(1)
 
         val joiningMember = members find (_.address == firstAddress)
@@ -65,18 +66,16 @@ abstract class NodeStartupSpec extends MultiNodeSpec(NodeStartupMultiJvmSpec) wi
     "join the other node cluster when sending a Join command" in {
 
       runOn(second) {
-        node().join(firstAddress)
+        cluster.join(firstAddress)
       }
 
-      // runOn all
-      val secondAddress = testConductor.getAddressFor(second).await
       awaitCond {
-        node.latestGossip.members.exists { member ⇒
+        cluster.latestGossip.members.exists { member ⇒
           member.address == secondAddress && member.status == MemberStatus.Up
         }
       }
-      node().latestGossip.members.size must be(2)
-      awaitCond(node().convergence.isDefined)
+      cluster.latestGossip.members.size must be(2)
+      awaitCond(cluster.convergence.isDefined)
     }
   }