diff --git a/tools/test/scenarios/dist-counter.xml b/tools/test/scenarios/dist-counter.xml
index ca3c6b1..57ba15f 100644
--- a/tools/test/scenarios/dist-counter.xml
+++ b/tools/test/scenarios/dist-counter.xml
@@ -18,60 +18,71 @@
           description="ONOS AtomicCounter distributed primitive Test">
     <group name="Distributed-Primitive-Counter">
 
-        <step name="Distributed-Primitive-Counter.Activate-Distributed-Primitives-App"
-            exec="onos ${OCI} app activate org.onosproject.distributedprimitives"/>
-
-        <step name="Distributed-Primitive-Counter.Test-Counter-Initial-Value" requires="Distributed-Primitive-Counter.Activate-Distributed-Primitives-App"
+        <step name="Distributed-Primitive-Counter.Test-Counter-Initial-Value"
+              requires="Distributed-Primitives-Setup"
               exec="onos-cluster-execute-expect counter-test test-counter get --expect 0"/>
 
-        <step name="Distributed-Primitive-Counter.Test-Counter-Set" requires="Distributed-Primitive-Counter.Test-Counter-Initial-Value"
+        <step name="Distributed-Primitive-Counter.Test-Counter-Set"
+              requires="Distributed-Primitive-Counter.Test-Counter-Initial-Value"
               exec="onos ${OCI} counter-test test-counter set 1"/>
 
-        <step name="Distributed-Primitive-Counter.Test-Counter-Get" requires="Distributed-Primitive-Counter.Test-Counter-Set"
+        <step name="Distributed-Primitive-Counter.Test-Counter-Get"
+              requires="Distributed-Primitive-Counter.Test-Counter-Set"
               exec="onos-cluster-execute-expect counter-test test-counter get --expect 1"/>
 
-        <step name="Distributed-Primitive-Counter.Test-Counter-IncrementAndGet" requires="Distributed-Primitive-Counter.Test-Counter-Get"
+        <step name="Distributed-Primitive-Counter.Test-Counter-IncrementAndGet"
+              requires="Distributed-Primitive-Counter.Test-Counter-Get"
               exec="onos-execute-expect ${OCI} counter-test test-counter incrementAndGet --expect 2"/>
 
-        <step name="Distributed-Primitive-Counter.Test-Counter-GetAndIncrement" requires="Distributed-Primitive-Counter.Test-Counter-IncrementAndGet"
+        <step name="Distributed-Primitive-Counter.Test-Counter-GetAndIncrement"
+              requires="Distributed-Primitive-Counter.Test-Counter-IncrementAndGet"
               exec="onos-execute-expect ${OCI} counter-test test-counter getAndIncrement --expect 2"/>
 
-        <step name="Distributed-Primitive-Counter.Test-Counter-Incremented" requires="Distributed-Primitive-Counter.Test-Counter-GetAndIncrement"
+        <step name="Distributed-Primitive-Counter.Test-Counter-Incremented"
+              requires="Distributed-Primitive-Counter.Test-Counter-GetAndIncrement"
               exec="onos-cluster-execute-expect counter-test test-counter get --expect 3"/>
 
-        <step name="Distributed-Primitive-Counter.Test-Counter-AddAndGet" requires="Distributed-Primitive-Counter.Test-Counter-Incremented"
+        <step name="Distributed-Primitive-Counter.Test-Counter-AddAndGet"
+              requires="Distributed-Primitive-Counter.Test-Counter-Incremented"
               exec="onos-execute-expect ${OCI} counter-test test-counter addAndGet 10 --expect 13"/>
 
-        <step name="Distributed-Primitive-Counter.Test-Counter-GetAndAdd" requires="Distributed-Primitive-Counter.Test-Counter-AddAndGet"
+        <step name="Distributed-Primitive-Counter.Test-Counter-GetAndAdd"
+              requires="Distributed-Primitive-Counter.Test-Counter-AddAndGet"
               exec="onos-execute-expect ${OCI} counter-test test-counter getAndAdd 10 --expect 13"/>
 
-        <step name="Distributed-Primitive-Counter.Test-Counter-Updated-After-GetAndAdd" requires="Distributed-Primitive-Counter.Test-Counter-GetAndAdd"
+        <step name="Distributed-Primitive-Counter.Test-Counter-Updated-After-GetAndAdd"
+              requires="Distributed-Primitive-Counter.Test-Counter-GetAndAdd"
               exec="onos-cluster-execute-expect counter-test test-counter get --expect 23"/>
 
-        <step name="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-False" requires="Distributed-Primitive-Counter.Test-Counter-Updated-After-GetAndAdd"
+        <step name="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-False"
+              requires="Distributed-Primitive-Counter.Test-Counter-Updated-After-GetAndAdd"
               exec="onos-execute-expect ${OCI} counter-test test-counter compareAndSet 1 2 --expect false"/>
 
-        <step name="Distributed-Primitive-Counter.Test-Counter-Not-Updated-After-CAS" requires="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-False"
+        <step name="Distributed-Primitive-Counter.Test-Counter-Not-Updated-After-CAS"
+              requires="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-False"
               exec="onos-cluster-execute-expect counter-test test-counter get --expect 23"/>
 
-        <step name="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-True" requires="Distributed-Primitive-Counter.Test-Counter-Not-Updated-After-CAS"
+        <step name="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-True"
+              requires="Distributed-Primitive-Counter.Test-Counter-Not-Updated-After-CAS"
               exec="onos-execute-expect ${OCI} counter-test test-counter compareAndSet 23 25 --expect true"/>
 
-        <step name="Distributed-Primitive-Counter.Test-Counter-Updated-After-CAS" requires="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-True"
+        <step name="Distributed-Primitive-Counter.Test-Counter-Updated-After-CAS"
+              requires="Distributed-Primitive-Counter.Test-Counter-CompareAndSet-True"
               exec="onos-cluster-execute-expect counter-test test-counter get --expect 25"/>
 
-        <step name="Distributed-Primitive-Counter.Test-Counter-Reset" requires="Distributed-Primitive-Counter.Test-Counter-Updated-After-CAS"
+        <step name="Distributed-Primitive-Counter.Test-Counter-Reset"
+              requires="Distributed-Primitive-Counter.Test-Counter-Updated-After-CAS"
               exec="onos ${OCI} counter-test test-counter set 0"/>
 
-        <step name="Distributed-Primitive-Counter.Test-Counter-Get-After-Reset" requires="Distributed-Primitive-Counter.Test-Counter-Reset"
+        <step name="Distributed-Primitive-Counter.Test-Counter-Get-After-Reset"
+              requires="Distributed-Primitive-Counter.Test-Counter-Reset"
               exec="onos-cluster-execute-expect counter-test test-counter get --expect 0"/>
 
         <!--Check with check logs-->
-        <step name="Distributed-Primitive-Counter.Check-Log-Exceptions" requires="Distributed-Primitive-Counter.Test-Counter-Get-After-Reset"
+        <step name="Distributed-Primitive-Counter.Check-Log-Exceptions"
+              requires="Distributed-Primitive-Counter.Test-Counter-Get-After-Reset"
               exec="onos-check-logs ${OCI}"/>
 
-        <step name="Distributed-Primitive-Counter.Teardown-Distributed-Primitives-Test-App" requires="Distributed-Primitive-Counter.Check-Log-Exceptions"
-              exec="onos ${OCI} app deactivate org.onosproject.distributedprimitives"/>
     </group>
 </scenario>
 
diff --git a/tools/test/scenarios/dist-leader.xml b/tools/test/scenarios/dist-leader.xml
index 5de4ff3..832390d 100644
--- a/tools/test/scenarios/dist-leader.xml
+++ b/tools/test/scenarios/dist-leader.xml
@@ -18,27 +18,27 @@
           description="ONOS LeaderElector distributed primitive Test">
     <group name="Distributed-Primitive-Leader">
 
