diff --git a/Android.bp b/Android.bp
index 623b803..5ff1546 100644
--- a/Android.bp
+++ b/Android.bp
@@ -44,6 +44,8 @@
     name: "libunicode_normalization",
     host_supported: true,
     crate_name: "unicode_normalization",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.19",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
@@ -60,12 +62,18 @@
     min_sdk_version: "29",
 }
 
-rust_defaults {
-    name: "unicode-normalization_defaults",
+rust_test {
+    name: "unicode-normalization_test_src_lib",
+    host_supported: true,
     crate_name: "unicode_normalization",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.19",
     srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "default",
@@ -75,20 +83,3 @@
         "libtinyvec",
     ],
 }
-
-rust_test_host {
-    name: "unicode-normalization_host_test_src_lib",
-    defaults: ["unicode-normalization_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "unicode-normalization_device_test_src_lib",
-    defaults: ["unicode-normalization_defaults"],
-}
-
-// dependent_library ["feature_list"]
-//   tinyvec-1.2.0 "alloc,default,tinyvec_macros"
-//   tinyvec_macros-0.1.0
diff --git a/TEST_MAPPING b/TEST_MAPPING
index bf91080..d90d8b3 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,23 +1,27 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/quiche"
+    },
+    {
+      "path": "external/rust/crates/url"
+    }
+  ],
   "presubmit": [
     {
       "name": "doh_unit_test"
     },
     {
-      "name": "quiche_device_test_src_lib"
+      "name": "unicode-normalization_test_src_lib"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "doh_unit_test"
     },
     {
-      "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": "unicode-normalization_test_src_lib"
     }
   ]
 }