diff --git a/Android.bp b/Android.bp
index e8a4749..06b0a13 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,4 +1,4 @@
-// This file is generated by cargo2android.py --device --run --dependencies.
+// This file is generated by cargo2android.py --device --run --dependencies --tests.
 
 rust_library {
     name: "libppv_lite86",
@@ -12,3 +12,29 @@
         "std",
     ],
 }
+
+rust_defaults {
+    name: "ppv-lite86_defaults",
+    crate_name: "ppv_lite86",
+    test_suites: ["general-tests"],
+    auto_gen_config: true,
+    edition: "2018",
+    features: [
+        "default",
+        "std",
+    ],
+}
+
+rust_test_host {
+    name: "ppv-lite86_host_test_src_lib",
+    defaults: ["ppv-lite86_defaults"],
+    // has rustc warnings
+    srcs: ["src/lib.rs"],
+}
+
+rust_test {
+    name: "ppv-lite86_device_test_src_lib",
+    defaults: ["ppv-lite86_defaults"],
+    // has rustc warnings
+    srcs: ["src/lib.rs"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..c2b3791
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,12 @@
+// Generated by cargo2android.py for tests in Android.bp
+{
+  "presubmit": [
+    {
+      "name": "ppv-lite86_host_test_src_lib",
+      "host": true
+    },
+    {
+      "name": "ppv-lite86_device_test_src_lib"
+    }
+  ]
+}