diff --git a/tools/zipalign/Android.bp b/tools/zipalign/Android.bp
index 6805ef7..d88ee74 100644
--- a/tools/zipalign/Android.bp
+++ b/tools/zipalign/Android.bp
@@ -66,4 +66,5 @@
          "tests/data/unaligned.zip",
     ],
     defaults: ["zipalign_defaults"],
+    test_suites: ["general-tests"],
 }
diff --git a/tools/zipalign/TEST_MAPPING b/tools/zipalign/TEST_MAPPING
new file mode 100644
index 0000000..98420f3
--- /dev/null
+++ b/tools/zipalign/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "presubmit": [
+    {
+      "name": "zipalign_tests",
+      "host": true
+    }
+  ]
+}