diff --git a/BUILD.bazel b/BUILD.bazel
index 530ac0a025f6..725c3b780cd7 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -2862,7 +2862,8 @@ pkg_filegroup(
         ":kselftest_mm_hugepage_shm_x86_64",
         ":kselftest_mm_map_hugetlb_x86_64",
         ":kselftest_mm_mlock2_tests_x86_64",
-        ":kselftest_mm_mlock_random_test_x86_64",
+        # b/536813037 - Revert when test is fixed
+        # ":kselftest_mm_mlock_random_test_x86_64",
         ":kselftest_mm_mremap_dontunmap_x86_64",
         ":kselftest_mm_mremap_test_x86_64",
         ":kselftest_mm_on_fault_limit_x86_64",
@@ -2874,7 +2875,8 @@ pkg_filegroup(
         ":kselftest_net_socket_x86_64",
         ":kselftest_ptrace_peeksiginfo_x86_64",
         ":kselftest_rtc_rtctest_x86_64",
-        ":kselftest_seccomp_seccomp_bpf_x86_64",
+        # b/536813037 - Revert when test is fixed
+        # ":kselftest_seccomp_seccomp_bpf_x86_64",
         ":kselftest_size_test_get_size_x86_64",
         ":kselftest_timers_adjtick_x86_64",
         ":kselftest_timers_alarmtimer_suspend_x86_64",
@@ -2978,7 +2980,8 @@ pkg_filegroup(
         ":kselftest_mm_hugepage_shm_x86",
         ":kselftest_mm_map_hugetlb_x86",
         ":kselftest_mm_mlock2_tests_x86",
-        ":kselftest_mm_mlock_random_test_x86",
+        # b/536813037 - Revert when test is fixed
+        # ":kselftest_mm_mlock_random_test_x86",
         ":kselftest_mm_mremap_dontunmap_x86",
         ":kselftest_mm_mremap_test_x86",
         ":kselftest_mm_on_fault_limit_x86",
@@ -2990,7 +2993,8 @@ pkg_filegroup(
         ":kselftest_net_socket_x86",
         ":kselftest_ptrace_peeksiginfo_x86",
         ":kselftest_rtc_rtctest_x86",
-        ":kselftest_seccomp_seccomp_bpf_x86",
+        # b/536813037 - Revert when test is fixed
+        # ":kselftest_seccomp_seccomp_bpf_x86",
         ":kselftest_size_test_get_size_x86",
         ":kselftest_timers_adjtick_x86",
         ":kselftest_timers_alarmtimer_suspend_x86",
@@ -3199,7 +3203,8 @@ pkg_filegroup(
         ":kselftest_mm_hugepage_shm_arm64",
         ":kselftest_mm_map_hugetlb_arm64",
         ":kselftest_mm_mlock2_tests_arm64",
-        ":kselftest_mm_mlock_random_test_arm64",
+        # b/536813037 - Revert when test is fixed
+        # ":kselftest_mm_mlock_random_test_arm64",
         ":kselftest_mm_mremap_dontunmap_arm64",
         ":kselftest_mm_mremap_test_arm64",
         ":kselftest_mm_on_fault_limit_arm64",
@@ -3211,7 +3216,8 @@ pkg_filegroup(
         ":kselftest_net_socket_arm64",
         ":kselftest_ptrace_peeksiginfo_arm64",
         ":kselftest_rtc_rtctest_arm64",
-        ":kselftest_seccomp_seccomp_bpf_arm64",
+        # b/536813037 - Revert when test is fixed
+        # ":kselftest_seccomp_seccomp_bpf_arm64",
         ":kselftest_size_test_get_size_arm64",
         ":kselftest_timers_adjtick_arm64",
         ":kselftest_timers_alarmtimer_suspend_arm64",
diff --git a/tools/testing/selftests/android/config_arm64.xml b/tools/testing/selftests/android/config_arm64.xml
index c16a27b640d7..56c1ae6c8034 100644
--- a/tools/testing/selftests/android/config_arm64.xml
+++ b/tools/testing/selftests/android/config_arm64.xml
@@ -47,7 +47,8 @@ SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
         <option name="test-command-line" key="kselftest_net_reuseaddr_conflict" value="cd &ktest_dir;; ./kselftest_net_reuseaddr_conflict" />
         <option name="test-command-line" key="kselftest_ptrace_peeksiginfo" value="cd &ktest_dir;; ./kselftest_ptrace_peeksiginfo" />
         <option name="test-command-line" key="kselftest_rtc_rtctest" value="cd &ktest_dir;; ./kselftest_rtc_rtctest" />
-        <option name="test-command-line" key="kselftest_seccomp_seccomp_bpf" value="cd &ktest_dir;; ./kselftest_seccomp_seccomp_bpf" />
+        <!-- b/536813037 - Revert when test is fixed /-->
+        <!--option name="test-command-line" key="kselftest_seccomp_seccomp_bpf" value="cd &ktest_dir;; ./kselftest_seccomp_seccomp_bpf" /-->
         <option name="test-command-line" key="kselftest_size_test_get_size" value="cd &ktest_dir;; ./kselftest_size_test_get_size" />
         <option name="test-command-line" key="kselftest_timers_inconsistency_check" value="cd &ktest_dir;; ./inconsistency-check" />
         <option name="test-command-line" key="kselftest_timers_nanosleep" value="cd &ktest_dir;; ./nanosleep" />
diff --git a/tools/testing/selftests/android/config_x86.xml b/tools/testing/selftests/android/config_x86.xml
index f57189f9c624..935fd12af4c1 100644
--- a/tools/testing/selftests/android/config_x86.xml
+++ b/tools/testing/selftests/android/config_x86.xml
@@ -46,7 +46,8 @@ SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
         <option name="test-command-line" key="kselftest_net_reuseaddr_conflict" value="cd &ktest_dir;; ./kselftest_net_reuseaddr_conflict" />
         <option name="test-command-line" key="kselftest_ptrace_peeksiginfo" value="cd &ktest_dir;; ./kselftest_ptrace_peeksiginfo" />
         <option name="test-command-line" key="kselftest_rtc_rtctest" value="cd &ktest_dir;; ./kselftest_rtc_rtctest" />
-        <option name="test-command-line" key="kselftest_seccomp_seccomp_bpf" value="cd &ktest_dir;; ./kselftest_seccomp_seccomp_bpf" />
+        <!-- b/536813037 - Revert when test is fixed /-->
+        <!-- option name="test-command-line" key="kselftest_seccomp_seccomp_bpf" value="cd &ktest_dir;; ./kselftest_seccomp_seccomp_bpf" /-->
         <option name="test-command-line" key="kselftest_size_test_get_size" value="cd &ktest_dir;; ./kselftest_size_test_get_size" />
         <option name="test-command-line" key="kselftest_timers_inconsistency_check" value="cd &ktest_dir;; ./inconsistency-check" />
         <option name="test-command-line" key="kselftest_timers_nanosleep" value="cd &ktest_dir;; ./nanosleep" />
diff --git a/tools/testing/selftests/android/config_x86_64.xml b/tools/testing/selftests/android/config_x86_64.xml
index 3282b8f78c4f..3acb79bd1a91 100644
--- a/tools/testing/selftests/android/config_x86_64.xml
+++ b/tools/testing/selftests/android/config_x86_64.xml
@@ -47,7 +47,8 @@ SPDX-License-Identifier: GPL-2.0 OR Apache-2.0
         <option name="test-command-line" key="kselftest_net_reuseaddr_conflict" value="cd &ktest_dir;; ./kselftest_net_reuseaddr_conflict" />
         <option name="test-command-line" key="kselftest_ptrace_peeksiginfo" value="cd &ktest_dir;; ./kselftest_ptrace_peeksiginfo" />
         <option name="test-command-line" key="kselftest_rtc_rtctest" value="cd &ktest_dir;; ./kselftest_rtc_rtctest" />
-        <option name="test-command-line" key="kselftest_seccomp_seccomp_bpf" value="cd &ktest_dir;; ./kselftest_seccomp_seccomp_bpf" />
+        <!-- b/536813037 - Revert when test is fixed /-->
+        <!-- option name="test-command-line" key="kselftest_seccomp_seccomp_bpf" value="cd &ktest_dir;; ./kselftest_seccomp_seccomp_bpf" /-->
         <option name="test-command-line" key="kselftest_size_test_get_size" value="cd &ktest_dir;; ./kselftest_size_test_get_size" />
         <option name="test-command-line" key="kselftest_timers_inconsistency_check" value="cd &ktest_dir;; ./inconsistency-check" />
         <option name="test-command-line" key="kselftest_timers_nanosleep" value="cd &ktest_dir;; ./nanosleep" />