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>