diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index 28d5720169962f6084484d2096fad3ef338d3c07..4500bd9d27f90f43dd39fc94b5ea60da8bbb697c 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -253,7 +253,6 @@ cc_library_static {
     header_libs: ["libbluetooth_headers"],
 }
 
-// btif unit tests for target
 cc_test {
     name: "net_test_btif",
     defaults: [
@@ -264,33 +263,27 @@ cc_test {
         "mts_defaults",
     ],
     test_suites: ["general-tests"],
+    host_supported: true,
     include_dirs: btifCommonIncludes,
     srcs: [
         "test/btif_storage_test.cc",
     ],
     header_libs: ["libbluetooth_headers"],
     shared_libs: [
-        "android.hardware.bluetooth.audio@2.0",
-        "android.hardware.bluetooth.audio@2.1",
-        "libaaudio",
         "libbinder_ndk",
         "libcrypto",
         "libcutils",
         "libfmq",
         "libhidlbase",
         "liblog",
-        "libstatssocket",
         "libutils",
         "server_configurable_flags",
     ],
     static_libs: [
-        "android.hardware.bluetooth.a2dp@1.0",
-        "android.hardware.bluetooth@1.0",
-        "android.hardware.bluetooth@1.1",
-        "android.hardware.common-V2-ndk",
-        "android.hardware.common.fmq-V1-ndk",
-        "android.system.suspend.control-V1-ndk",
         "libFraunhoferAAC",
+        "libbase",
+        "libbluetooth-dumpsys",
+        "libbluetooth-for-tests",
         "libbluetooth-types",
         "libbluetooth_core_rs",
         "libbt-audio-hal-interface",
@@ -309,6 +302,9 @@ cc_test {
         "libbtif",
         "libbtif-core",
         "libchrome",
+        "libcom.android.sysprop.bluetooth.wrapped",
+        "libevent",
+        "libflatbuffers-cpp",
         "libg722codec",
         "liblc3",
         "libopus",
@@ -317,15 +313,23 @@ cc_test {
         "libstatslog_bt",
         "libudrv-uipc",
     ],
-    whole_static_libs: [
-        "libbluetooth-dumpsys",
-        "libbluetooth-for-tests",
-    ],
     target: {
         android: {
             shared_libs: [
+                "android.hardware.bluetooth.audio@2.0",
+                "android.hardware.bluetooth.audio@2.1",
                 "libPlatformProperties",
                 "libbinder_ndk",
+                "libstatssocket",
+            ],
+            static_libs: [
+                "android.hardware.bluetooth.a2dp@1.0",
+                "android.hardware.bluetooth@1.0",
+                "android.hardware.bluetooth@1.1",
+                "android.hardware.common-V2-ndk",
+                "android.hardware.common.fmq-V1-ndk",
+                "android.system.suspend.control-V1-ndk",
+                "libaaudio",
             ],
         },
     },