diff --git a/tools/releasetools/Android.bp b/tools/releasetools/Android.bp
index 473d85424c..60378b88b9 100644
--- a/tools/releasetools/Android.bp
+++ b/tools/releasetools/Android.bp
@@ -568,6 +568,7 @@ python_test_host {
     name: "releasetools_test",
     defaults: ["releasetools_test_defaults"],
     main: "test_utils.py",
+    test_suites: ["general-tests"],
     version: {
         py2: {
             enabled: true,
@@ -590,6 +591,7 @@ python_test_host {
     name: "releasetools_py3_test",
     defaults: ["releasetools_test_defaults"],
     main: "test_utils.py",
+    test_suites: ["general-tests"],
     version: {
         py2: {
             enabled: false,
diff --git a/tools/releasetools/TEST_MAPPING b/tools/releasetools/TEST_MAPPING
new file mode 100644
index 0000000000..3d57960ec2
--- /dev/null
+++ b/tools/releasetools/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+    "presubmit": [
+        {
+            "name": "releasetools_test",
+            "host" : true
+        }
+    ]
+}