diff --git a/Android.bp b/Android.bp
index b987e93..051dcae 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,8 +1,6 @@
 // This file is generated by cargo2android.py --config cargo2android.json.
 // Do not modify this file as changes will be overridden on upgrade.
 
-
-
 package {
     default_applicable_licenses: ["external_rust_crates_base64_license"],
 }
@@ -40,8 +38,10 @@
 }
 
 rust_defaults {
-    name: "base64_defaults",
+    name: "base64_test_defaults",
     crate_name: "base64",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.13.0",
     test_suites: ["general-tests"],
     auto_gen_config: true,
     edition: "2018",
@@ -57,9 +57,10 @@
     ],
 }
 
-rust_test_host {
-    name: "base64_host_test_tests_decode",
-    defaults: ["base64_defaults"],
+rust_test {
+    name: "base64_test_tests_decode",
+    defaults: ["base64_test_defaults"],
+    host_supported: true,
     srcs: ["tests/decode.rs"],
     test_options: {
         unit_test: true,
@@ -67,46 +68,22 @@
 }
 
 rust_test {
-    name: "base64_device_test_tests_decode",
-    defaults: ["base64_defaults"],
-    srcs: ["tests/decode.rs"],
-}
-
-rust_test_host {
-    name: "base64_host_test_tests_encode",
-    defaults: ["base64_defaults"],
+    name: "base64_test_tests_encode",
+    defaults: ["base64_test_defaults"],
+    host_supported: true,
     srcs: ["tests/encode.rs"],
     test_options: {
         unit_test: true,
     },
 }
 
-rust_test {
-    name: "base64_device_test_tests_encode",
-    defaults: ["base64_defaults"],
-    srcs: ["tests/encode.rs"],
-}
-
-rust_test_host {
-    name: "base64_host_test_tests_helpers",
-    defaults: ["base64_defaults"],
-    srcs: ["tests/helpers.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "base64_device_test_tests_helpers",
-    defaults: ["base64_defaults"],
-    srcs: ["tests/helpers.rs"],
-}
-
 rust_library {
     name: "libbase64_rust",
     stem: "libbase64",
     host_supported: true,
     crate_name: "base64",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.13.0",
     srcs: ["src/lib.rs"],
     edition: "2018",
     features: [
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 5b7b1a1..de2964d 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,14 +1,16 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/webpki"
+    }
+  ],
   "presubmit": [
     {
-      "name": "base64_device_test_tests_decode"
+      "name": "base64_test_tests_decode"
     },
     {
-      "name": "base64_device_test_tests_encode"
-    },
-    {
-      "name": "base64_device_test_tests_helpers"
+      "name": "base64_test_tests_encode"
     },
     {
       "name": "doh_unit_test"
@@ -21,15 +23,26 @@
     },
     {
       "name": "microdroid_manager_test"
+    }
+  ],
+  "presubmit-rust": [
+    {
+      "name": "base64_test_tests_decode"
     },
     {
-      "name": "webpki_device_test_src_lib"
+      "name": "base64_test_tests_encode"
     },
     {
-      "name": "webpki_device_test_tests_dns_name_tests"
+      "name": "doh_unit_test"
     },
     {
-      "name": "webpki_device_test_tests_integration"
+      "name": "libapkverify.integration_test"
+    },
+    {
+      "name": "libapkverify.test"
+    },
+    {
+      "name": "microdroid_manager_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 6c4525a..d2d1ca1 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -1,14 +1,14 @@
 {
-    "apex-available": [
-      "//apex_available:platform",
-      "com.android.resolv"
-    ],
-    "min_sdk_version": "29",
-    "device": true,
-    "run": true,
-    "test-blocklist": [
-      "src/lib.rs",
-      "tests/tests.rs"
-    ],
-    "tests": true
-  }
\ No newline at end of file
+  "apex-available": [
+    "//apex_available:platform",
+    "com.android.resolv"
+  ],
+  "device": true,
+  "min-sdk-version": "29",
+  "run": true,
+  "test-blocklist": [
+    "src/lib.rs",
+    "tests/tests.rs"
+  ],
+  "tests": true
+}
\ No newline at end of file