diff --git a/Android.bp b/Android.bp
index 23270c3..6b36480 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --device --run --dependencies --tests.
+// This file is generated by cargo2android.py --device --run --tests.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     default_applicable_licenses: [
@@ -38,12 +39,18 @@
     ],
 }
 
-rust_defaults {
-    name: "fallible-iterator_defaults",
+rust_test {
+    name: "fallible-iterator_test_src_lib",
+    host_supported: true,
     crate_name: "fallible_iterator",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.0",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "default",
@@ -51,20 +58,12 @@
     ],
 }
 
-rust_test_host {
-    name: "fallible-iterator_host_test_src_lib",
-    defaults: ["fallible-iterator_defaults"],
-}
-
-rust_test {
-    name: "fallible-iterator_device_test_src_lib",
-    defaults: ["fallible-iterator_defaults"],
-}
-
 rust_library {
     name: "libfallible_iterator",
     host_supported: true,
     crate_name: "fallible_iterator",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.2.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 9d4d72a..9df2505 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,7 +2,18 @@
 {
   "presubmit": [
     {
-      "name": "fallible-iterator_device_test_src_lib"
+      "name": "fallible-iterator_test_src_lib"
+    },
+    {
+      "name": "keystore2_test"
+    },
+    {
+      "name": "legacykeystore_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "fallible-iterator_test_src_lib"
     },
     {
       "name": "keystore2_test"
diff --git a/cargo2android.json b/cargo2android.json
new file mode 100644
index 0000000..d36fb44
--- /dev/null
+++ b/cargo2android.json
@@ -0,0 +1,5 @@
+{
+  "device": true,
+  "run": true,
+  "tests": true
+}
\ No newline at end of file