diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 8d0f4e7..b7270b1 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -62,6 +62,9 @@
     shared_libs: [
         "libcutils",
     ],
+    features: [
+        "watchdog",
+    ],
 }
 
 rust_library {
@@ -91,6 +94,10 @@
         "libkeystore2_test_utils",
         "libnix",
     ],
+    // The test should always include watchdog.
+    features: [
+        "watchdog",
+    ],
 }
 
 rust_binary {