diff --git a/TEST_MAPPING b/TEST_MAPPING
index 5ec40f769..89bd66a57 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -15,14 +15,20 @@
     {
       "name": "adb_tls_connection_test"
     },
+    {
+      "name": "CtsFsMgrTestCases"
+    },
     {
       "name": "CtsInitTestCases"
     },
     {
-      "name": "debuggerd_test"
+      "name": "CtsLiblogTestCases"
     },
     {
-      "name": "CtsFsMgrTestCases"
+      "name": "CtsLogdTestCases"
+    },
+    {
+      "name": "debuggerd_test"
     },
     {
       "name": "fs_mgr_vendor_overlay_test"
diff --git a/liblog/tests/Android.bp b/liblog/tests/Android.bp
index 2a6424b05..a17d90cc0 100644
--- a/liblog/tests/Android.bp
+++ b/liblog/tests/Android.bp
@@ -97,6 +97,7 @@ cc_test {
     cflags: ["-DNO_PSTORE"],
     test_suites: [
         "cts",
+        "device-tests",
         "vts10",
     ],
 }
diff --git a/logd/Android.bp b/logd/Android.bp
index fe9787144..265e19e8f 100644
--- a/logd/Android.bp
+++ b/logd/Android.bp
@@ -177,6 +177,7 @@ cc_test {
     },
     test_suites: [
         "cts",
+        "device-tests",
         "vts10",
     ],
 }