diff --git a/Android.bp b/Android.bp
index 95d7813..31375d6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -90,4 +90,5 @@
         "gwp_asan/tests/thread_contention.cpp",
     ],
     include_dirs: ["bionic/libc/async_safe/include"],
+    test_suites: ["general-tests"],
 }
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..a4db69b
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "gwp_asan_unittest"
+    }
+  ]
+}