diff --git a/tools/test/scenarios/dist-test.xml b/tools/test/scenarios/dist-test.xml
index 941fd20..736cb93 100644
--- a/tools/test/scenarios/dist-test.xml
+++ b/tools/test/scenarios/dist-test.xml
@@ -18,53 +18,18 @@
           description="ONOS distributed primitives setup">
     <group name="Distributed-Primitives">
 
-        <!--<import file="${ONOS_SCENARIOS}/setup.xml"/>
-        <dependency name="Setup" requires="Prerequisites"/>-->
+        <import file="${ONOS_SCENARIOS}/dist-map.xml"/>
+        <dependency name="Distributed-Primitive-Map" requires="Setup"/>
 
-        <step name="Distributed-App"
-              requires="Setup"
-              exec="onos ${OCI} app activate org.onosproject.distributedprimitives"/>
+        <import file="${ONOS_SCENARIOS}/dist-value.xml"/>
+        <dependency name="Distributed-Primitive-Value" requires="Distributed-Primitive-Map"/>
 
-        <step name="Test-Counter-Increment"
-              requires="Distributed-App"
-              exec="onos-execute-expect ${OCI} counter-test-increment fooCounter 5 --expect updated"/>
+        <import file="${ONOS_SCENARIOS}/dist-counter.xml"/>
+        <dependency name="Distributed-Primitive-Counter" requires="Distributed-Primitive-Value"/>
 
-        <step name="Test-Add"
-              requires="Distributed-App"
-              exec="onos-execute-expect ${OCI} set-test-add fooSet foo --expect added"/>
+        <import file="${ONOS_SCENARIOS}/dist-leader.xml"/>
+        <dependency name="Distributed-Primitive-Leader" requires="Distributed-Primitive-Counter"/>
 
-        <step name="Test-Get"
-              requires="Test-Add"
-              exec="onos-execute-expect ${OCI} set-test-get fooSet foo --expect contains"/>
-
-        <step name="Test-Remove"
-              requires="Test-Get"
-              exec="onos-execute-expect ${OCI} set-test-remove fooSet foo --expect removed"/>
-
-        <step name="Test-Add-Multiple"
-              requires="Test-Remove"
-              exec="onos-execute-expect ${OCI} set-test-add fooSet foo foo2 foo3 --expect added"/>
-
-        <step name="Test-Get-Multiple"
-              requires="Test-Add-Multiple"
-              exec="onos-execute-expect ${OCI} set-test-get fooSet foo foo2 foo3 --expect contains"/>
-
-        <step name="Test-Remove-Multiple"
-              requires="Test-Get-Multiple"
-              exec="onos-execute-expect ${OCI} set-test-remove fooSet foo foo2 foo3 --expect removed"/>
-
-        <step name="Test-Map-Put"
-              requires="Distributed-App"
-              exec="onos-execute-expect ${OCI} transactional-map-test-put 1 foo --expect Created"/>
-
-        <step name="Test-Map-Get"
-              requires="Test-Map-Put"
-              exec="onos-execute-expect ${OCI} transactional-map-test-get Key1 --expect Key-value"/>
-
-        <!--Check with check logs-->
-        <step name="Check-Distributed-Exceptions"
-              exec="onos-check-logs ${OCI}"
-              requires="Test-Map-Get"/>
     </group>
 </scenario>