diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index 354a6d6..bd08bc8 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -42,9 +42,8 @@
     name: "keystore2_test",
     crate_name: "keystore2",
     srcs: ["src/lib.rs"],
-    test_suites: ["device-tests"],
-    auto_gen_config: false,
-    test_config: "AndroidTest.xml",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
     rustlibs: [
         "android.hardware.security.keymint-rust",
         "android.security.apc-rust",