diff --git a/Android.bp b/Android.bp
index c4f7418..3192b79 100644
--- a/Android.bp
+++ b/Android.bp
@@ -160,43 +160,3 @@
         },
     },
 }
-
-cc_test {
-    // TODO: delete this duplicate entry once llvmlibc_tests has been moved
-    // from post submit to presubmit.
-    // go/test-mapping-slo-guide
-    name: "llvmlibc_stdlib_bsearch_test",
-    defaults: ["llvmlibc_test_defaults"],
-    srcs: [
-        "test/src/stdlib/bsearch_test.cpp",
-        "test/src/string/memchr_test.cpp",
-        "test/src/string/memrchr_test.cpp",
-        "test/src/string/strchr_test.cpp",
-        "test/src/string/strchrnul_test.cpp",
-        "test/src/string/strlcat_test.cpp",
-        "test/src/string/strlcpy_test.cpp",
-        "test/src/string/strnlen_test.cpp",
-        "test/src/string/strrchr_test.cpp",
-    ],
-    arch: {
-        arm64: {
-            // Match exclusions in ':llvmlibc' for arm64.
-            exclude_srcs: [
-                "test/src/string/memchr_test.cpp",
-                "test/src/string/memrchr_test.cpp",
-                "test/src/string/strchr_test.cpp",
-                "test/src/string/strchrnul_test.cpp",
-                "test/src/string/strnlen_test.cpp",
-                "test/src/string/strrchr_test.cpp",
-            ],
-        },
-        riscv64: {
-            // Match exclusions in ':llvmlibc' for riscv64.
-            exclude_srcs: [
-                "test/src/string/memchr_test.cpp",
-                "test/src/string/strchr_test.cpp",
-                "test/src/string/strnlen_test.cpp",
-            ],
-        },
-    },
-}
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 46fe29e..2bb82e4 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -4,12 +4,6 @@
       "name": "CtsBionicTestCases"
     },
     {
-      "name": "llvmlibc_stdlib_bsearch_test",
-      "options": [ { "native-test-flag": "--gtest_color=no"} ]
-    }
-  ],
-  "postsubmit": [
-    {
       "name": "llvmlibc_tests",
       "options": [ { "native-test-flag": "--gtest_color=no"} ]
     }