diff --git a/tools/test/scenarios/net-teardown-vnets.xml b/tools/test/scenarios/net-teardown-vnets.xml
index 7c3571f..fe19c33 100644
--- a/tools/test/scenarios/net-teardown-vnets.xml
+++ b/tools/test/scenarios/net-teardown-vnets.xml
@@ -19,15 +19,24 @@
         <step name="Check-NetworkId-Variable-Exists"
               exec="test '${networkId}' != ''"/>
 
+        <step name="Remove-Intent-1" requires="^"
+              exec="onos -f ${OCI} remove-vnet-intent -p ${networkId} org.onosproject.cli 21"/>
+
+        <step name="Check-intents-removed-1" requires="^"
+              exec="onos-check-intent ${OCI} 21 WITHDRAWN 1"/>
+
+        <step name="Remove-Intent-2" requires="^"
+              exec="onos -f ${OCI} remove-vnet-intent -p ${networkId} org.onosproject.cli 12"/>
+
+        <step name="Check-intents-removed-2" requires="^"
+              exec="onos-check-intent ${OCI} 12 WITHDRAWN 1"/>
+
         <step name="Check-Vnet-Link" requires="^"
               exec="onos ${OCI} vnet-links ${networkId}"/>
 
         <step name="Remove-Bidirectional-Link" requires="^"
               exec="onos -f ${OCI} vnet-remove-link --bidirectional ${networkId} device2 2 device1 1"/>
 
-        <step name="Check-intents-removed" requires="^"
-              exec="onos-check-intent ${OCI} networkId=${networkId} IGNORE_STATE 0"/>
-
         <step name="Ping-hosts-2" requires="^"
               exec="onos-mininet sendAndExpect h4 ping -c1 h9 --expect \ 100% packet loss"/>