diff --git a/Android.bp b/Android.bp
index c38a2e0..23387aa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,29 +34,20 @@
     ],
 }
 
-rust_defaults {
-    name: "cesu8_test_defaults",
-    crate_name: "cesu8",
+rust_test {
+    name: "cesu8_test_src_lib",
     // has rustc warnings
-    srcs: ["src/lib.rs"],
+    host_supported: true,
+    crate_name: "cesu8",
     cargo_env_compat: true,
     cargo_pkg_version: "1.1.0",
+    srcs: ["src/lib.rs"],
     test_suites: ["general-tests"],
     auto_gen_config: true,
-    edition: "2015",
-}
-
-rust_test_host {
-    name: "cesu8_host_test_src_lib",
-    defaults: ["cesu8_test_defaults"],
     test_options: {
         unit_test: true,
     },
-}
-
-rust_test {
-    name: "cesu8_device_test_src_lib",
-    defaults: ["cesu8_test_defaults"],
+    edition: "2015",
 }
 
 rust_library {
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 9965b4b..2b4350c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,56 +1,18 @@
 // Generated by update_crate_tests.py for tests that depend on this crate.
 {
+  "imports": [
+    {
+      "path": "external/rust/crates/jni"
+    }
+  ],
   "presubmit": [
     {
-      "name": "cesu8_device_test_src_lib"
-    },
+      "name": "cesu8_test_src_lib"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "name": "jni_device_test_src_lib"
-    },
-    {
-      "name": "jni_device_test_tests_executor"
-    },
-    {
-      "name": "jni_device_test_tests_executor_nested_attach"
-    },
-    {
-      "name": "jni_device_test_tests_java_integers"
-    },
-    {
-      "name": "jni_device_test_tests_jmap"
-    },
-    {
-      "name": "jni_device_test_tests_jni_api"
-    },
-    {
-      "name": "jni_device_test_tests_jni_global_refs"
-    },
-    {
-      "name": "jni_device_test_tests_threads_attach_guard"
-    },
-    {
-      "name": "jni_device_test_tests_threads_detach"
-    },
-    {
-      "name": "jni_device_test_tests_threads_detach_daemon"
-    },
-    {
-      "name": "jni_device_test_tests_threads_explicit_detach"
-    },
-    {
-      "name": "jni_device_test_tests_threads_explicit_detach_daemon"
-    },
-    {
-      "name": "jni_device_test_tests_threads_explicit_detach_permanent"
-    },
-    {
-      "name": "jni_device_test_tests_threads_nested_attach_daemon"
-    },
-    {
-      "name": "jni_device_test_tests_threads_nested_attach_guard"
-    },
-    {
-      "name": "jni_device_test_tests_threads_nested_attach_permanently"
+      "name": "cesu8_test_src_lib"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 728c976..39b0f84 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -4,7 +4,7 @@
     "com.android.uwb"
   ],
   "device": true,
-  "min_sdk_version": "29",
+  "min-sdk-version": "29",
   "run": true,
   "tests": true
 }
\ No newline at end of file