diff --git a/TEST_MAPPING b/TEST_MAPPING
index 4bc58e8..bb18d05 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -11,10 +11,22 @@
       "name": "authfs_device_test_src_lib"
     },
     {
+      "name": "avmdtool_tests"
+    },
+    {
+      "name": "libdm_rust.test"
+    },
+    {
+      "name": "libpvmfw_avb.integration_test"
+    },
+    {
+      "name": "libuwb_core_tests"
+    },
+    {
       "name": "microdroid_manager_test"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "name": "virtualizationmanager_device_test"
     }
   ],
   "presubmit-rust": [
@@ -28,10 +40,22 @@
       "name": "authfs_device_test_src_lib"
     },
     {
+      "name": "avmdtool_tests"
+    },
+    {
+      "name": "libdm_rust.test"
+    },
+    {
+      "name": "libpvmfw_avb.integration_test"
+    },
+    {
+      "name": "libuwb_core_tests"
+    },
+    {
       "name": "microdroid_manager_test"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "name": "virtualizationmanager_device_test"
     }
   ]
 }