diff --git a/.buckconfig b/.buckconfig
index a7c48881bb3..8bc3e80ff17 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -11,13 +11,15 @@
   shim_et = shim_et
 
 [repository_aliases]
+  bazel_skylib = shim
   config = prelude
   ovr_config = prelude
   toolchains = shim_et
   fbcode = shim_et
-  fbcode_macros = shim_et
+  fbcode_macros = shim
   fbsource = shim_et
   buck = shim
+  gh_facebook_buck2_shims_meta = shim
 
 [cxx]
   cxxflags = -g -std=c++17
diff --git a/.ci/scripts/unittest-buck2.sh b/.ci/scripts/unittest-buck2.sh
index 2e386570504..09275f29ae9 100755
--- a/.ci/scripts/unittest-buck2.sh
+++ b/.ci/scripts/unittest-buck2.sh
@@ -7,7 +7,11 @@
 set -eux
 
 # TODO: expand this to //...
-buck2 query //runtime/...
+# TODO: can't query cadence & vulkan backends
+buck2 query "//backends/apple/... + //backends/example/... + \
+//backends/mediatek/... + //backends/test/... + //backends/transforms/... + \
+//backends/xnnpack/... + //configurations/... + //kernels/portable/cpu/... + \
+//runtime/... + //schema/... + //test/... + //util/..."
 
 # TODO: expand the covered scope of Buck targets.
 buck2 build //runtime/core/portable_type/...