diff --git a/healthd/Android.bp b/healthd/Android.bp
index 3a7ab75..65eaedd 100644
--- a/healthd/Android.bp
+++ b/healthd/Android.bp
@@ -252,4 +252,8 @@
     static_libs: [
         "libhealthd_charger",
     ],
+    test_suites: [
+        "general-tests",
+        "device-tests",
+    ],
 }
diff --git a/healthd/TEST_MAPPING b/healthd/TEST_MAPPING
new file mode 100644
index 0000000..5893d10
--- /dev/null
+++ b/healthd/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "libhealthd_charger_test"
+    }
+  ]
+}