diff --git a/voltha b/voltha
index b76dff1..20f9676 100755
--- a/voltha
+++ b/voltha
@@ -602,10 +602,13 @@
                 etcd-operator.* \
                 radius.* \
                 voltha-.*"
-            ONOS_PODS="onos-.*"
+
             EXPECT=0
 
-            wait_for_pods "default" $EXPECT "not" -1 "Waiting for ONOS PODs to terminate" $ONOS_PODS
+            if [ "$WITH_ONOS" == "yes" ]; then
+              ONOS_PODS="onos-.*"
+              wait_for_pods "default" $EXPECT "not" -1 "Waiting for ONOS PODs to terminate" $ONOS_PODS
+            fi
             wait_for_pods "voltha" $EXPECT "not" -1 "Waiting for VOLTHA PODs to terminate" $PODS
         fi
     fi