diff --git a/Android.bp b/Android.bp
index bfe4eef..b3343ee 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,30 +55,21 @@
     ],
 }
 
-rust_defaults {
-    name: "ppv-lite86_test_defaults",
+rust_test {
+    name: "ppv-lite86_test_src_lib",
+    host_supported: true,
     crate_name: "ppv_lite86",
-    srcs: ["src/lib.rs"],
     cargo_env_compat: true,
     cargo_pkg_version: "0.2.10",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: [
         "default",
         "std",
     ],
 }
-
-rust_test_host {
-    name: "ppv-lite86_host_test_src_lib",
-    defaults: ["ppv-lite86_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "ppv-lite86_device_test_src_lib",
-    defaults: ["ppv-lite86_test_defaults"],
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index d459437..f0d135a 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,245 +1,102 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/base64"
+    },
+    {
+      "path": "external/rust/crates/cast"
+    },
+    {
+      "path": "external/rust/crates/crc32fast"
+    },
+    {
+      "path": "external/rust/crates/crossbeam-deque"
+    },
+    {
+      "path": "external/rust/crates/crossbeam-epoch"
+    },
+    {
+      "path": "external/rust/crates/crossbeam-queue"
+    },
+    {
+      "path": "external/rust/crates/crossbeam-utils"
+    },
+    {
+      "path": "external/rust/crates/mio"
+    },
+    {
+      "path": "external/rust/crates/quickcheck"
+    },
+    {
+      "path": "external/rust/crates/rand_chacha"
+    },
+    {
+      "path": "external/rust/crates/regex"
+    },
+    {
+      "path": "external/rust/crates/ryu"
+    },
+    {
+      "path": "external/rust/crates/tokio"
+    }
+  ],
   "presubmit": [
     {
-      "name": "base64_device_test_tests_decode"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "base64_device_test_tests_encode"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "base64_device_test_tests_helpers"
-    },
-    {
-      "name": "crossbeam-epoch_device_test_src_lib"
-    },
-    {
-      "name": "crossbeam-epoch_device_test_tests_loom"
-    },
-    {
-      "name": "crossbeam-utils_device_test_src_lib"
-    },
-    {
-      "name": "crossbeam-utils_device_test_tests_atomic_cell"
-    },
-    {
-      "name": "crossbeam-utils_device_test_tests_cache_padded"
-    },
-    {
-      "name": "crossbeam-utils_device_test_tests_parker"
-    },
-    {
-      "name": "crossbeam-utils_device_test_tests_sharded_lock"
-    },
-    {
-      "name": "crossbeam-utils_device_test_tests_thread"
-    },
-    {
-      "name": "crossbeam-utils_device_test_tests_wait_group"
+      "name": "authfs_device_test_src_lib"
     },
     {
       "name": "keystore2_test"
     },
     {
+      "name": "keystore2_test_utils_test"
+    },
+    {
       "name": "legacykeystore_test"
     },
     {
-      "name": "ppv-lite86_device_test_src_lib"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "tokio_device_test_tests__require_full"
+      "name": "ppv-lite86_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_buffered"
-    },
+      "name": "virtualizationservice_device_test"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "tokio_device_test_tests_io_async_fd"
+      "name": "ZipFuseTest"
     },
     {
-      "name": "tokio_device_test_tests_io_async_read"
+      "name": "apkdmverity.test"
     },
     {
-      "name": "tokio_device_test_tests_io_chain"
+      "name": "authfs_device_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_io_copy"
+      "name": "keystore2_test"
     },
     {
-      "name": "tokio_device_test_tests_io_copy_bidirectional"
+      "name": "keystore2_test_utils_test"
     },
     {
-      "name": "tokio_device_test_tests_io_driver"
+      "name": "legacykeystore_test"
     },
     {
-      "name": "tokio_device_test_tests_io_driver_drop"
+      "name": "microdroid_manager_test"
     },
     {
-      "name": "tokio_device_test_tests_io_lines"
+      "name": "ppv-lite86_test_src_lib"
     },
     {
-      "name": "tokio_device_test_tests_io_mem_stream"
-    },
-    {
-      "name": "tokio_device_test_tests_io_read"
-    },
-    {
-      "name": "tokio_device_test_tests_io_read_buf"
-    },
-    {
-      "name": "tokio_device_test_tests_io_read_exact"
-    },
-    {
-      "name": "tokio_device_test_tests_io_read_line"
-    },
-    {
-      "name": "tokio_device_test_tests_io_read_to_end"
-    },
-    {
-      "name": "tokio_device_test_tests_io_read_to_string"
-    },
-    {
-      "name": "tokio_device_test_tests_io_read_until"
-    },
-    {
-      "name": "tokio_device_test_tests_io_split"
-    },
-    {
-      "name": "tokio_device_test_tests_io_take"
-    },
-    {
-      "name": "tokio_device_test_tests_io_write"
-    },
-    {
-      "name": "tokio_device_test_tests_io_write_all"
-    },
-    {
-      "name": "tokio_device_test_tests_io_write_buf"
-    },
-    {
-      "name": "tokio_device_test_tests_io_write_int"
-    },
-    {
-      "name": "tokio_device_test_tests_macros_join"
-    },
-    {
-      "name": "tokio_device_test_tests_macros_pin"
-    },
-    {
-      "name": "tokio_device_test_tests_macros_select"
-    },
-    {
-      "name": "tokio_device_test_tests_macros_test"
-    },
-    {
-      "name": "tokio_device_test_tests_macros_try_join"
-    },
-    {
-      "name": "tokio_device_test_tests_net_bind_resource"
-    },
-    {
-      "name": "tokio_device_test_tests_net_lookup_host"
-    },
-    {
-      "name": "tokio_device_test_tests_no_rt"
-    },
-    {
-      "name": "tokio_device_test_tests_process_kill_on_drop"
-    },
-    {
-      "name": "tokio_device_test_tests_rt_basic"
-    },
-    {
-      "name": "tokio_device_test_tests_rt_common"
-    },
-    {
-      "name": "tokio_device_test_tests_rt_threaded"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_barrier"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_broadcast"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_errors"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_mpsc"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_mutex"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_mutex_owned"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_notify"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_oneshot"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_rwlock"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_semaphore"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_semaphore_owned"
-    },
-    {
-      "name": "tokio_device_test_tests_sync_watch"
-    },
-    {
-      "name": "tokio_device_test_tests_task_abort"
-    },
-    {
-      "name": "tokio_device_test_tests_task_blocking"
-    },
-    {
-      "name": "tokio_device_test_tests_task_local"
-    },
-    {
-      "name": "tokio_device_test_tests_task_local_set"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_accept"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_connect"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_echo"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_into_split"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_into_std"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_peek"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_shutdown"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_socket"
-    },
-    {
-      "name": "tokio_device_test_tests_tcp_split"
-    },
-    {
-      "name": "tokio_device_test_tests_time_rt"
-    },
-    {
-      "name": "tokio_device_test_tests_udp"
-    },
-    {
-      "name": "tokio_device_test_tests_uds_cred"
-    },
-    {
-      "name": "tokio_device_test_tests_uds_split"
+      "name": "virtualizationservice_device_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 72ca2d4..ac56e26 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -7,4 +7,4 @@
   "device": true,
   "run": true,
   "tests": true
-}
+}
\ No newline at end of file