diff --git a/test/integration/core/swarm-options.bats b/test/integration/core/swarm-options.bats
index a87f7f3c..03cb0185 100644
--- a/test/integration/core/swarm-options.bats
+++ b/test/integration/core/swarm-options.bats
@@ -1,7 +1,8 @@
 #!/usr/bin/env bats
 
 load ${BASE_TEST_DIR}/helpers.bash
-export TOKEN=$(curl -sS -X POST "https://discovery-stage.hub.docker.com/v1/clusters")
+
+export TOKEN=$(curl -sS -X POST "https://discovery.hub.docker.com/v1/clusters")
 
 @test "create swarm master" {
     run machine create -d $DRIVER --swarm --swarm-master --swarm-discovery "token://$TOKEN" --swarm-strategy binpack --swarm-opt heartbeat=5s queenbee
@@ -21,7 +22,7 @@ export TOKEN=$(curl -sS -X POST "https://discovery-stage.hub.docker.com/v1/clust
 }
 
 @test "ensure heartbeat" {
-    heartbeat_arg=$(docker $(machine config queenbee) inspect -f '{{index .Args 9}}' swarm-agent-master)
+    heartbeat_arg=$(docker $(machine config queenbee) inspect -f '{{index .Args}}' swarm-agent-master)
     echo ${heartbeat_arg}
-    [[ "$heartbeat_arg" == "--heartbeat=5s" ]]
+    [[ "$heartbeat_arg" =~ "--heartbeat=5s" ]]
 }