-        <step name="Distributed-Primitive-Leader.Activate-Distributed-Primitives-App"
-            exec="onos ${OCI} app activate org.onosproject.distributedprimitives"/>
-
-        <step name="Distributed-Primitive-Leader.Test-Initial-No-Leader" requires="Distributed-Primitive-Leader.Activate-Distributed-Primitives-App"
+        <step name="Distributed-Primitive-Leader.Test-Initial-No-Leader"
+              requires="Distributed-Primitives-Setup"
               exec="onos-cluster-execute-expect leader-test test-elector show foo --expect leader=none#candidates=none"/>
 
-        <step name="Distributed-Primitive-Leader.Test-Leader-Run" requires="Distributed-Primitive-Leader.Test-Initial-No-Leader"
+        <step name="Distributed-Primitive-Leader.Test-Leader-Run"
+              requires="Distributed-Primitive-Leader.Test-Initial-No-Leader"
               exec="onos-execute-expect ${OCI} leader-test test-elector run foo --expect leader=${OCI}#term=[0-9][0-9]*#candidates=${OCI}"/>
 
-        <step name="Distributed-Primitive-Leader.Test-Leader-Withdraw" requires="Distributed-Primitive-Leader.Test-Leader-Run"
+        <step name="Distributed-Primitive-Leader.Test-Leader-Withdraw"
+              requires="Distributed-Primitive-Leader.Test-Leader-Run"
               exec="onos ${OCI} leader-test test-elector withdraw foo"/>
 
-        <step name="Distributed-Primitive-Leader.Test-No-Leader-After-Withdraw" requires="Distributed-Primitive-Leader.Test-Leader-Withdraw"
+        <step name="Distributed-Primitive-Leader.Test-No-Leader-After-Withdraw"
+              requires="Distributed-Primitive-Leader.Test-Leader-Withdraw"
               exec="onos-cluster-execute-expect leader-test test-elector show foo --expect leader=none#candidates=none"/>
 
         <!--Check with check logs-->
-        <step name="Distributed-Primitive-Leader.Check-Log-Exceptions" requires="Distributed-Primitive-Leader.Test-No-Leader-After-Withdraw"
+        <step name="Distributed-Primitive-Leader.Check-Log-Exceptions"
+            requires="Distributed-Primitive-Leader.Test-No-Leader-After-Withdraw"
               exec="onos-check-logs ${OCI}"/>
 
-        <step name="Distributed-Primitive-Leader.Teardown-Distributed-Primitives-Test-App" requires="Distributed-Primitive-Leader.Check-Log-Exceptions"
-              exec="onos ${OCI} app deactivate org.onosproject.distributedprimitives"/>
     </group>
 </scenario>
 
diff --git a/tools/test/scenarios/dist-map.xml b/tools/test/scenarios/dist-map.xml
index 62f8c51..631bd68 100644
--- a/tools/test/scenarios/dist-map.xml
+++ b/tools/test/scenarios/dist-map.xml
@@ -18,75 +18,91 @@
           description="ONOS ConsistentMap distributed primitive Test">
     <group name="Distributed-Primitive-Map">
 
-        <step name="Distributed-Primitive-Map.Activate-Distributed-Primitives-App"
-            exec="onos ${OCI} app activate org.onosproject.distributedprimitives"/>
-
-        <step name="Distributed-Primitive-Map.Test-Map-Get" requires="Distributed-Primitive-Map.Activate-Distributed-Primitives-App"
+        <step name="Distributed-Primitive-Map.Test-Map-Get"
+              requires="Distributed-Primitives-Setup"
               exec="onos-cluster-execute-expect map-test foo get a --expect null"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-Put" requires="Distributed-Primitive-Map.Test-Map-Get"
+        <step name="Distributed-Primitive-Map.Test-Map-Put"
+              requires="Distributed-Primitive-Map.Test-Map-Get"
               exec="onos-execute-expect ${OCI} map-test foo put a b --expect null"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-Updated-After-Put" requires="Distributed-Primitive-Map.Test-Map-Put"
