diff --git a/BUCK b/BUCK
index 1f34f9b..1c501a8 100644
--- a/BUCK
+++ b/BUCK
@@ -97,12 +97,16 @@
     '//apps/aaa:onos-apps-aaa-oar',
     '//apps/acl:onos-apps-acl-oar',
     '//apps/bgprouter:onos-apps-bgprouter-oar',
+    '//apps/cip:onos-apps-cip-oar',
+    '//apps/drivermatrix:onos-apps-drivermatrix-oar',
+    '//apps/events:onos-apps-events-oar',
     '//apps/proxyarp:onos-apps-proxyarp-oar',
     '//apps/segmentrouting:onos-apps-segmentrouting-oar',
     '//apps/gangliametrics:onos-apps-gangliametrics-oar',
     '//apps/graphitemetrics:onos-apps-graphitemetrics-oar',
     '//apps/igmp:onos-apps-igmp-oar',
     '//apps/cordmcast:onos-apps-cordmcast-oar',
+    '//apps/flowanalyzer:onos-apps-flowanalyzer-oar',
     '//apps/olt:onos-apps-olt-oar',
     '//apps/influxdbmetrics:onos-apps-influxdbmetrics-oar',
     '//apps/metrics:onos-apps-metrics-oar',
@@ -119,6 +123,13 @@
     '//apps/pim:onos-apps-pim-oar',
     '//apps/reactive-routing:onos-apps-reactive-routing-oar',
     '//apps/sdnip:onos-apps-sdnip-oar',
+    '//apps/test/demo:onos-apps-test-demo-oar',
+    '//apps/test/distributed-primitives:onos-apps-test-distributed-primitives-oar',
+    '//apps/test/election:onos-apps-test-election-oar',
+    '//apps/test/flow-perf:onos-apps-test-flow-perf-oar',
+    '//apps/test/intent-perf:onos-apps-test-intent-perf-oar',
+    '//apps/test/loadtest:onos-apps-test-loadtest-oar',
+    '//apps/test/messaging-perf:onos-apps-test-messaging-perf-oar',
     '//apps/virtualbng:onos-apps-virtualbng-oar',
     '//apps/cordvtn:onos-apps-cordvtn-oar',
     '//apps/vpls:onos-apps-vpls-oar',
@@ -134,18 +145,13 @@
 APP_JARS = [
     '//apps/cpman/api:onos-apps-cpman-api',
     '//apps/routing-api:onos-apps-routing-api',
-    '//apps/cip:onos-app-cip',
     '//apps/dhcp/api:onos-apps-dhcp-api',
     '//apps/dhcp/app:onos-apps-dhcp-app',
-    '//apps/drivermatrix:onos-app-drivermatrix',
-    '//apps/events:onos-app-events',
-    '//apps/flowanalyzer:onos-app-flowanalyzer',
     '//apps/fwd:onos-apps-fwd',
     '//apps/olt:onos-apps-olt-api',
     '//apps/iptopology-api:onos-apps-iptopology-api',
     '//apps/openstacknode:onos-apps-openstacknode',
     '//apps/routing:onos-apps-routing',
-    '//apps/test:onos-app-test',
     '//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc',
     '//apps/vtn/sfcmgr:onos-apps-vtn-sfcmgr',
     '//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr',