diff --git a/TEST_MAPPING b/TEST_MAPPING
index 0b33dc6..fe1e142 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -3,142 +3,30 @@
   "imports": [
     {
       "path": "external/rust/crates/android_logger"
-    }
-  ],
-  "presubmit": [
-    {
-      "name": "ZipFuseTest"
     },
     {
-      "name": "authfs_device_test_src_lib"
+      "path": "packages/modules/DnsResolver"
     },
     {
-      "name": "bluetooth_with_facades.test"
+      "path": "packages/modules/Virtualization/authfs"
     },
     {
-      "name": "compos_verify.test"
+      "path": "packages/modules/Virtualization/encryptedstore"
     },
     {
-      "name": "doh_unit_test"
+      "path": "packages/modules/Virtualization/virtualizationmanager"
     },
     {
-      "name": "encryptedstore.test"
+      "path": "packages/modules/Virtualization/zipfuse"
     },
     {
-      "name": "fd_server.test"
+      "path": "system/logging/rust"
     },
     {
-      "name": "keystore2_selinux_concurrency_test"
+      "path": "system/security/keystore2"
     },
     {
-      "name": "keystore2_selinux_test"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "libpvmfw_avb.integration_test"
-    },
-    {
-      "name": "libuwb_adaptation_jni_tests"
-    },
-    {
-      "name": "libuwb_uci_jni_rust_tests"
-    },
-    {
-      "name": "logger_device_unit_tests"
-    },
-    {
-      "name": "logger_test_config_log_level"
-    },
-    {
-      "name": "logger_test_default_init"
-    },
-    {
-      "name": "logger_test_env_log_level"
-    },
-    {
-      "name": "logger_test_multiple_init"
-    },
-    {
-      "name": "open_then_run.test"
-    },
-    {
-      "name": "rialto_test"
-    },
-    {
-      "name": "virtualizationmanager_device_test"
-    },
-    {
-      "name": "vmbase_example.integration_test"
-    }
-  ],
-  "presubmit-rust": [
-    {
-      "name": "ZipFuseTest"
-    },
-    {
-      "name": "authfs_device_test_src_lib"
-    },
-    {
-      "name": "bluetooth_with_facades.test"
-    },
-    {
-      "name": "compos_verify.test"
-    },
-    {
-      "name": "doh_unit_test"
-    },
-    {
-      "name": "encryptedstore.test"
-    },
-    {
-      "name": "fd_server.test"
-    },
-    {
-      "name": "keystore2_selinux_concurrency_test"
-    },
-    {
-      "name": "keystore2_selinux_test"
-    },
-    {
-      "name": "keystore2_test"
-    },
-    {
-      "name": "libpvmfw_avb.integration_test"
-    },
-    {
-      "name": "libuwb_adaptation_jni_tests"
-    },
-    {
-      "name": "libuwb_uci_jni_rust_tests"
-    },
-    {
-      "name": "logger_device_unit_tests"
-    },
-    {
-      "name": "logger_test_config_log_level"
-    },
-    {
-      "name": "logger_test_default_init"
-    },
-    {
-      "name": "logger_test_env_log_level"
-    },
-    {
-      "name": "logger_test_multiple_init"
-    },
-    {
-      "name": "open_then_run.test"
-    },
-    {
-      "name": "rialto_test"
-    },
-    {
-      "name": "virtualizationmanager_device_test"
-    },
-    {
-      "name": "vmbase_example.integration_test"
+      "path": "system/security/keystore2/selinux"
     }
   ]
 }