diff --git a/ravenwood/TEST_MAPPING b/ravenwood/TEST_MAPPING
index 72eb665..540b3a9 100644
--- a/ravenwood/TEST_MAPPING
+++ b/ravenwood/TEST_MAPPING
@@ -1,7 +1,17 @@
 {
-    "presubmit": [
-        // Let's only run this one as a smoke test.
-        // TODO: Enable it once the infra knows how to run it.
-        // { "name": "CtsUtilTestCasesRavenwood" }
-    ]
+  "presubmit": [
+    {
+      "name": "RavenwoodMockitoTest_device"
+    }
+  ],
+  "ravenwood-presubmit": [
+    {
+      "name": "RavenwoodMockitoTest",
+      "host": true
+    },
+    {
+      "name": "CtsUtilTestCasesRavenwood",
+      "host": true
+    }
+  ]
 }
diff --git a/tools/hoststubgen/TEST_MAPPING b/tools/hoststubgen/TEST_MAPPING
index 192b6f2..eca258c 100644
--- a/tools/hoststubgen/TEST_MAPPING
+++ b/tools/hoststubgen/TEST_MAPPING
@@ -1,11 +1,13 @@
 {
-    "presubmit": [
-        { "name": "tiny-framework-dump-test" },
-        { "name": "hoststubgentest" },
-        { "name": "hoststubgen-invoke-test" }
-
-        // As a smoke test.
-        // TODO: Enable it once the infra knows how to run it.
-        // { "name": "CtsUtilTestCasesRavenwood" }
-    ]
+  "presubmit": [
+    { "name": "tiny-framework-dump-test" },
+    { "name": "hoststubgentest" },
+    { "name": "hoststubgen-invoke-test" }
+  ],
+  "ravenwood-presubmit": [
+    {
+      "name": "CtsUtilTestCasesRavenwood",
+      "host": true
+    }
+  ]
 }