diff --git a/arch/x86/crypto/TEST_MAPPING b/arch/x86/crypto/TEST_MAPPING
index d73f8129550b..a6bf2d7bf062 100644
--- a/arch/x86/crypto/TEST_MAPPING
+++ b/arch/x86/crypto/TEST_MAPPING
@@ -264,6 +264,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/arch/x86/include/asm/TEST_MAPPING b/arch/x86/include/asm/TEST_MAPPING
index ed5f13513ee8..4731cff0c411 100644
--- a/arch/x86/include/asm/TEST_MAPPING
+++ b/arch/x86/include/asm/TEST_MAPPING
@@ -264,6 +264,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/arch/x86/kernel/fpu/TEST_MAPPING b/arch/x86/kernel/fpu/TEST_MAPPING
index f29356a2b089..bfb95e692f98 100644
--- a/arch/x86/kernel/fpu/TEST_MAPPING
+++ b/arch/x86/kernel/fpu/TEST_MAPPING
@@ -264,6 +264,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/block/TEST_MAPPING b/block/TEST_MAPPING
index 13fa08f0296d..a2f615a81b3b 100644
--- a/block/TEST_MAPPING
+++ b/block/TEST_MAPPING
@@ -272,6 +272,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/android/TEST_MAPPING b/drivers/android/TEST_MAPPING
index db7a08514bd3..e55d91b74a41 100644
--- a/drivers/android/TEST_MAPPING
+++ b/drivers/android/TEST_MAPPING
@@ -264,6 +264,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/base/TEST_MAPPING b/drivers/base/TEST_MAPPING
index d05c11e1b47d..a2d195c25a35 100644
--- a/drivers/base/TEST_MAPPING
+++ b/drivers/base/TEST_MAPPING
@@ -264,6 +264,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/block/TEST_MAPPING b/drivers/block/TEST_MAPPING
index f301c19f14e6..8514f17bab3d 100644
--- a/drivers/block/TEST_MAPPING
+++ b/drivers/block/TEST_MAPPING
@@ -213,6 +213,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/char/TEST_MAPPING b/drivers/char/TEST_MAPPING
index db7a08514bd3..e55d91b74a41 100644
--- a/drivers/char/TEST_MAPPING
+++ b/drivers/char/TEST_MAPPING
@@ -264,6 +264,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/cpufreq/TEST_MAPPING b/drivers/cpufreq/TEST_MAPPING
index 4263379dc49e..40e341350264 100644
--- a/drivers/cpufreq/TEST_MAPPING
+++ b/drivers/cpufreq/TEST_MAPPING
@@ -237,6 +237,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/md/TEST_MAPPING b/drivers/md/TEST_MAPPING
index 3c78e43c8b7a..32946fcdef7d 100644
--- a/drivers/md/TEST_MAPPING
+++ b/drivers/md/TEST_MAPPING
@@ -264,6 +264,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/net/TEST_MAPPING b/drivers/net/TEST_MAPPING
index 5f98e93e6092..30f5a12c2d85 100644
--- a/drivers/net/TEST_MAPPING
+++ b/drivers/net/TEST_MAPPING
@@ -264,6 +264,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/drivers/virtio/TEST_MAPPING b/drivers/virtio/TEST_MAPPING
index d334101ba304..68dacd44c44e 100644
--- a/drivers/virtio/TEST_MAPPING
+++ b/drivers/virtio/TEST_MAPPING
@@ -264,6 +264,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/fs/TEST_MAPPING b/fs/TEST_MAPPING
index aec38c80637d..7cb899f23949 100644
--- a/fs/TEST_MAPPING
+++ b/fs/TEST_MAPPING
@@ -250,6 +250,14 @@
         }
       ]
     },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
+    },
     {
       "name": "libdm_test"
     },
