diff --git a/Android.bp b/Android.bp
index a80bdb9..df09755 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --run --dependencies.
+// This file is generated by cargo2android.py --run --dependencies --tests.
 
 rust_library_host {
     name: "libshlex",
@@ -6,3 +6,12 @@
     srcs: ["src/lib.rs"],
     edition: "2015",
 }
+
+rust_test_host {
+    name: "shlex_host_test_src_lib",
+    crate_name: "shlex",
+    srcs: ["src/lib.rs"],
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2015",
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..8f317d7
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,9 @@
+// Generated by cargo2android.py for tests in Android.bp
+{
+  "presubmit": [
+    {
+      "name": "shlex_host_test_src_lib",
+      "host": true
+    }
+  ]
+}