diff --git a/apps/p4runtime-test/BUCK b/apps/p4runtime-test/BUCK
index c91aced..66fc291 100644
--- a/apps/p4runtime-test/BUCK
+++ b/apps/p4runtime-test/BUCK
@@ -39,7 +39,8 @@
     '//lib:minimal-json',
 ]
 
-osgi_jar_with_tests(
-    deps = COMPILE_DEPS,
-    test_deps = TEST_DEPS,
+java_test(
+    name = "onos-apps-p4runtime-test-tests",
+    srcs = glob([ 'src/test/java/**/*.java' ]),
+    deps = COMPILE_DEPS + TEST_DEPS,
 )
diff --git a/modules.defs b/modules.defs
index 7e3ba3f..572881f 100644
--- a/modules.defs
+++ b/modules.defs
@@ -246,7 +246,7 @@
     '//apps/vtn/sfcmgr:onos-apps-vtn-sfcmgr',
     '//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr',
     '//apps/vtn/vtnweb:onos-apps-vtn-vtnweb',
-    '//apps/p4runtime-test:onos-apps-p4runtime-test',
+#   '//apps/p4runtime-test:onos-apps-p4runtime-test',
 ]
 
 APPS = ONOS_DRIVERS + ONOS_PROVIDERS + ONOS_APPS + MODELS + PROTOCOL_APPS