+        <step name="Distributed-Primitive-Map.Test-Map-Updated-After-Put"
+              requires="Distributed-Primitive-Map.Test-Map-Put"
               exec="onos-cluster-execute-expect map-test foo get a --expect b"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-PutIfAbsent-When-Key-Present" requires="Distributed-Primitive-Map.Test-Map-Updated-After-Put"
+        <step name="Distributed-Primitive-Map.Test-Map-PutIfAbsent-When-Key-Present"
+              requires="Distributed-Primitive-Map.Test-Map-Updated-After-Put"
               exec="onos-execute-expect ${OCI} map-test foo putIfAbsent a c --expect b"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-PutIfAbsent-When-Key-Absent" requires="Distributed-Primitive-Map.Test-Map-PutIfAbsent-When-Key-Present"
+        <step name="Distributed-Primitive-Map.Test-Map-PutIfAbsent-When-Key-Absent"
+              requires="Distributed-Primitive-Map.Test-Map-PutIfAbsent-When-Key-Present"
               exec="onos-execute-expect ${OCI} map-test foo putIfAbsent b c --expect null"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-Updated-After-PutIfAbsent" requires="Distributed-Primitive-Map.Test-Map-PutIfAbsent-When-Key-Absent"
+        <step name="Distributed-Primitive-Map.Test-Map-Updated-After-PutIfAbsent"
+              requires="Distributed-Primitive-Map.Test-Map-PutIfAbsent-When-Key-Absent"
               exec="onos-cluster-execute-expect map-test foo get b --expect c"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-Updated-After-PutAndGet" requires="Distributed-Primitive-Map.Test-Map-Updated-After-PutIfAbsent"
+        <step name="Distributed-Primitive-Map.Test-Map-Updated-After-PutAndGet"
+              requires="Distributed-Primitive-Map.Test-Map-Updated-After-PutIfAbsent"
               exec="onos-execute-expect ${OCI} map-test foo putAndGet b d --expect d"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-Replace-When-Key-Absent" requires="Distributed-Primitive-Map.Test-Map-Updated-After-PutAndGet"
+        <step name="Distributed-Primitive-Map.Test-Map-Replace-When-Key-Absent"
+              requires="Distributed-Primitive-Map.Test-Map-Updated-After-PutAndGet"
               exec="onos-execute-expect ${OCI} map-test foo replace c e --expect null"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-Replace-When-Key-Present" requires="Distributed-Primitive-Map.Test-Map-Replace-When-Key-Absent"
+        <step name="Distributed-Primitive-Map.Test-Map-Replace-When-Key-Present"
+              requires="Distributed-Primitive-Map.Test-Map-Replace-When-Key-Absent"
               exec="onos-execute-expect ${OCI} map-test foo replace b e --expect d"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-Replace-When-Value-Does-Not-Match" requires="Distributed-Primitive-Map.Test-Map-Replace-When-Key-Present"
+        <step name="Distributed-Primitive-Map.Test-Map-Replace-When-Value-Does-Not-Match"
+              requires="Distributed-Primitive-Map.Test-Map-Replace-When-Key-Present"
               exec="onos-execute-expect ${OCI} map-test foo replace b x f --expect false"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-Replace-When-Value-Does-Match" requires="Distributed-Primitive-Map.Test-Map-Replace-When-Value-Does-Not-Match"
+        <step name="Distributed-Primitive-Map.Test-Map-Replace-When-Value-Does-Match"
+              requires="Distributed-Primitive-Map.Test-Map-Replace-When-Value-Does-Not-Match"
               exec="onos-execute-expect ${OCI} map-test foo replace b e f --expect true"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-ContainsValue-False-Case" requires="Distributed-Primitive-Map.Test-Map-Replace-When-Value-Does-Match"
+        <step name="Distributed-Primitive-Map.Test-Map-ContainsValue-False-Case"
+              requires="Distributed-Primitive-Map.Test-Map-Replace-When-Value-Does-Match"
               exec="onos-cluster-execute-expect map-test foo containsValue x --expect false"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-ContainsValue-True-Case" requires="Distributed-Primitive-Map.Test-Map-ContainsValue-False-Case"
