diff --git a/system/test/Android.bp b/system/test/Android.bp
index c1222ef2691dceae4df64ce5f535d43df7c39500..3116df2bf3fb5c9da35ad0eb8af401cda84de5d2 100644
--- a/system/test/Android.bp
+++ b/system/test/Android.bp
@@ -611,12 +611,11 @@ cc_test {
         "mts_defaults",
     ],
     shared_libs: [
-        "android.hardware.bluetooth.audio@2.0",
-        "android.hardware.bluetooth.audio@2.1",
         "libbase",
         "libbinder",
         "libbinder_ndk",
         "libchrome",
+        "libcutils",
         "libhidlbase",
         "liblog",
         "libutils",
@@ -624,15 +623,15 @@ cc_test {
     include_dirs: ["packages/modules/Bluetooth/system"],
     srcs: ["common/hal_version_manager_test.cc"],
     static_libs: [
-        "android.hardware.bluetooth@1.0",
-        "android.hardware.bluetooth@1.1",
+        "android.hardware.audio.common@5.0",
+        "android.hardware.bluetooth.audio@2.0",
+        "android.hardware.bluetooth.audio@2.1",
         "android.hardware.common-V2-ndk",
         "android.hardware.common.fmq-V1-ndk",
         "bluetooth_flags_c_lib",
         "libbt-audio-hal-interface",
         "libflagtest",
     ],
-    header_libs: ["libbluetooth_headers"],
     test_suites: ["general-tests"],
     cflags: [
         "-Wall",