diff --git a/tools/test/scenarios/net-pingall.xml b/tools/test/scenarios/net-pingall.xml
index eb2ec7a..300dea6 100644
--- a/tools/test/scenarios/net-pingall.xml
+++ b/tools/test/scenarios/net-pingall.xml
@@ -18,17 +18,13 @@
     <group name="Net-Pingall">
         <step name="Install-Apps"
               exec="onos ${OC1} app activate org.onosproject.openflow org.onosproject.proxyarp org.onosproject.fwd"/>
-        <step name="Check-Apps" requires="^"
+        <step name="Check-Apps" requires="Install-Apps"
               exec="onos-check-apps ${OC1} drivers,openflow,proxyarp,fwd includes"/>
 
-        <!-- TODO: take this out when initial pingall sweep is 100% -->
-        <step name="Initial-Ping-All" requires="Check-Apps" unless="${ONOS_RF_BUG_FIXED}"
-              exec="onos-mininet sendAndExpect py net.pingAll(1) --expect received"/>
-
-        <step name="Ping-All-And-Verify" requires="Check-Apps,Initial-Ping-All"
+        <step name="Ping-All" requires="Check-Apps"
               exec="onos-mininet sendAndExpect py net.pingAll(1) --expect 600/600 received"/>
 
-        <step name="Check-Summary-For-Hosts" requires="~Ping-All-And-Verify"
+        <step name="Check-Summary-For-Hosts" requires="~Ping-All"
               exec="onos-check-summary ${OC1} [0-9]* 25 140 25"/>
     </group>
 </scenario>