diff --git a/metropolis/cli/metroctl/test/test.go b/metropolis/cli/metroctl/test/test.go
index ea3bee2..0145cfe 100644
--- a/metropolis/cli/metroctl/test/test.go
+++ b/metropolis/cli/metroctl/test/test.go
@@ -107,8 +107,9 @@
 
 	socksRemote := fmt.Sprintf("localhost:%d", cl.Ports[cluster.SOCKSPort])
 	var clusterEndpoints []string
-	for _, ep := range cl.Nodes {
-		clusterEndpoints = append(clusterEndpoints, ep.ManagementAddress)
+	// Use node starting order for endpoints
+	for _, ep := range cl.NodeIDs {
+		clusterEndpoints = append(clusterEndpoints, cl.Nodes[ep].ManagementAddress)
 	}
 
 	ownerPem := pem.EncodeToMemory(&pem.Block{