diff --git a/TEST_MAPPING b/TEST_MAPPING
index f694796d91e8ed28b380daaf5499cda22810d720..69a0709acb61c1dcbddbfd49052dbfbc469a1d49 100755
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -56,62 +56,6 @@
     }
   ],
   "presubmit" : [
-    {
-      "name" : "bluetooth_test_common",
-      "host" : true
-    },
-    {
-      "name" : "bluetoothtbd_test",
-      "host" : true
-    },
-    {
-      "name" : "net_test_avrcp",
-      "host" : true
-    },
-    {
-      "name" : "net_test_btcore",
-      "host" : true
-    },
-    {
-      "name" : "net_test_btm_iso",
-      "host" : true
-    },
-    {
-      "name" : "net_test_btpackets",
-      "host" : true
-    },
-    {
-      "name" : "net_test_eatt",
-      "host" : true
-    },
-    {
-      "name" : "net_test_types",
-      "host" : true
-    },
-    {
-      "name" : "net_test_btif_rc",
-      "host" : true
-    },
-    {
-      "name" : "net_test_stack_gatt_native",
-      "host" : true
-    },
-    {
-      "name" : "net_test_hci_fragmenter_native",
-      "host" : true
-    },
-    {
-      "name" : "net_test_hci_native",
-      "host" : true
-    },
-    {
-      "name" : "net_test_stack_a2dp_native",
-      "host" : true
-    },
-    {
-      "name" : "net_test_btif_config_cache",
-      "host" : true
-    },
     {
       "name" : "net_test_hf_client_add_record"
     },
diff --git a/system/btcore/Android.bp b/system/btcore/Android.bp
index 4983a9121f493f2d72578f32fa4424958d5675b6..f82daa84c77c6b5253ce948633a5ae882543cf83 100644
--- a/system/btcore/Android.bp
+++ b/system/btcore/Android.bp
@@ -47,4 +47,7 @@ cc_test {
         "libosi",
     ],
     host_supported: true,
+    test_options: {
+        unit_test: true,
+    },
 }
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 3b2956f74d38c019c8ccccc7ddc4f7e29249651b..d8f287d0ddfbddf826935bcec7f5df736ff0ecbd 100755
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -200,6 +200,9 @@ cc_test {
     defaults: ["fluoride_defaults"],
     test_suites: ["device-tests"],
     host_supported: true,
+    test_options: {
+        unit_test: true,
+    },
     include_dirs: btifCommonIncludes,
     srcs: [
         "test/btif_rc_test.cc",
@@ -233,6 +236,9 @@ cc_test {
     defaults: ["fluoride_defaults"],
     test_suites: ["device-tests"],
     host_supported: true,
+    test_options: {
+        unit_test: true,
+    },
     include_dirs: btifCommonIncludes,
     srcs: [
         "src/btif_config_cache.cc",
diff --git a/system/common/Android.bp b/system/common/Android.bp
index 95cfb843ce3be28c49c7562aef84ab6951a93646..28f8862293000cd8ffbd07bf41a04080335ccacf 100644
--- a/system/common/Android.bp
+++ b/system/common/Android.bp
@@ -34,6 +34,9 @@ cc_test {
         "clang_coverage_bin",
     ],
     host_supported: true,
+    test_options: {
+        unit_test: true,
+    },
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/stack/include",
diff --git a/system/hci/Android.bp b/system/hci/Android.bp
index 12cbefd0de66f8d4e7a1fe3dab7c6703fc084e7c..0d0baee11fbf4217ed2a228e8914953ca8f61cc3 100644
--- a/system/hci/Android.bp
+++ b/system/hci/Android.bp
@@ -92,6 +92,9 @@ cc_test {
     test_suites: ["device-tests"],
     defaults: ["fluoride_defaults"],
     host_supported: true,
+    test_options: {
+        unit_test: true,
+    },
     local_include_dirs: [
         "include",
     ],
@@ -126,6 +129,9 @@ cc_test {
     test_suites: ["device-tests"],
     defaults: ["fluoride_defaults"],
     host_supported: true,
+    test_options: {
+        unit_test: true,
+    },
     local_include_dirs: [
         "include",
     ],
diff --git a/system/packet/Android.bp b/system/packet/Android.bp
index 37cac3b8179cccd08cc0168522307a441bf30761..324de9fddffb47c773bfe5bf11ab8248e00c908b 100644
--- a/system/packet/Android.bp
+++ b/system/packet/Android.bp
@@ -21,6 +21,9 @@ cc_test {
     defaults: ["fluoride_defaults"],
     test_suites: ["device-tests"],
     host_supported: true,
+    test_options: {
+        unit_test: true,
+    },
     local_include_dirs: ["tests"],
     include_dirs: [
         "packages/modules/Bluetooth/system/",
diff --git a/system/profile/avrcp/Android.bp b/system/profile/avrcp/Android.bp
index 52b105750e6299bde5b126ac69fe7543e8caedae..4c4515ea81d3c68318df95a577dda8283249de11 100644
--- a/system/profile/avrcp/Android.bp
+++ b/system/profile/avrcp/Android.bp
@@ -38,6 +38,9 @@ cc_test {
         "clang_coverage_bin",
     ],
     host_supported: true,
+    test_options: {
+        unit_test: true,
+    },
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/btcore/include",
diff --git a/system/service/Android.bp b/system/service/Android.bp
index 6ae9cd7c5f4c94ba36dedea3455a20b9a3668293..12fa20e94ebc0d7e6c62c2968b7116e6bd891a25 100644
--- a/system/service/Android.bp
+++ b/system/service/Android.bp
@@ -130,6 +130,9 @@ cc_test {
     ],
 
     host_supported: true,
+    test_options: {
+        unit_test: true,
+    },
     target: {
         // This includes Binder related tests that can only be run
         // on target.
diff --git a/system/stack/Android.bp b/system/stack/Android.bp
index 63f3818bce4e39afc4ceb89eace59341c23f1f85..54182762514ffe2a09aee40ce6319f1a122cc409 100644
--- a/system/stack/Android.bp
+++ b/system/stack/Android.bp
@@ -454,6 +454,9 @@ cc_test {
     defaults: ["fluoride_defaults"],
     test_suites: ["device-tests"],
     host_supported: true,
+    test_options: {
+        unit_test: true,
+    },
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/stack/include",
@@ -493,6 +496,9 @@ cc_test {
     defaults: ["fluoride_defaults"],
     test_suites: ["device-tests"],
     host_supported: true,
+    test_options: {
+        unit_test: true,
+    },
     include_dirs: [
         "external/libldac/inc",
         "packages/modules/Bluetooth/system",
@@ -562,6 +568,9 @@ cc_test {
     name: "net_test_btm_iso",
     test_suites: ["device-tests"],
     host_supported: true,
+    test_options: {
+        unit_test: true,
+    },
     defaults: ["fluoride_defaults"],
     local_include_dirs: [
         "btm",
@@ -602,6 +611,9 @@ cc_test {
     name: "net_test_eatt",
     test_suites: ["device-tests"],
     host_supported: true,
+    test_options: {
+        unit_test: true,
+    },
     defaults: [
         "fluoride_defaults",
         "clang_coverage_bin",
@@ -649,6 +661,9 @@ cc_test {
     name: "net_test_stack_btm",
     test_suites: ["device-tests"],
     host_supported: true,
+    test_options: {
+        unit_test: true,
+    },
     defaults: ["fluoride_defaults"],
     local_include_dirs: [
         "include",