diff --git a/tools/test/scenarios/drivers-test.xml b/tools/test/scenarios/drivers-test.xml
index a571093..9ec8c6c 100644
--- a/tools/test/scenarios/drivers-test.xml
+++ b/tools/test/scenarios/drivers-test.xml
@@ -34,7 +34,7 @@
         <group name="DriversTest.Check-Fujitsu-App-Activated" requires="DriversTest.ActivateFujitsuDriverApp">
             <parallel var="${OC#}">
                 <step name="DriversTest.Check-Fujitsu-App-Activated-${#}"
-                      exec="onos-check-apps ${OC#} drivers,openflow,proxyarp,dhcp,fujitsu includes"/>
+                      exec="onos-check-apps ${OC#} gui,drivers,openflow,proxyarp,dhcp,fujitsu includes"/>
             </parallel>
         </group>
         -->
diff --git a/tools/test/scenarios/net-activate-fwd.xml b/tools/test/scenarios/net-activate-fwd.xml
index bad7e22..22be520 100644
--- a/tools/test/scenarios/net-activate-fwd.xml
+++ b/tools/test/scenarios/net-activate-fwd.xml
@@ -21,7 +21,7 @@
                requires="Activate-Fwd-Apps">
             <parallel var="${OC#}">
                 <step name="Check-Fwd-Apps-Activated-${#}"
-                      exec="onos-check-apps ${#} drivers,openflow,proxyarp,fwd includes"/>
+                      exec="onos-check-apps ${#} gui,drivers,openflow,proxyarp,fwd includes"/>
             </parallel>
         </group>
 
diff --git a/tools/test/scenarios/net-setup-odtn.xml b/tools/test/scenarios/net-setup-odtn.xml
index 78987a2..9b6aa08 100644
--- a/tools/test/scenarios/net-setup-odtn.xml
+++ b/tools/test/scenarios/net-setup-odtn.xml
@@ -57,7 +57,7 @@
         <group name="ODTN-Net-Setup.Verify-Apps" requires="ODTN-Net-Setup.Activate-Apps" delay="40">
             <parallel var="${OC#}">
                 <step name="Check-Apps-${#}" exec="onos-check-apps ${OC#} optical-model,yang,config,configsync,faultmanagement,
-                netconf,configsync-netconf,drivers,drivers.netconf,drivers.optical,restconf,protocols.restconfserver,
+                netconf,configsync-netconf,gui,drivers,drivers.netconf,drivers.optical,restconf,protocols.restconfserver,
                 odtn-api,drivers.odtn-driver,odtn-service,models.tapi,models.ietf,models.openconfig,models.openconfig-infinera,
                 models.openconfig-odtn includes"
                       requires="ODTN-Net-Setup.Activate-Apps"/>
diff --git a/tools/test/scenarios/netcfg.xml b/tools/test/scenarios/netcfg.xml
index cfea399..b0ab4c1 100644
--- a/tools/test/scenarios/netcfg.xml
+++ b/tools/test/scenarios/netcfg.xml
@@ -26,7 +26,7 @@
         <group name="Netcfg.Check-Dhcp-App-Activated" requires="Netcfg.Activate-Dhcp">
             <parallel var="${OC#}">
                 <step name="Netcfg.Check-Dhcp-App-Activated-${#}"
-                      exec="onos-check-apps ${OC#} drivers,openflow,proxyarp,dhcp includes"/>
+                      exec="onos-check-apps ${OC#} gui,drivers,openflow,proxyarp,dhcp includes"/>
                 <step name="Netcfg.Check-Dhcp-Component-Active-${#}"
                       exec="onos-check-component ${OC#} org.onosproject.dhcp.impl.DhcpManager ACTIVE"/>
             </parallel>
diff --git a/tools/test/scenarios/yang-live-compile.xml b/tools/test/scenarios/yang-live-compile.xml
index baca2fe..3975a5e 100644
--- a/tools/test/scenarios/yang-live-compile.xml
+++ b/tools/test/scenarios/yang-live-compile.xml
@@ -17,7 +17,7 @@
     <group name="YANG-Live-Compile">
         <step name="Activate-YANG-Runtime" exec="onos ${OC1} app activate org.onosproject.yang"/>
         <step name="Pre-Cleanup-YANG-Model" exec="onos ${OC1} app uninstall l3vpn" env="~"/>
-        <step name="Check-YANG-Runtime" exec="onos-check-apps ${OC1} drivers,yang includes"
+        <step name="Check-YANG-Runtime" exec="onos-check-apps ${OC1} gui,drivers,yang includes"
               requires="Activate-YANG-Runtime"/>
         <step name="Compile-YANG-Model" exec="onos-compile-yang ${OC1} ${ONOS_ROOT}/tools/test/configs/yang"
               requires="Check-YANG-Runtime,Pre-Cleanup-YANG-Model"/>
@@ -29,7 +29,7 @@
                 <step name="Verify-Model-Component-${#}"
                       exec="onos-check-component ${OC#} yang.YangModelRegistrator ACTIVE"/>
                 <step name="Verify-YANG-Apps-${#}"
-                      exec="onos-check-apps ${OC#} drivers,yang,l3vpn includes"/>
+                      exec="onos-check-apps ${OC#} gui,drivers,yang,l3vpn includes"/>
             </parallel>
         </group>
 
diff --git a/tools/test/scenarios/yang-smoke.xml b/tools/test/scenarios/yang-smoke.xml
index ac9b86b..c1e3873 100644
--- a/tools/test/scenarios/yang-smoke.xml
+++ b/tools/test/scenarios/yang-smoke.xml
@@ -21,7 +21,7 @@
                requires="Activate-YANG-Apps">
             <parallel var="${OC#}">
                 <step name="Check-YANG-Apps-Activated-${#}"
-                      exec="onos-check-apps ${#} drivers,yang,yang-gui,models.openroadm includes"/>
+                      exec="onos-check-apps ${#} gui,drivers,yang,yang-gui,models.openroadm includes"/>
             </parallel>
         </group>
         <step name="Verify-Models" exec="onos ${OC1} models | grep org-openroadm-interfaces"