diff --git a/arch/x86/include/asm/TEST_MAPPING b/arch/x86/include/asm/TEST_MAPPING
index 6ca65f060b27..5365d70e7e44 100644
--- a/arch/x86/include/asm/TEST_MAPPING
+++ b/arch/x86/include/asm/TEST_MAPPING
@@ -295,6 +295,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/arch/x86/kernel/fpu/TEST_MAPPING b/arch/x86/kernel/fpu/TEST_MAPPING
index 6cfed52e2d2d..5465205ac71a 100644
--- a/arch/x86/kernel/fpu/TEST_MAPPING
+++ b/arch/x86/kernel/fpu/TEST_MAPPING
@@ -295,6 +295,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/block/TEST_MAPPING b/block/TEST_MAPPING
index 6b74f933382f..03e120f0ec3a 100644
--- a/block/TEST_MAPPING
+++ b/block/TEST_MAPPING
@@ -303,6 +303,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/drivers/android/TEST_MAPPING b/drivers/android/TEST_MAPPING
index a10c1c8540af..08bfd98429b5 100644
--- a/drivers/android/TEST_MAPPING
+++ b/drivers/android/TEST_MAPPING
@@ -295,6 +295,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/drivers/base/TEST_MAPPING b/drivers/base/TEST_MAPPING
index 59c14c9e3550..0023abab85f0 100644
--- a/drivers/base/TEST_MAPPING
+++ b/drivers/base/TEST_MAPPING
@@ -295,6 +295,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/drivers/char/TEST_MAPPING b/drivers/char/TEST_MAPPING
index a10c1c8540af..08bfd98429b5 100644
--- a/drivers/char/TEST_MAPPING
+++ b/drivers/char/TEST_MAPPING
@@ -295,6 +295,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/drivers/md/TEST_MAPPING b/drivers/md/TEST_MAPPING
index cdb03d4ae804..c2c4910e968f 100644
--- a/drivers/md/TEST_MAPPING
+++ b/drivers/md/TEST_MAPPING
@@ -292,6 +292,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/drivers/virtio/TEST_MAPPING b/drivers/virtio/TEST_MAPPING
index 86a34e5a836b..280c88bbadee 100644
--- a/drivers/virtio/TEST_MAPPING
+++ b/drivers/virtio/TEST_MAPPING
@@ -295,6 +295,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/fs/TEST_MAPPING b/fs/TEST_MAPPING
index f3f7e6999c58..05e3aacf292a 100644
--- a/fs/TEST_MAPPING
+++ b/fs/TEST_MAPPING
@@ -298,6 +298,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/include/asm-generic/TEST_MAPPING b/include/asm-generic/TEST_MAPPING
index 03189786392f..5522e806c15a 100644
--- a/include/asm-generic/TEST_MAPPING
+++ b/include/asm-generic/TEST_MAPPING
@@ -295,6 +295,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/include/crypto/TEST_MAPPING b/include/crypto/TEST_MAPPING
index 328d07e9b8ce..c7f82e081c32 100644
--- a/include/crypto/TEST_MAPPING
+++ b/include/crypto/TEST_MAPPING
@@ -295,6 +295,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/include/linux/TEST_MAPPING b/include/linux/TEST_MAPPING
index 6b74f933382f..03e120f0ec3a 100644
--- a/include/linux/TEST_MAPPING
+++ b/include/linux/TEST_MAPPING
@@ -303,6 +303,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/include/net/TEST_MAPPING b/include/net/TEST_MAPPING
index be63bea97e2a..44b7a3714299 100644
--- a/include/net/TEST_MAPPING
+++ b/include/net/TEST_MAPPING
@@ -303,6 +303,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/include/trace/TEST_MAPPING b/include/trace/TEST_MAPPING
index 14da6f09bae7..de8f517be54a 100644
--- a/include/trace/TEST_MAPPING
+++ b/include/trace/TEST_MAPPING
@@ -303,6 +303,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/include/vdso/TEST_MAPPING b/include/vdso/TEST_MAPPING
index 811218af981f..3f5c88bb2bf3 100644
--- a/include/vdso/TEST_MAPPING
+++ b/include/vdso/TEST_MAPPING
@@ -284,6 +284,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/kernel/bpf/TEST_MAPPING b/kernel/bpf/TEST_MAPPING
index 395f9d07f838..06091be32dc6 100644
--- a/kernel/bpf/TEST_MAPPING
+++ b/kernel/bpf/TEST_MAPPING
@@ -295,6 +295,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/kernel/cgroup/TEST_MAPPING b/kernel/cgroup/TEST_MAPPING
index 395f9d07f838..06091be32dc6 100644
--- a/kernel/cgroup/TEST_MAPPING
+++ b/kernel/cgroup/TEST_MAPPING
@@ -295,6 +295,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/kernel/sched/TEST_MAPPING b/kernel/sched/TEST_MAPPING
index 3ad572bcf4e2..cc3746001c78 100644
--- a/kernel/sched/TEST_MAPPING
+++ b/kernel/sched/TEST_MAPPING
@@ -284,6 +284,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
diff --git a/mm/TEST_MAPPING b/mm/TEST_MAPPING
index fb4bcf86aacd..01c543876f45 100644
--- a/mm/TEST_MAPPING
+++ b/mm/TEST_MAPPING
@@ -266,6 +266,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }
\ No newline at end of file
diff --git a/net/TEST_MAPPING b/net/TEST_MAPPING
index 34fbf351c16a..3c576595d2a5 100644
--- a/net/TEST_MAPPING
+++ b/net/TEST_MAPPING
@@ -282,6 +282,9 @@
     },
     {
       "name": "VtsAidlHalSensorsTargetTest"
+    },
+    {
+      "name": "VtsBootconfigTest"
     }
   ]
 }