diff --git a/Android.bp b/Android.bp
index 7f28a3c..82295f3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -81,6 +81,7 @@
         "liblog",
         "libnetutils",
     ],
+    test_suites: ["device-tests"],
 }
 
 // Microbenchmark.
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..c6d599d
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "clatd_test"
+    }
+  ]
+}