+        <step name="Distributed-Primitive-Map.Test-Map-ContainsValue-True-Case"
+              requires="Distributed-Primitive-Map.Test-Map-ContainsValue-False-Case"
               exec="onos-cluster-execute-expect map-test foo containsValue f --expect true"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-Size" requires="Distributed-Primitive-Map.Test-Map-ContainsValue-True-Case"
+        <step name="Distributed-Primitive-Map.Test-Map-Size"
+              requires="Distributed-Primitive-Map.Test-Map-ContainsValue-True-Case"
               exec="onos-cluster-execute-expect map-test foo size --expect 2"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-IsEmpty" requires="Distributed-Primitive-Map.Test-Map-Size"
+        <step name="Distributed-Primitive-Map.Test-Map-IsEmpty"
+              requires="Distributed-Primitive-Map.Test-Map-Size"
               exec="onos-cluster-execute-expect map-test foo isEmpty --expect false"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-Remove" requires="Distributed-Primitive-Map.Test-Map-IsEmpty"
+        <step name="Distributed-Primitive-Map.Test-Map-Remove"
+              requires="Distributed-Primitive-Map.Test-Map-IsEmpty"
               exec="onos-execute-expect ${OCI} map-test foo remove b --expect f"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-Remove-Key-Value-Does-Not-Match" requires="Distributed-Primitive-Map.Test-Map-Remove"
+        <step name="Distributed-Primitive-Map.Test-Map-Remove-Key-Value-Does-Not-Match"
+              requires="Distributed-Primitive-Map.Test-Map-Remove"
               exec="onos-execute-expect ${OCI} map-test foo remove a c --expect false"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-Remove-Key-Value-Does-Match" requires="Distributed-Primitive-Map.Test-Map-Remove-Key-Value-Does-Not-Match"
+        <step name="Distributed-Primitive-Map.Test-Map-Remove-Key-Value-Does-Match"
+              requires="Distributed-Primitive-Map.Test-Map-Remove-Key-Value-Does-Not-Match"
               exec="onos-execute-expect ${OCI} map-test foo remove a b --expect true"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-Clear" requires="Distributed-Primitive-Map.Test-Map-Remove-Key-Value-Does-Match"
+        <step name="Distributed-Primitive-Map.Test-Map-Clear"
+              requires="Distributed-Primitive-Map.Test-Map-Remove-Key-Value-Does-Match"
               exec="onos ${OCI} map-test foo clear"/>
 
-        <step name="Distributed-Primitive-Map.Test-Map-Cleared" requires="Distributed-Primitive-Map.Test-Map-Clear"
+        <step name="Distributed-Primitive-Map.Test-Map-Cleared"
+              requires="Distributed-Primitive-Map.Test-Map-Clear"
               exec="onos-execute-expect ${OCI} map-test foo isEmpty --expect true"/>
 
         <!--Check with check logs-->
-        <step name="Distributed-Primitive-Map.Check-Log-Exceptions" requires="Distributed-Primitive-Map.Test-Map-Cleared"
+        <step name="Distributed-Primitive-Map.Check-Log-Exceptions"
+              requires="Distributed-Primitive-Map.Test-Map-Cleared"
               exec="onos-check-logs ${OCI}"/>
 
-        <step name="Distributed-Primitive-Map.Teardown-Distributed-Primitives-Test-App" requires="Distributed-Primitive-Map.Check-Log-Exceptions"
-              exec="onos ${OCI} app deactivate org.onosproject.distributedprimitives"/>
     </group>
 </scenario>
 
