diff --git a/Android.bp b/Android.bp
index e2d0b27..e397f6e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -37,15 +37,19 @@
     ],
 }
 
-rust_defaults {
-    name: "jni_test_defaults",
-    crate_name: "jni",
+rust_test {
+    name: "jni_test_src_lib",
     // has rustc warnings
+    host_supported: true,
+    crate_name: "jni",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.19.0",
     srcs: ["src/lib.rs"],
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.19.0",
     test_suites: ["general-tests"],
     auto_gen_config: true,
+    test_options: {
+        unit_test: true,
+    },
     edition: "2018",
     features: ["default"],
     rustlibs: [
@@ -58,294 +62,6 @@
     ],
 }
 
-rust_test_host {
-    name: "jni_host_test_src_lib",
-    defaults: ["jni_test_defaults"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_src_lib",
-    defaults: ["jni_test_defaults"],
-}
-
-rust_defaults {
-    name: "jni_test_defaults_jni",
-    crate_name: "jni",
-    cargo_env_compat: true,
-    cargo_pkg_version: "0.19.0",
-    test_suites: ["general-tests"],
-    auto_gen_config: true,
-    edition: "2018",
-    features: ["default"],
-    rustlibs: [
-        "libcesu8",
-        "libcombine",
-        "libjni",
-        "libjni_sys",
-        "liblazy_static",
-        "liblog_rust",
-        "libthiserror",
-    ],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_executor",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/executor.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_executor",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/executor.rs"],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_executor_nested_attach",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/executor_nested_attach.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_executor_nested_attach",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/executor_nested_attach.rs"],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_java_integers",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/java_integers.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_java_integers",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/java_integers.rs"],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_jmap",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/jmap.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_jmap",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/jmap.rs"],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_jni_api",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/jni_api.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_jni_api",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/jni_api.rs"],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_jni_global_refs",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/jni_global_refs.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_jni_global_refs",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/jni_global_refs.rs"],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_threads_attach_guard",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_attach_guard.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_threads_attach_guard",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_attach_guard.rs"],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_threads_detach",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_detach.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_threads_detach",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_detach.rs"],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_threads_detach_daemon",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_detach_daemon.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_threads_detach_daemon",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_detach_daemon.rs"],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_threads_explicit_detach",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_explicit_detach.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_threads_explicit_detach",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_explicit_detach.rs"],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_threads_explicit_detach_daemon",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_explicit_detach_daemon.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_threads_explicit_detach_daemon",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_explicit_detach_daemon.rs"],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_threads_explicit_detach_permanent",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_explicit_detach_permanent.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_threads_explicit_detach_permanent",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_explicit_detach_permanent.rs"],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_threads_nested_attach_daemon",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_nested_attach_daemon.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_threads_nested_attach_daemon",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_nested_attach_daemon.rs"],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_threads_nested_attach_guard",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_nested_attach_guard.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_threads_nested_attach_guard",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_nested_attach_guard.rs"],
-}
-
-rust_test_host {
-    name: "jni_host_test_tests_threads_nested_attach_permanently",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_nested_attach_permanently.rs"],
-    test_options: {
-        unit_test: true,
-    },
-}
-
-rust_test {
-    name: "jni_device_test_tests_threads_nested_attach_permanently",
-    defaults: ["jni_test_defaults_jni"],
-    // has rustc warnings
-    srcs: ["tests/threads_nested_attach_permanently.rs"],
-}
-
 rust_library {
     name: "libjni",
     // has rustc warnings
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 89d071b..78d12e3 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,52 +2,12 @@
 {
   "presubmit": [
     {
-      "name": "jni_device_test_src_lib"
-    },
+      "name": "jni_test_src_lib"
+    }
+  ],
+  "presubmit-rust": [
     {
-      "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": "jni_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