diff --git a/test/090_docker_restart_policy_2_test.sh b/test/090_docker_restart_policy_2_test.sh
index dba02595..f7cc04c2 100755
--- a/test/090_docker_restart_policy_2_test.sh
+++ b/test/090_docker_restart_policy_2_test.sh
@@ -9,7 +9,7 @@ check_restart() {
 
     run_on $1 sudo kill $OLD_PID
 
-    for i in $(seq 1 30); do
+    for i in $(seq 1 10); do
         NEW_PID=$(container_pid $1 $2)
 
         if [ $NEW_PID != 0 -a $NEW_PID != $OLD_PID ] ; then
@@ -24,7 +24,25 @@ check_restart() {
 
 weave_on $HOST1 launch
 
+assert "docker_on $HOST1 inspect -f '{{.HostConfig.RestartPolicy.Name}}' weave weaveproxy weaveplugin" "always\nalways\nalways"
+
 assert_raises "check_restart $HOST1 weave"
 assert_raises "check_restart $HOST1 weaveproxy"
+assert_raises "check_restart $HOST1 weaveplugin"
+
+# stop + launch tests that restart policy changes result
+# in the old containers being removed and new ones created
+weave_on $HOST1 stop
+weave_on $HOST1 launch --no-restart
+
+assert "docker_on $HOST1 inspect -f '{{.HostConfig.RestartPolicy.Name}}' weave weaveproxy weaveplugin" "no\nno\nno"
+
+assert_raises "! check_restart $HOST1 weave"
+assert_raises "! check_restart $HOST1 weaveproxy"
+assert_raises "! check_restart $HOST1 weaveplugin"
+
+# Relaunch the plugin to prevent the `weave stop` in `end_suite`
+# timing out trying to remove the plugin network
+weave_on $HOST1 launch-plugin
 
 end_suite