diff --git a/tools/test/scenarios/dist-setup.xml b/tools/test/scenarios/dist-setup.xml
new file mode 100644
index 0000000..7b35087
--- /dev/null
+++ b/tools/test/scenarios/dist-setup.xml
@@ -0,0 +1,27 @@
+<!--
+  ~ Copyright 2015-present Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<scenario name="dist-setup" description="ONOS distributed primitives setup">
+    <group name="Distributed-Primitives-Setup">
+        <step name="Distributed-Primitives-Setup.Activate-Distributed-Primitives-Test-App"
+              exec="onos ${OCI} app activate org.onosproject.distributedprimitives"/>
+
+        <parallel var="${OC#}">
+            <step name="Distributed-Primitives-Setup.Check-Apps-${#}"
+                  requires="Distributed-Primitives-Setup.Activate-Distributed-Primitives-Test-App"
+                  exec="onos-check-apps ${OC#} distributedprimitives includes"/>
+        </parallel>
+    </group>
+</scenario>
diff --git a/tools/test/scenarios/dist-teardown.xml b/tools/test/scenarios/dist-teardown.xml
new file mode 100644
index 0000000..b22df00
--- /dev/null
+++ b/tools/test/scenarios/dist-teardown.xml
@@ -0,0 +1,27 @@
+<!--
+  ~ Copyright 2015-present Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<scenario name="dist-teardown" description="ONOS distributed primitives teardown">
+    <group name="Distributed-Primitives-Teardown">
+        <step name="Distributed-Primitives-Teardown.Deactivate-Distributed-Primitives-Test-App"
+              exec="onos ${OCI} app deactivate org.onosproject.distributedprimitives"/>
+
+        <parallel var="${OC#}">
+            <step name="Distributed-Primitives-Teardown.Check-Apps-${#}"
+                  requires="Distributed-Primitives-Teardown.Deactivate-Distributed-Primitives-Test-App"
+                  exec="onos-check-apps ${OC#} distributedprimitives excludes"/>
+        </parallel>
+    </group>
+</scenario>
diff --git a/tools/test/scenarios/dist-test.xml b/tools/test/scenarios/dist-test.xml
index 9c2f068..6788d62 100644
--- a/tools/test/scenarios/dist-test.xml
+++ b/tools/test/scenarios/dist-test.xml
@@ -18,21 +18,32 @@
           description="ONOS distributed primitives setup">
     <group name="Distributed-Primitives">
 
-        <import file="${ONOS_SCENARIOS}/dist-map.xml"/>
-        <dependency name="Distributed-Primitive-Map" requires="Setup"/>
+        <import file="${ONOS_SCENARIOS}/dist-setup.xml"/>
+        <dependency name="Distributed-Primitives-Setup" requires="Setup"/>
 
-        <import file="${ONOS_SCENARIOS}/dist-value.xml"/>
-        <dependency name="Distributed-Primitive-Value" requires="Distributed-Primitive-Map"/>
+        <group name="Distributed-Primitives-Internal" requires="Distributed-Primitives-Setup">
 
-        <import file="${ONOS_SCENARIOS}/dist-counter.xml"/>
-        <dependency name="Distributed-Primitive-Counter" requires="Distributed-Primitive-Value"/>
+            <import file="${ONOS_SCENARIOS}/dist-map.xml"/>
+            <dependency name="Distributed-Primitive-Map"/>
 
-        <import file="${ONOS_SCENARIOS}/dist-leader.xml"/>
-        <dependency name="Distributed-Primitive-Leader" requires="Distributed-Primitive-Counter"/>
+            <import file="${ONOS_SCENARIOS}/dist-value.xml"/>
+            <dependency name="Distributed-Primitive-Value"/>
 
-        <import file="${ONOS_SCENARIOS}/dist-work-queue.xml"/>
-        <dependency name="Distributed-Primitive-WorkQueue" requires="Distributed-Primitive-Leader"/>
+            <import file="${ONOS_SCENARIOS}/dist-counter.xml"/>
+            <dependency name="Distributed-Primitive-Counter"/>
+
+            <import file="${ONOS_SCENARIOS}/dist-leader.xml"/>
+            <dependency name="Distributed-Primitive-Leader"/>
+
+            <import file="${ONOS_SCENARIOS}/dist-work-queue.xml"/>
+            <dependency name="Distributed-Primitive-WorkQueue"/>
+
+        </group>
+
+        <import file="${ONOS_SCENARIOS}/dist-teardown.xml"/>
+        <dependency name="Distributed-Primitives-Teardown" requires="Distributed-Primitives-Internal"/>
 
     </group>
