diff --git a/TEST_MAPPING b/TEST_MAPPING
index 68f4ed5..0916d11 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -28,6 +28,21 @@
       "name": "authfs_device_test_src_lib"
     },
     {
+      "name": "avmdtool.test"
+    },
+    {
+      "name": "avmdtool_tests"
+    },
+    {
+      "name": "bluetooth_with_facades.test"
+    },
+    {
+      "name": "compos_verify.test"
+    },
+    {
+      "name": "composd_cmd.test"
+    },
+    {
       "name": "diced_open_dice_cbor_test"
     },
     {
@@ -46,6 +61,9 @@
       "name": "doh_unit_test"
     },
     {
+      "name": "encryptedstore.test"
+    },
+    {
       "name": "keystore2_client_tests"
     },
     {
@@ -76,13 +94,13 @@
       "name": "libapexutil_rust.test"
     },
     {
-      "name": "libapkverify.integration_test"
+      "name": "libdm_rust.test"
     },
     {
-      "name": "libapkverify.test"
+      "name": "libkmr_hal_test"
     },
     {
-      "name": "libidsig.test"
+      "name": "libpvmfw_avb.integration_test"
     },
     {
       "name": "librustutils_test"
@@ -91,10 +109,34 @@
       "name": "libtombstoned_client_rust_test"
     },
     {
+      "name": "libuwb_adaptation_jni_tests"
+    },
+    {
+      "name": "libuwb_core_tests"
+    },
+    {
+      "name": "libuwb_uci_jni_rust_tests"
+    },
+    {
+      "name": "libuwb_uci_packet_tests"
+    },
+    {
       "name": "microdroid_manager_test"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "name": "open_then_run.test"
+    },
+    {
+      "name": "rialto_test"
+    },
+    {
+      "name": "virtualizationmanager_device_test"
+    },
+    {
+      "name": "vm.test"
+    },
+    {
+      "name": "vmbase_example.integration_test"
     }
   ],
   "presubmit-rust": [
@@ -114,6 +156,21 @@
       "name": "authfs_device_test_src_lib"
     },
     {
+      "name": "avmdtool.test"
+    },
+    {
+      "name": "avmdtool_tests"
+    },
+    {
+      "name": "bluetooth_with_facades.test"
+    },
+    {
+      "name": "compos_verify.test"
+    },
+    {
+      "name": "composd_cmd.test"
+    },
+    {
       "name": "diced_open_dice_cbor_test"
     },
     {
@@ -132,6 +189,9 @@
       "name": "doh_unit_test"
     },
     {
+      "name": "encryptedstore.test"
+    },
+    {
       "name": "keystore2_client_tests"
     },
     {
@@ -162,13 +222,13 @@
       "name": "libapexutil_rust.test"
     },
     {
-      "name": "libapkverify.integration_test"
+      "name": "libdm_rust.test"
     },
     {
-      "name": "libapkverify.test"
+      "name": "libkmr_hal_test"
     },
     {
-      "name": "libidsig.test"
+      "name": "libpvmfw_avb.integration_test"
     },
     {
       "name": "librustutils_test"
@@ -177,10 +237,34 @@
       "name": "libtombstoned_client_rust_test"
     },
     {
+      "name": "libuwb_adaptation_jni_tests"
+    },
+    {
+      "name": "libuwb_core_tests"
+    },
+    {
+      "name": "libuwb_uci_jni_rust_tests"
+    },
+    {
+      "name": "libuwb_uci_packet_tests"
+    },
+    {
       "name": "microdroid_manager_test"
     },
     {
-      "name": "virtualizationservice_device_test"
+      "name": "open_then_run.test"
+    },
+    {
+      "name": "rialto_test"
+    },
+    {
+      "name": "virtualizationmanager_device_test"
+    },
+    {
+      "name": "vm.test"
+    },
+    {
+      "name": "vmbase_example.integration_test"
     }
   ]
 }