diff --git a/test/150_connect_forget_test.sh b/test/150_connect_forget_test.sh
index a1ac7df9..8f8da392 100755
--- a/test/150_connect_forget_test.sh
+++ b/test/150_connect_forget_test.sh
@@ -15,8 +15,8 @@ assert_peers() {
 
 start_suite "Connecting and forgetting routers after launch"
 
-weave_on $HOST1 launch
-weave_on $HOST2 launch
+weave_on $HOST1 launch-router
+weave_on $HOST2 launch-router
 
 start_container $HOST1 $C1/24 --name=c1
 start_container $HOST2 $C2/24 --name=c2
@@ -33,8 +33,8 @@ assert_raises "exec_on $HOST1 c1 $PING $C2"
 
 # Forget everyone and disonnect
 assert_raises "weave_on $HOST2 forget $HOST1 $HOST2"
-assert_raises "weave_on $HOST1 stop"
-assert_raises "weave_on $HOST1 launch"
+assert_raises "weave_on $HOST1 stop-router"
+assert_raises "weave_on $HOST1 launch-router"
 assert_peers $HOST2 ""
 assert_raises "exec_on $HOST1 c1 sh -c '! $PING $C2'"
 
diff --git a/test/210_dns_multicast_test.sh b/test/210_dns_multicast_test.sh
index dbb559bc..fb47f334 100755
--- a/test/210_dns_multicast_test.sh
+++ b/test/210_dns_multicast_test.sh
@@ -29,8 +29,8 @@ check() {
 
 start_suite "Resolve names across hosts (with and without IPAM), and repopulate on restart"
 
-weave_on $HOST1 launch -iprange $UNIVERSE
-weave_on $HOST2 launch -iprange $UNIVERSE $HOST1
+weave_on $HOST1 launch-router -iprange $UNIVERSE
+weave_on $HOST2 launch-router -iprange $UNIVERSE $HOST1
 
 start_container          $HOST2 $C2/24 --name=c2 -h $NAME2
 start_container_with_dns $HOST1 $C1/24 --name=c1
diff --git a/test/280_with_or_without_dns_test.sh b/test/280_with_or_without_dns_test.sh
index f537b7dd..2a58be95 100755
--- a/test/280_with_or_without_dns_test.sh
+++ b/test/280_with_or_without_dns_test.sh
@@ -20,7 +20,7 @@ assert_resolution() {
 
 start_suite "With or without DNS test"
 
-weave_on $HOST1 launch
+weave_on $HOST1 launch-router
 
 DNS_IP=$(weave_on $HOST1 docker-bridge-ip)
 
diff --git a/test/500_weave_multi_cidr_test.sh b/test/500_weave_multi_cidr_test.sh
index 0bbf6e5d..884d7c74 100755
--- a/test/500_weave_multi_cidr_test.sh
+++ b/test/500_weave_multi_cidr_test.sh
@@ -73,7 +73,7 @@ start_suite "Weave run/start/attach/detach/expose/hide with multiple cidr argume
 # specific address, i.e. we are assuming that IPAM always returns the
 # lowest available address in the subnet
 
-weave_on $HOST1 launch -debug -iprange 10.2.3.0/24
+weave_on $HOST1 launch-router -debug -iprange 10.2.3.0/24
 launch_dns_on $HOST1 10.254.254.254/24
 
 # Run container with three cidrs
diff --git a/test/620_proxy_entrypoint_command_test.sh b/test/620_proxy_entrypoint_command_test.sh
index f2b5f959..20316d32 100755
--- a/test/620_proxy_entrypoint_command_test.sh
+++ b/test/620_proxy_entrypoint_command_test.sh
@@ -26,7 +26,7 @@ run_container "grep ^1$ /sys/class/net/ethwe/carrier"
 build_image false '["/bin/false"]' ''
 run_container "--entrypoint='grep' false ^1$ /sys/class/net/ethwe/carrier"
 
-weave_on $HOST1 launch -iprange 10.2.2.0/24
+weave_on $HOST1 launch-router -iprange 10.2.2.0/24
 docker_on $HOST1 kill weaveproxy
 weave_on $HOST1 launch-proxy
 
diff --git a/test/650_proxy_env_test.sh b/test/650_proxy_env_test.sh
index beb8a558..97e33084 100755
--- a/test/650_proxy_env_test.sh
+++ b/test/650_proxy_env_test.sh
@@ -13,6 +13,6 @@ assert_raises "docker $(weave_on $HOST1 proxy-config) $CMD"
 # Check we can use the weave script through the proxy
 assert_raises "eval '$(weave_on $HOST1 proxy-env)' ; $WEAVE version"
 assert_raises "eval '$(weave_on $HOST1 proxy-env)' ; $WEAVE ps"
-assert_raises "eval '$(weave_on $HOST1 proxy-env)' ; $WEAVE launch"
+assert_raises "eval '$(weave_on $HOST1 proxy-env)' ; $WEAVE launch-router"
 
 end_suite
diff --git a/test/660_proxy_ipam_test.sh b/test/660_proxy_ipam_test.sh
index 11137995..f0635f83 100755
--- a/test/660_proxy_ipam_test.sh
+++ b/test/660_proxy_ipam_test.sh
@@ -17,8 +17,8 @@ assert_no_ethwe() {
 
 start_suite "Ping proxied containers over cross-host weave network (with IPAM)"
 
-weave_on $HOST1 launch -iprange $UNIVERSE
-weave_on $HOST2 launch -iprange $UNIVERSE $HOST1
+weave_on $HOST1 launch-router -iprange $UNIVERSE
+weave_on $HOST2 launch-router -iprange $UNIVERSE $HOST1
 weave_on $HOST1 launch-proxy
 weave_on $HOST2 launch-proxy --no-default-ipam
 
diff --git a/test/670_proxy_tls_test.sh b/test/670_proxy_tls_test.sh
index 1d284133..69cff352 100755
--- a/test/670_proxy_tls_test.sh
+++ b/test/670_proxy_tls_test.sh
@@ -6,7 +6,7 @@ start_suite "Boot the proxy with TLS-enabled Docker support"
 
 PWD=$($SSH $HOST1 pwd)
 
-weave_on $HOST1 launch
+weave_on $HOST1 launch-router
 weave_on $HOST1 launch-proxy \
   --tlsverify \
   --tlscacert $PWD/tls/ca.pem \