diff --git a/Android.bp b/Android.bp
index a152aa9..907d6e6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,6 +23,8 @@
     // has rustc warnings
     host_supported: true,
     crate_name: "untrusted",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.7.1",
     srcs: ["src/untrusted.rs"],
     edition: "2018",
     apex_available: [
@@ -34,51 +36,26 @@
     min_sdk_version: "29",
 }
 
-rust_defaults {
-    name: "untrusted_defaults",
-    crate_name: "untrusted",
-    // has rustc warnings
-    srcs: ["src/untrusted.rs"],
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
-}
-
-rust_test_host {
-    name: "untrusted_host_test_src_untrusted",
-    defaults: ["untrusted_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
 rust_test {
-    name: "untrusted_device_test_src_untrusted",
-    defaults: ["untrusted_defaults"],
-}
-
-rust_defaults {
-    name: "untrusted_defaults_tests",
-    crate_name: "tests",
+    name: "untrusted_test_tests_tests",
     // has rustc warnings
+    host_supported: true,
+    crate_name: "tests",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.7.1",
     srcs: ["tests/tests.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     rustlibs: [
         "libuntrusted",
     ],
 }
 
-rust_test_host {
-    name: "untrusted_host_test_tests_tests",
-    defaults: ["untrusted_defaults_tests"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "untrusted_device_test_tests_tests",
-    defaults: ["untrusted_defaults_tests"],
-}
+// Errors when listing tests:
+// error: lint `non_autolinks` has been renamed to `rustdoc::bare_urls`
+// error: aborting due to previous error
+// error: test failed, to rerun pass '--doc'
diff --git a/TEST_MAPPING b/TEST_MAPPING
index dd705a6..c1c46bd 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,5 +1,16 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/quiche"
+    },
+    {
+      "path": "external/rust/crates/ring"
+    },
+    {
+      "path": "external/rust/crates/webpki"
+    }
+  ],
   "presubmit": [
     {
       "name": "apkdmverity.test"
@@ -20,77 +31,36 @@
       "name": "microdroid_manager_test"
     },
     {
-      "name": "quiche_device_test_src_lib"
-    },
-    {
-      "name": "ring_device_test_src_lib",
-      "options": [
-        {
-          "test-timeout": "100000"
-        }
-      ]
-    },
-    {
-      "name": "ring_device_test_tests_aead_tests"
-    },
-    {
-      "name": "ring_device_test_tests_agreement_tests"
-    },
-    {
-      "name": "ring_device_test_tests_constant_time_tests"
-    },
-    {
-      "name": "ring_device_test_tests_digest_tests",
-      "options": [
-        {
-          "test-timeout": "600000"
-        }
-      ]
-    },
-    {
-      "name": "ring_device_test_tests_ecdsa_tests"
-    },
-    {
-      "name": "ring_device_test_tests_ed25519_tests"
-    },
-    {
-      "name": "ring_device_test_tests_hkdf_tests"
-    },
-    {
-      "name": "ring_device_test_tests_hmac_tests"
-    },
-    {
-      "name": "ring_device_test_tests_pbkdf2_tests"
-    },
-    {
-      "name": "ring_device_test_tests_quic_tests"
-    },
-    {
-      "name": "ring_device_test_tests_rand_tests"
-    },
-    {
-      "name": "ring_device_test_tests_rsa_tests"
-    },
-    {
-      "name": "ring_device_test_tests_signature_tests"
-    },
-    {
-      "name": "untrusted_device_test_src_untrusted"
-    },
-    {
-      "name": "untrusted_device_test_tests_tests"
+      "name": "untrusted_test_tests_tests"
     },
     {
       "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "apkdmverity.test"
     },
     {
-      "name": "webpki_device_test_src_lib"
+      "name": "doh_unit_test"
     },
     {
-      "name": "webpki_device_test_tests_dns_name_tests"
+      "name": "libapkverify.integration_test"
     },
     {
-      "name": "webpki_device_test_tests_integration"
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "libidsig.test"
+    },
+    {
+      "name": "microdroid_manager_test"
+    },
+    {
+      "name": "untrusted_test_tests_tests"
+    },
+    {
+      "name": "virtualizationservice_device_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 646ac59..506d866 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -10,4 +10,4 @@
   "min-sdk-version": "29",
   "run": true,
   "tests": true
-}
+}
\ No newline at end of file