diff --git a/bluetooth/aidl/TEST_MAPPING b/bluetooth/aidl/TEST_MAPPING
new file mode 100644
index 0000000000..342a1e45ad
--- /dev/null
+++ b/bluetooth/aidl/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit" : [
+    {
+      "name" : "VtsHalBluetoothTargetTest"
+    }
+  ]
+}
diff --git a/bluetooth/aidl/vts/Android.bp b/bluetooth/aidl/vts/Android.bp
index c6c9b9e605..414f707dfd 100644
--- a/bluetooth/aidl/vts/Android.bp
+++ b/bluetooth/aidl/vts/Android.bp
@@ -15,12 +15,12 @@ cc_test {
     ],
     srcs: ["VtsHalBluetoothTargetTest.cpp"],
     shared_libs: [
-        "android.hardware.bluetooth-V1-ndk",
         "libbase",
         "libbinder_ndk",
         "libcutils",
     ],
     static_libs: [
+        "android.hardware.bluetooth-V1-ndk",
         "libbluetooth-types",
     ],
     test_config: "VtsHalBluetoothTargetTest.xml",