diff --git a/bucklets/yang.bucklet b/bucklets/yang.bucklet
index 490c62a..5fbf2ab 100644
--- a/bucklets/yang.bucklet
+++ b/bucklets/yang.bucklet
@@ -52,7 +52,7 @@
     genrule(
       name = registrator,
       srcs = [ ':' + yangSrcs ],
-      cmd = '$(location //buck-tools:yang-registrator) $OUT app_name $SRCS',
+      cmd = '$(location //buck-tools:yang-registrator) $OUT ' + app_name + ' $SRCS',
       out = 'YangModelRegistrator.java'
     )
 
diff --git a/tools/test/scenarios/yang-live-compile.xml b/tools/test/scenarios/yang-live-compile.xml
index c87c4fc..baca2fe 100644
--- a/tools/test/scenarios/yang-live-compile.xml
+++ b/tools/test/scenarios/yang-live-compile.xml
@@ -21,11 +21,19 @@
               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"/>
-        <step name="Verify-YANG-Models" exec="onos ${OC1} models | grep l3vpn"
-              requires="Compile-YANG-Model"/>
-        <step name="Verify-YANG-Apps" exec="onos-check-apps ${OC1} drivers,yang,l3vpn includes"
-              requires="Compile-YANG-Model"/>
+
+        <group name="Verify-YANG-Models" requires="Compile-YANG-Model">
+            <parallel var="${OC#}">
+                <step name="Verify-Model-Registration-${#}"
+                      exec="onos ${OC#} models | grep l3vpn"/>
+                <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"/>
+            </parallel>
+        </group>
+
         <step name="Cleanup-YANG-Model" exec="onos ${OC1} app uninstall l3vpn"
-              requires="Verify-YANG-Apps"/>
+              requires="Verify-YANG-Models"/>
     </group>
 </scenario>