diff --git a/Android.bp b/Android.bp
index c3e5a0d..15a216e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -87,9 +87,10 @@
     ],
 }
 
-rust_test_host {
-    name: "tinyvec_host_test_tests_arrayvec",
+rust_test {
+    name: "tinyvec_test_tests_arrayvec",
     defaults: ["tinyvec_test_defaults"],
+    host_supported: true,
     srcs: ["tests/arrayvec.rs"],
     test_options: {
         unit_test: true,
@@ -97,22 +98,11 @@
 }
 
 rust_test {
-    name: "tinyvec_device_test_tests_arrayvec",
+    name: "tinyvec_test_tests_tinyvec",
     defaults: ["tinyvec_test_defaults"],
-    srcs: ["tests/arrayvec.rs"],
-}
-
-rust_test_host {
-    name: "tinyvec_host_test_tests_tinyvec",
-    defaults: ["tinyvec_test_defaults"],
+    host_supported: true,
     srcs: ["tests/tinyvec.rs"],
     test_options: {
         unit_test: true,
     },
 }
-
-rust_test {
-    name: "tinyvec_device_test_tests_tinyvec",
-    defaults: ["tinyvec_test_defaults"],
-    srcs: ["tests/tinyvec.rs"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index e448918..45f8bcc 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,29 +1,36 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/quiche"
+    },
+    {
+      "path": "external/rust/crates/unicode-normalization"
+    },
+    {
+      "path": "external/rust/crates/url"
+    }
+  ],
   "presubmit": [
     {
       "name": "doh_unit_test"
     },
     {
-      "name": "quiche_device_test_src_lib"
+      "name": "tinyvec_test_tests_arrayvec"
     },
     {
-      "name": "tinyvec_device_test_tests_arrayvec"
+      "name": "tinyvec_test_tests_tinyvec"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "doh_unit_test"
     },
     {
-      "name": "tinyvec_device_test_tests_tinyvec"
+      "name": "tinyvec_test_tests_arrayvec"
     },
     {
-      "name": "unicode-normalization_device_test_src_lib"
-    },
-    {
-      "name": "url_device_test_src_lib"
-    },
-    {
-      "name": "url_device_test_tests_data"
-    },
-    {
-      "name": "url_device_test_tests_unit"
+      "name": "tinyvec_test_tests_tinyvec"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index b86e1c0..5974d19 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -3,10 +3,10 @@
     "//apex_available:platform",
     "com.android.resolv"
   ],
-  "min_sdk_version": "29",
   "dependencies": true,
-  "features": "alloc,default,tinyvec_macros",
   "device": true,
+  "features": "alloc,default,tinyvec_macros",
+  "min-sdk-version": "29",
   "run": true,
   "tests": true
-}
+}
\ No newline at end of file