diff --git a/apps/yang/BUCK b/apps/yang/BUCK
index 0a4f8d8..6bc5f06 100644
--- a/apps/yang/BUCK
+++ b/apps/yang/BUCK
@@ -1,37 +1,44 @@
 COMPILE_DEPS = [
-    '//lib:CORE_DEPS',
-    '//lib:onos-yang-model',
-    '//lib:onos-yang-compiler-api',
-    '//lib:onos-yang-runtime',
-    '//lib:onos-yang-serializers-json',
-    '//lib:onos-yang-serializers-xml',
-    '//lib:onos-yang-serializers-utils',
-    '//lib:org.apache.servicemix.bundles.dom4j',
+  '//lib:CORE_DEPS',
+  '//lib:onos-yang-model',
+  '//lib:onos-yang-compiler-api',
+  '//lib:onos-yang-runtime',
+  '//lib:onos-yang-serializers-json',
+  '//lib:onos-yang-serializers-xml',
+  '//lib:onos-yang-serializers-utils',
+  '//lib:org.apache.servicemix.bundles.dom4j',
 ]
 
 BUNDLES = [
-    ':onos-apps-yang',
-    '//lib:onos-yang-model',
-    '//lib:onos-yang-compiler-api',
-    '//lib:onos-yang-runtime',
-    '//lib:onos-yang-serializers-json',
-    '//lib:onos-yang-serializers-xml',
-    '//lib:onos-yang-serializers-utils',
+  '//lib:onos-yang-model',
+  '//lib:onos-yang-compiler-api',
+  '//lib:onos-yang-runtime',
+  '//lib:onos-yang-serializers-json',
+  '//lib:onos-yang-serializers-xml',
+  '//lib:onos-yang-serializers-utils',
+  '//apps/yang:onos-apps-yang',
+  '//apps/yang/web:onos-apps-yang-web',
 ]
 
 EXCLUDED_BUNDLES = [
-    '//lib:org.apache.servicemix.bundles.dom4j',
+  '//lib:org.apache.servicemix.bundles.dom4j',
 ]
 
-osgi_jar (
-    deps = COMPILE_DEPS,
+TEST_DEPS = [
+  '//lib:TEST_ADAPTERS',
+  '//utils/osgi:onlab-osgi-tests',
+]
+
+osgi_jar_with_tests(
+  deps = COMPILE_DEPS,
+  test_deps = TEST_DEPS,
 )
 
-onos_app (
-    title = 'YANG Compiler and Runtime',
-    category = 'Utility',
-    url = 'http://onosproject.org',
-    description = 'Base application to bring in the YANG libraries and assemble them for other apps to use.',
-    included_bundles = BUNDLES,
-    excluded_bundles = EXCLUDED_BUNDLES,
+onos_app(
+  title = 'YANG Compiler and Runtime',
+  category = 'Utility',
+  url = 'http://onosproject.org',
+  description = 'Base application to bring in the YANG libraries and assemble them for other apps to use.',
+  included_bundles = BUNDLES,
+  excluded_bundles = EXCLUDED_BUNDLES,
 )
\ No newline at end of file