+
 </scenario>
 
diff --git a/tools/test/scenarios/dist-value.xml b/tools/test/scenarios/dist-value.xml
index c3ff3ac..5b26d90e 100644
--- a/tools/test/scenarios/dist-value.xml
+++ b/tools/test/scenarios/dist-value.xml
@@ -18,42 +18,43 @@
           description="ONOS AtomicValue distributed primitive Test">
     <group name="Distributed-Primitive-Value">
 
-        <!--<import file="${ONOS_SCENARIOS}/setup.xml"/>
-        <dependency name="Setup" requires="Prerequisites"/>-->
-
-        <step name="Distributed-Primitive-Value.Activate-Distributed-Primitives-App"
-            exec="onos ${OCI} app activate org.onosproject.distributedprimitives"/>
-
-        <step name="Distributed-Primitive-Value.Test-Value-Initial-Value" requires="Distributed-Primitive-Value.Activate-Distributed-Primitives-App"
+        <step name="Distributed-Primitive-Value.Test-Value-Initial-Value"
+              requires="Distributed-Primitives-Setup"
               exec="onos-cluster-execute-expect value-test test-value get --expect null"/>
 
-        <step name="Distributed-Primitive-Value.Test-Value-Set" requires="Distributed-Primitive-Value.Test-Value-Initial-Value"
+        <step name="Distributed-Primitive-Value.Test-Value-Set"
+              requires="Distributed-Primitive-Value.Test-Value-Initial-Value"
               exec="onos ${OCI} value-test test-value set v0"/>
 
-        <step name="Distributed-Primitive-Value.Test-Value-Get" requires="Distributed-Primitive-Value.Test-Value-Set"
+        <step name="Distributed-Primitive-Value.Test-Value-Get"
+              requires="Distributed-Primitive-Value.Test-Value-Set"
               exec="onos-cluster-execute-expect value-test test-value get --expect v0"/>
 
-        <step name="Distributed-Primitive-Value.Test-Value-CompareAndSet-False" requires="Distributed-Primitive-Value.Test-Value-Get"
+        <step name="Distributed-Primitive-Value.Test-Value-CompareAndSet-False"
+              requires="Distributed-Primitive-Value.Test-Value-Get"
               exec="onos-execute-expect ${OCI} value-test test-value compareAndSet v1 v2 --expect false"/>
 
-        <step name="Distributed-Primitive-Value.Test-Value-Not-Updated-After-CAS" requires="Distributed-Primitive-Value.Test-Value-CompareAndSet-False"
+        <step name="Distributed-Primitive-Value.Test-Value-Not-Updated-After-CAS"
+              requires="Distributed-Primitive-Value.Test-Value-CompareAndSet-False"
               exec="onos-cluster-execute-expect value-test test-value get --expect v0"/>
 
-        <step name="Distributed-Primitive-Value.Test-Value-CompareAndSet-True" requires="Distributed-Primitive-Value.Test-Value-Not-Updated-After-CAS"
+        <step name="Distributed-Primitive-Value.Test-Value-CompareAndSet-True"
+              requires="Distributed-Primitive-Value.Test-Value-Not-Updated-After-CAS"
               exec="onos-execute-expect ${OCI} value-test test-value compareAndSet v0 v1 --expect true"/>
 
-        <step name="Distributed-Primitive-Value.Test-Value-Updated-After-CAS" requires="Distributed-Primitive-Value.Test-Value-CompareAndSet-True"
+        <step name="Distributed-Primitive-Value.Test-Value-Updated-After-CAS"
+              requires="Distributed-Primitive-Value.Test-Value-CompareAndSet-True"
               exec="onos-cluster-execute-expect value-test test-value get --expect v1"/>
 
-        <step name="Distributed-Primitive-Value.Destroy-Value" requires="Distributed-Primitive-Value.Test-Value-Updated-After-CAS"
+        <step name="Distributed-Primitive-Value.Destroy-Value"
+              requires="Distributed-Primitive-Value.Test-Value-Updated-After-CAS"
               exec="onos ${OCI} value-test test-value set null"/>
 
         <!--Check with check logs-->
-        <step name="Distributed-Primitive-Value.Check-Log-Exceptions" requires="Distributed-Primitive-Value.Destroy-Value"
+        <step name="Distributed-Primitive-Value.Check-Log-Exceptions"
+              requires="Distributed-Primitive-Value.Destroy-Value"
               exec="onos-check-logs ${OCI}"/>
 
-        <step name="Distributed-Primitive-Value.Teardown-Distributed-Primitives-Test-App" requires="Distributed-Primitive-Value.Check-Log-Exceptions"
-              exec="onos ${OCI} app deactivate org.onosproject.distributedprimitives"/>
     </group>
 </scenario>
 
diff --git a/tools/test/scenarios/dist-work-queue.xml b/tools/test/scenarios/dist-work-queue.xml
index 7bbb511..c0b4529 100644
--- a/tools/test/scenarios/dist-work-queue.xml
+++ b/tools/test/scenarios/dist-work-queue.xml
@@ -18,45 +18,51 @@
           description="ONOS WorkQueue distributed primitive Test">
     <group name="Distributed-Primitive-WorkQueue">
 
-        <step name="Distributed-Primitive-WorkQueue.Activate-Distributed-Primitives-App"
-            exec="onos ${OCI} app activate org.onosproject.distributedprimitives"/>
-
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-AddOne" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-AddOne"
+              requires="Distributed-Primitives-Setup"
               exec="onos-execute-expect ${OCI} work-queue-test stc-test-work-queue add foo --expect Done"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-Pending-1" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-Pending-1"
+              requires="^"
               exec="onos-cluster-execute-expect work-queue-test stc-test-work-queue totalPending --expect 1"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-InProgress-1" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-InProgress-1"
+              requires="^"
               exec="onos-cluster-execute-expect work-queue-test stc-test-work-queue totalInProgress --expect 0"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-TotalCompleted-1" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-TotalCompleted-1"
+              requires="^"
               exec="onos-cluster-execute-expect work-queue-test stc-test-work-queue totalCompleted --expect 0"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-AddMultiple" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-AddMultiple"
+              requires="^"
               exec="onos-execute-expect ${OCI} work-queue-test stc-test-work-queue addMultiple bar car --expect Done"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-TakeAndComplete" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-TakeAndComplete"
+              requires="^"
               exec="onos-execute-expect ${OCI} work-queue-test stc-test-work-queue takeAndComplete 3 --expect Done"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-Pending-2" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-Pending-2"
+              requires="^"
               exec="onos-cluster-execute-expect work-queue-test stc-test-work-queue totalPending --expect 0"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-InProgress-2" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-InProgress-2"
+              requires="^"
               exec="onos-cluster-execute-expect work-queue-test stc-test-work-queue totalInProgress --expect 0"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-TotalCompleted-2" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Check-TotalCompleted-2"
+              requires="^"
               exec="onos-cluster-execute-expect work-queue-test stc-test-work-queue totalCompleted --expect 3"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Destroy" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Test-Queue-Destroy"
+              requires="^"
               exec="onos ${OCI} work-queue-test stc-test-work-queue destroy"/>
 
         <!--Check with check logs-->
-        <step name="Distributed-Primitive-WorkQueue.Check-Log-Exceptions" requires="^"
+        <step name="Distributed-Primitive-WorkQueue.Check-Log-Exceptions"
+              requires="^"
               exec="onos-check-logs ${OCI}"/>
 
-        <step name="Distributed-Primitive-WorkQueue.Teardown-Distributed-Primitives-Test-App" requires="^"
-              exec="onos ${OCI} app deactivate org.onosproject.distributedprimitives"/>
     </group>
 </scenario>