diff --git a/tools/test/bin/onos-wipe-out b/tools/test/bin/onos-wipe-out
index 4384fc2..6e99634 100755
--- a/tools/test/bin/onos-wipe-out
+++ b/tools/test/bin/onos-wipe-out
@@ -3,9 +3,7 @@
 # Wipes out all data from the ONOS cluster. Temporary until wipe-out is fixed.
 # -----------------------------------------------------------------------------
 
-[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
-. $ONOS_ROOT/tools/build/envDefaults
-
-while ! onos-check-summary $OCI '.*' 0 0 0 0 0; do
-    onos $OCI wipe-out please
+for node in ${ONOS_INSTANCES:-$OCI}; do
+    onos $node wipe-out please
 done
+onos-check-summary $OCI '.*' 0 0 0 0 0