diff --git a/Android.bp b/Android.bp
index b97f98c..deaf172 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,5 @@
-// This file is generated by cargo2android.py --run --device --dependencies.
+// This file is generated by cargo2android.py --run --device --dependencies --tests.
+// Do not modify this file as changes will be overridden on upgrade.
 
 package {
     default_applicable_licenses: ["external_rust_crates_num-integer_license"],
@@ -40,20 +41,97 @@
     name: "libnum_integer",
     host_supported: true,
     crate_name: "num_integer",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.44",
     srcs: ["src/lib.rs"],
     edition: "2015",
     features: [
         "default",
         "std",
     ],
-    flags: [
-        "--cfg has_i128",
-    ],
+    cfgs: ["has_i128"],
     rustlibs: [
         "libnum_traits",
     ],
 }
 
-// dependent_library ["feature_list"]
-//   autocfg-1.0.1
-//   num-traits-0.2.14 "std"
+rust_defaults {
+    name: "num-integer_test_defaults",
+    crate_name: "num_integer",
+    srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.44",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2015",
+    features: [
+        "default",
+        "std",
+    ],
+    cfgs: ["has_i128"],
+    rustlibs: [
+        "libnum_traits",
+    ],
+}
+
+rust_test_host {
+    name: "num-integer_host_test_src_lib",
+    defaults: ["num-integer_test_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "num-integer_device_test_src_lib",
+    defaults: ["num-integer_test_defaults"],
+}
+
+rust_defaults {
+    name: "num-integer_test_defaults_num_integer",
+    crate_name: "num_integer",
+    cargo_env_compat: true,
+    cargo_pkg_version: "0.1.44",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2015",
+    features: [
+        "default",
+        "std",
+    ],
+    cfgs: ["has_i128"],
+    rustlibs: [
+        "libnum_integer",
+        "libnum_traits",
+    ],
+}
+
+rust_test_host {
+    name: "num-integer_host_test_tests_average",
+    defaults: ["num-integer_test_defaults_num_integer"],
+    srcs: ["tests/average.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "num-integer_device_test_tests_average",
+    defaults: ["num-integer_test_defaults_num_integer"],
+    srcs: ["tests/average.rs"],
+}
+
+rust_test_host {
+    name: "num-integer_host_test_tests_roots",
+    defaults: ["num-integer_test_defaults_num_integer"],
+    srcs: ["tests/roots.rs"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "num-integer_device_test_tests_roots",
+    defaults: ["num-integer_test_defaults_num_integer"],
+    srcs: ["tests/roots.rs"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 3e9e35c..687dbc8 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -8,9 +8,6 @@
       "name": "libapkverify.test"
     },
     {
-      "name": "microdroid_manager_test"
-    },
-    {
       "name": "num-bigint_device_test_src_lib"
     },
     {
@@ -35,6 +32,15 @@
       "name": "num-bigint_device_test_tests_roots"
     },
     {
+      "name": "num-integer_device_test_src_lib"
+    },
+    {
+      "name": "num-integer_device_test_tests_average"
+    },
+    {
+      "name": "num-integer_device_test_tests_roots"
+    },
+    {
       "name": "oid-registry_device_test_src_lib"
     }
   ]