diff --git a/arch/x86/include/asm/TEST_MAPPING b/arch/x86/include/asm/TEST_MAPPING
index 91ed824dd553..d0b4ff08c6de 100644
--- a/arch/x86/include/asm/TEST_MAPPING
+++ b/arch/x86/include/asm/TEST_MAPPING
@@ -313,6 +313,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/arch/x86/kernel/fpu/TEST_MAPPING b/arch/x86/kernel/fpu/TEST_MAPPING
index 1a7a3b1f7b98..31b0537fbd71 100644
--- a/arch/x86/kernel/fpu/TEST_MAPPING
+++ b/arch/x86/kernel/fpu/TEST_MAPPING
@@ -313,6 +313,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/block/TEST_MAPPING b/block/TEST_MAPPING
index 5fb0d3b47dd6..10046d86a210 100644
--- a/block/TEST_MAPPING
+++ b/block/TEST_MAPPING
@@ -321,6 +321,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/drivers/android/TEST_MAPPING b/drivers/android/TEST_MAPPING
index 8f295664ed50..e8139ebda6f4 100644
--- a/drivers/android/TEST_MAPPING
+++ b/drivers/android/TEST_MAPPING
@@ -313,6 +313,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/drivers/base/TEST_MAPPING b/drivers/base/TEST_MAPPING
index e10aaea9e917..dd9c4c55a89c 100644
--- a/drivers/base/TEST_MAPPING
+++ b/drivers/base/TEST_MAPPING
@@ -313,6 +313,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/drivers/block/TEST_MAPPING b/drivers/block/TEST_MAPPING
index 3e4189b20d64..f5019ac1fb3c 100644
--- a/drivers/block/TEST_MAPPING
+++ b/drivers/block/TEST_MAPPING
@@ -247,6 +247,9 @@
     },
     {
       "name": "binderSafeInterfaceTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/drivers/char/TEST_MAPPING b/drivers/char/TEST_MAPPING
index 8f295664ed50..e8139ebda6f4 100644
--- a/drivers/char/TEST_MAPPING
+++ b/drivers/char/TEST_MAPPING
@@ -313,6 +313,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/drivers/md/TEST_MAPPING b/drivers/md/TEST_MAPPING
index 481d0aac2c21..9be2bea862ff 100644
--- a/drivers/md/TEST_MAPPING
+++ b/drivers/md/TEST_MAPPING
@@ -298,6 +298,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/drivers/net/TEST_MAPPING b/drivers/net/TEST_MAPPING
index 846bcd4a02da..21c5067ec16a 100644
--- a/drivers/net/TEST_MAPPING
+++ b/drivers/net/TEST_MAPPING
@@ -304,6 +304,9 @@
     },
     {
       "name": "binderSafeInterfaceTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/drivers/virtio/TEST_MAPPING b/drivers/virtio/TEST_MAPPING
index cfe506aea4fa..cb1172973fd4 100644
--- a/drivers/virtio/TEST_MAPPING
+++ b/drivers/virtio/TEST_MAPPING
@@ -313,6 +313,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/fs/TEST_MAPPING b/fs/TEST_MAPPING
index 98076023939a..47842d36e575 100644
--- a/fs/TEST_MAPPING
+++ b/fs/TEST_MAPPING
@@ -316,6 +316,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/include/asm-generic/TEST_MAPPING b/include/asm-generic/TEST_MAPPING
index 649ac6b1a590..db864b8481be 100644
--- a/include/asm-generic/TEST_MAPPING
+++ b/include/asm-generic/TEST_MAPPING
@@ -313,6 +313,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/include/crypto/TEST_MAPPING b/include/crypto/TEST_MAPPING
index e0a639dd7f63..4812ee4ed0cc 100644
--- a/include/crypto/TEST_MAPPING
+++ b/include/crypto/TEST_MAPPING
@@ -313,6 +313,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/include/linux/TEST_MAPPING b/include/linux/TEST_MAPPING
index 5fb0d3b47dd6..10046d86a210 100644
--- a/include/linux/TEST_MAPPING
+++ b/include/linux/TEST_MAPPING
@@ -321,6 +321,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/include/net/TEST_MAPPING b/include/net/TEST_MAPPING
index 42e5309f858e..f34255e78e6d 100644
--- a/include/net/TEST_MAPPING
+++ b/include/net/TEST_MAPPING
@@ -321,6 +321,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/include/trace/TEST_MAPPING b/include/trace/TEST_MAPPING
index 207a3e86274e..32946c3b5768 100644
--- a/include/trace/TEST_MAPPING
+++ b/include/trace/TEST_MAPPING
@@ -321,6 +321,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/include/uapi/linux/TEST_MAPPING b/include/uapi/linux/TEST_MAPPING
index b1a14b64bb86..5cc3085467a5 100644
--- a/include/uapi/linux/TEST_MAPPING
+++ b/include/uapi/linux/TEST_MAPPING
@@ -293,6 +293,9 @@
     },
     {
       "name": "binderSafeInterfaceTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/include/vdso/TEST_MAPPING b/include/vdso/TEST_MAPPING
index ad502e6a31fd..08e71c1932ab 100644
--- a/include/vdso/TEST_MAPPING
+++ b/include/vdso/TEST_MAPPING
@@ -302,6 +302,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/kernel/bpf/TEST_MAPPING b/kernel/bpf/TEST_MAPPING
index 5b96aa05903b..00c4f60d35ce 100644
--- a/kernel/bpf/TEST_MAPPING
+++ b/kernel/bpf/TEST_MAPPING
@@ -313,6 +313,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/kernel/cgroup/TEST_MAPPING b/kernel/cgroup/TEST_MAPPING
index 5b96aa05903b..00c4f60d35ce 100644
--- a/kernel/cgroup/TEST_MAPPING
+++ b/kernel/cgroup/TEST_MAPPING
@@ -313,6 +313,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/kernel/sched/TEST_MAPPING b/kernel/sched/TEST_MAPPING
index 4fe6d8de8c70..98db05325d3d 100644
--- a/kernel/sched/TEST_MAPPING
+++ b/kernel/sched/TEST_MAPPING
@@ -302,6 +302,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
diff --git a/mm/TEST_MAPPING b/mm/TEST_MAPPING
index f9f89f203578..1f5b0a26cf0a 100644
--- a/mm/TEST_MAPPING
+++ b/mm/TEST_MAPPING
@@ -284,6 +284,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }
\ No newline at end of file
diff --git a/net/TEST_MAPPING b/net/TEST_MAPPING
index 71597b815371..5f24cf016e45 100644
--- a/net/TEST_MAPPING
+++ b/net/TEST_MAPPING
@@ -300,6 +300,9 @@
     },
     {
       "name": "VtsHalBluetoothAudioTargetTest"
+    },
+    {
+      "name": "CtsBionicTestCases"
     }
   ]
 }