diff --git a/keystore2/test_utils/Android.bp b/keystore2/test_utils/Android.bp
index c16aa12..e37ba60 100644
--- a/keystore2/test_utils/Android.bp
+++ b/keystore2/test_utils/Android.bp
@@ -43,13 +43,14 @@
     ],
     static_libs: [
         "libkeystore2_ffi_test_utils",
+        "libkeystore-engine",
     ],
     shared_libs: [
+        "android.system.keystore2-V3-ndk",
         "libbase",
         "libcrypto",
         "libkeymaster_portable",
         "libkeymint_support",
-        "libkeystore-engine",
     ],
 }
 
@@ -75,17 +76,18 @@
     srcs: ["ffi_test_utils.cpp"],
     defaults: [
         "keymint_use_latest_hal_aidl_ndk_shared",
+        "keystore2_use_latest_aidl_ndk_shared",
     ],
     generated_headers: [
         "cxx-bridge-header",
         "libkeystore2_ffi_test_utils_bridge_header",
     ],
     generated_sources: ["libkeystore2_ffi_test_utils_bridge_code"],
+    static_libs: ["libkeystore-engine"],
     shared_libs: [
         "libbase",
         "libcrypto",
         "libkeymaster_portable",
-        "libkeystore-engine",
         "libkeymint_support",
     ],
 }