diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index af35dd221c..d3b087caa6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
             --disable //antlir/antlir2/test_images/cfg/target_arch/... \
             --disable //antlir/antlir2/test_images/package/... \
             --disable //antlir/antlir2/testing/tests:booted-image-test-that-should-fail \
-            --disable //antlir/antlir2/testing/tests:test-sh-booted-requires-units \
+            --disable //antlir/antlir2/testing/tests:test-sh-boot-requires_units-centos9 \
             --disable //antlir/bzl/shape2/... \
             --disable //antlir/bzl/tests/shapes/... \
             --disable //antlir/rust:gen-modules-bzl-unittest \
diff --git a/toolchains/BUCK b/toolchains/BUCK
index e9b1d57a4a..ca7b7c6e46 100644
--- a/toolchains/BUCK
+++ b/toolchains/BUCK
@@ -5,6 +5,7 @@
 # License, Version 2.0 found in the LICENSE-APACHE file in the root directory
 # of this source tree.
 
+load("@prelude//tests:test_toolchain.bzl", "noop_test_toolchain")
 load("@prelude//toolchains:cxx.bzl", "system_cxx_toolchain")
 load("@prelude//toolchains:genrule.bzl", "system_genrule_toolchain")
 load("@prelude//toolchains:python.bzl", "system_python_bootstrap_toolchain", "system_python_toolchain")
@@ -55,3 +56,8 @@ sh_binary(
     main = "objcopy",
     visibility = ["PUBLIC"],
 )
+
+noop_test_toolchain(
+    name = "test",
+    visibility = ["PUBLIC"],
+)