diff --git a/keystore/Android.bp b/keystore/Android.bp
index 8af8717..37bc6a8 100644
--- a/keystore/Android.bp
+++ b/keystore/Android.bp
@@ -85,7 +85,6 @@
 cc_binary {
     name: "keystore_cli",
     defaults: ["keystore_defaults"],
-    tags: ["debug"],
 
     srcs: ["keystore_cli.cpp"],
     shared_libs: [
@@ -106,7 +105,6 @@
 cc_binary {
     name: "keystore_cli_v2",
     defaults: ["keystore_defaults"],
-    tags: ["debug"],
 
     cflags: [
         "-DKEYMASTER_NAME_TAGS",
diff --git a/keystore/tests/Android.bp b/keystore/tests/Android.bp
index c3f5177..73459c1 100644
--- a/keystore/tests/Android.bp
+++ b/keystore/tests/Android.bp
@@ -14,7 +14,6 @@
         "gtest_main.cpp",
     ],
     name: "keystore_unit_tests",
-    tags: ["test"],
     static_libs: [
         "android.hardware.confirmationui@1.0",
         "libbase",