diff --git a/include/asm-generic/TEST_MAPPING b/include/asm-generic/TEST_MAPPING
index 741dd29a1dc1..c42ed8837068 100644
--- a/include/asm-generic/TEST_MAPPING
+++ b/include/asm-generic/TEST_MAPPING
@@ -264,6 +264,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/include/crypto/TEST_MAPPING b/include/crypto/TEST_MAPPING
index 4712409a71e2..849ac514f2c7 100644
--- a/include/crypto/TEST_MAPPING
+++ b/include/crypto/TEST_MAPPING
@@ -264,6 +264,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/include/linux/TEST_MAPPING b/include/linux/TEST_MAPPING
index 13fa08f0296d..a2f615a81b3b 100644
--- a/include/linux/TEST_MAPPING
+++ b/include/linux/TEST_MAPPING
@@ -272,6 +272,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/include/net/TEST_MAPPING b/include/net/TEST_MAPPING
index 4a682666ff9d..c6adc31ab70c 100644
--- a/include/net/TEST_MAPPING
+++ b/include/net/TEST_MAPPING
@@ -272,6 +272,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/include/trace/TEST_MAPPING b/include/trace/TEST_MAPPING
index 2568623d0076..5eec8b962903 100644
--- a/include/trace/TEST_MAPPING
+++ b/include/trace/TEST_MAPPING
@@ -272,6 +272,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/include/uapi/linux/TEST_MAPPING b/include/uapi/linux/TEST_MAPPING
index fbd8e4d0b231..c3f27416b895 100644
--- a/include/uapi/linux/TEST_MAPPING
+++ b/include/uapi/linux/TEST_MAPPING
@@ -244,5 +244,23 @@
         }
       ]
     }
+  ],
+  "kernel-presubmit": [
+    {
+      "name": "CtsCameraTestCases",
+      "options": [
+        {
+          "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
+        }
+      ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
+    }
   ]
 }
diff --git a/include/vdso/TEST_MAPPING b/include/vdso/TEST_MAPPING
index f80b5dfb234d..b59d9c40a9a7 100644
--- a/include/vdso/TEST_MAPPING
+++ b/include/vdso/TEST_MAPPING
@@ -244,5 +244,23 @@
         }
       ]
     }
+  ],
+  "kernel-presubmit": [
+    {
+      "name": "CtsCameraTestCases",
+      "options": [
+        {
+          "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
+        }
+      ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
+    }
   ]
 }
diff --git a/kernel/bpf/TEST_MAPPING b/kernel/bpf/TEST_MAPPING
index 4ba6622570e4..f7f70b9b3457 100644
--- a/kernel/bpf/TEST_MAPPING
+++ b/kernel/bpf/TEST_MAPPING
@@ -264,6 +264,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/kernel/cgroup/TEST_MAPPING b/kernel/cgroup/TEST_MAPPING
index 4ba6622570e4..f7f70b9b3457 100644
--- a/kernel/cgroup/TEST_MAPPING
+++ b/kernel/cgroup/TEST_MAPPING
@@ -264,6 +264,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/kernel/sched/TEST_MAPPING b/kernel/sched/TEST_MAPPING
index 5d5b51a3bbcf..809bca32ea18 100644
--- a/kernel/sched/TEST_MAPPING
+++ b/kernel/sched/TEST_MAPPING
@@ -256,6 +256,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
diff --git a/mm/TEST_MAPPING b/mm/TEST_MAPPING
index b0c83aa3a51c..defeb452bcf3 100644
--- a/mm/TEST_MAPPING
+++ b/mm/TEST_MAPPING
@@ -235,6 +235,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/net/TEST_MAPPING b/net/TEST_MAPPING
index 7629782b2f7d..a0dfc9bdd861 100644
--- a/net/TEST_MAPPING
+++ b/net/TEST_MAPPING
@@ -251,6 +251,14 @@
           "include-filter": "android.hardware.camera2.cts.FastBasicsTest"
         }
       ]
+    },
+    {
+      "name": "CtsLibcoreLegacy22TestCases",
+      "options": [
+        {
+          "include-filter": "android.util.cts.FloatMathTest"
+        }
+      ]
     }
   ]
 }