diff --git a/Android.bp b/Android.bp
index d32ed19..b895649 100644
--- a/Android.bp
+++ b/Android.bp
@@ -43,6 +43,8 @@
     name: "libryu",
     host_supported: true,
     crate_name: "ryu",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.5",
     srcs: ["src/lib.rs"],
     edition: "2018",
     cfgs: [
@@ -54,3 +56,113 @@
         "com.android.virt",
     ],
 }
+
+rust_defaults {
+    name: "ryu_test_defaults",
+    crate_name: "ryu",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.0.5",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    cfgs: [
+        "integer128",
+        "maybe_uninit",
+    ],
+    rustlibs: [
+        "libnum_cpus",
+        "librand",
+        "librand_xorshift",
+        "libryu",
+    ],
+}
+
+rust_test_host {
+    name: "ryu_host_test_tests_common_test",
+    defaults: ["ryu_test_defaults"],
+    srcs: ["tests/common_test.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "ryu_device_test_tests_common_test",
+    defaults: ["ryu_test_defaults"],
+    srcs: ["tests/common_test.rs"],
+}
+
+rust_test_host {
+    name: "ryu_host_test_tests_d2s_table_test",
+    defaults: ["ryu_test_defaults"],
+    srcs: ["tests/d2s_table_test.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "ryu_device_test_tests_d2s_table_test",
+    defaults: ["ryu_test_defaults"],
+    srcs: ["tests/d2s_table_test.rs"],
+}
+
+rust_test_host {
+    name: "ryu_host_test_tests_d2s_test",
+    defaults: ["ryu_test_defaults"],
+    srcs: ["tests/d2s_test.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "ryu_device_test_tests_d2s_test",
+    defaults: ["ryu_test_defaults"],
+    srcs: ["tests/d2s_test.rs"],
+}
+
+rust_test_host {
+    name: "ryu_host_test_tests_f2s_test",
+    defaults: ["ryu_test_defaults"],
+    srcs: ["tests/f2s_test.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "ryu_device_test_tests_f2s_test",
+    defaults: ["ryu_test_defaults"],
+    srcs: ["tests/f2s_test.rs"],
+}
+
+rust_test_host {
+    name: "ryu_host_test_tests_s2d_test",
+    defaults: ["ryu_test_defaults"],
+    srcs: ["tests/s2d_test.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "ryu_device_test_tests_s2d_test",
+    defaults: ["ryu_test_defaults"],
+    srcs: ["tests/s2d_test.rs"],
+}
+
+rust_test_host {
+    name: "ryu_host_test_tests_s2f_test",
+    defaults: ["ryu_test_defaults"],
+    srcs: ["tests/s2f_test.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "ryu_device_test_tests_s2f_test",
+    defaults: ["ryu_test_defaults"],
+    srcs: ["tests/s2f_test.rs"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 74ab9ee..7aaab34 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -2,12 +2,6 @@
 {
   "presubmit": [
     {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "authfs_device_test_src_lib"
-    },
-    {
       "name": "base64_device_test_tests_decode"
     },
     {
@@ -17,10 +11,34 @@
       "name": "base64_device_test_tests_helpers"
     },
     {
+      "name": "bitflags_device_test_src_lib"
+    },
+    {
+      "name": "bitflags_device_test_tests_basic"
+    },
+    {
       "name": "either_device_test_src_lib"
     },
     {
-      "name": "microdroid_manager_test"
+      "name": "rand_chacha_device_test_src_lib"
+    },
+    {
+      "name": "ryu_device_test_tests_common_test"
+    },
+    {
+      "name": "ryu_device_test_tests_d2s_table_test"
+    },
+    {
+      "name": "ryu_device_test_tests_d2s_test"
+    },
+    {
+      "name": "ryu_device_test_tests_f2s_test"
+    },
+    {
+      "name": "ryu_device_test_tests_s2d_test"
+    },
+    {
+      "name": "ryu_device_test_tests_s2f_test"
     },
     {
       "name": "unicode-xid_device_test_src_lib"
@@ -36,9 +54,6 @@
     },
     {
       "name": "url_device_test_tests_unit"
-    },
-    {
-      "name": "virtualizationservice_device_test"
     }
   ]
 }
diff --git a/cargo2android.json b/cargo2android.json
index 42b7833..72ca2d4 100644
--- a/cargo2android.json
+++ b/cargo2android.json
@@ -5,5 +5,6 @@
   ],
   "dependencies": true,
   "device": true,
-  "run": true
-}
\ No newline at end of file
+  "run": true,
+  "tests": true
+}