diff --git a/tools/test/bin/onos-wait-for-stop b/tools/test/bin/onos-wait-for-stop
index ebb1d6d..a497422 100755
--- a/tools/test/bin/onos-wait-for-stop
+++ b/tools/test/bin/onos-wait-for-stop
@@ -19,3 +19,8 @@
     done
     exit 1
 "
+
+[ $? -eq 0 ] && exit 0
+[ "$2" = "--kill" ] && onos-kill $node && exit 0
+
+exit 1
diff --git a/tools/test/scenarios/ha-cluster-restart.xml b/tools/test/scenarios/ha-cluster-restart.xml
index f0708c8..0abadbd 100644
--- a/tools/test/scenarios/ha-cluster-restart.xml
+++ b/tools/test/scenarios/ha-cluster-restart.xml
@@ -21,7 +21,7 @@
             <parallel var="${OC#}">
                 <step name="Node-Stop-${#}" exec="onos-service ${OC#} stop"/>
                 <step name="Wait-for-Stop-${#}" requires="~Node-Stop-${#}"
-                      exec="onos-wait-for-stop ${OC#}"/>
+                      exec="onos-wait-for-stop ${OC#} ${ONOS_KILL_OPTION}"/>
             </parallel>
         </group>