diff --git a/TEST_MAPPING b/TEST_MAPPING
index dc01a00..f2c9f59 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -1,12 +1,28 @@
 {
+  "presubmit": [
+    {
+      "name": "VtsHalGraphicsComposer3_TargetTest"
+    }
+  ],
   "postsubmit": [
     {
+      "name": "CuttlefishDisplayTests"
+    },
+    {
+      "name": "CuttlefishDisplayHotplugTest"
+    }
+  ],
+  "desktop-presubmit": [
+    {
       "name": "VtsHalGraphicsComposer3_TargetTest"
     }
   ],
   "desktop-postsubmit": [
     {
-      "name": "VtsHalGraphicsComposer3_TargetTest"
+      "name": "CuttlefishDisplayTests"
+    },
+    {
+      "name": "CuttlefishDisplayHotplugTest"
     }
   ]
 }
\ No newline at end of file