diff --git a/Android.bp b/Android.bp
index 04eb72b..ca0234d 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_termcolor_license"],
@@ -41,6 +42,32 @@
     name: "libtermcolor",
     host_supported: true,
     crate_name: "termcolor",
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.1.2",
     srcs: ["src/lib.rs"],
     edition: "2018",
 }
+
+rust_defaults {
+    name: "termcolor_test_defaults",
+    crate_name: "termcolor",
+    srcs: ["src/lib.rs"],
+    cargo_env_compat: true,
+    cargo_pkg_version: "1.1.2",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+}
+
+rust_test_host {
+    name: "termcolor_host_test_src_lib",
+    defaults: ["termcolor_test_defaults"],
+    test_options: {
+        unit_test: true,
+    },
+}
+
+rust_test {
+    name: "termcolor_device_test_src_lib",
+    defaults: ["termcolor_test_defaults"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..42044bd
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,17 @@
+// Generated by update_crate_tests.py for tests that depend on this crate.
+{
+  "presubmit": [
+    {
+      "name": "keystore2_test"
+    },
+    {
+      "name": "keystore2_vintf_test"
+    },
+    {
+      "name": "legacykeystore_test"
+    },
+    {
+      "name": "termcolor_device_test_src_lib"
+    }
+  ]
+}