diff --git a/cross-project-tests/CMakeLists.txt b/cross-project-tests/CMakeLists.txt
index 866dc98406af4..57bfb6a3ee571 100644
--- a/cross-project-tests/CMakeLists.txt
+++ b/cross-project-tests/CMakeLists.txt
@@ -26,8 +26,10 @@ set(CROSS_PROJECT_TEST_DEPS
   llvm-config
   llvm-dis
   llvm-dwarfdump
+  llvm-mc
   llvm-modextract
   llvm-objdump
+  llvm-symbolizer
   not
   obj2yaml
   split-file
diff --git a/cross-project-tests/lit.cfg.py b/cross-project-tests/lit.cfg.py
index df45221d90ef3..49511f015b023 100644
--- a/cross-project-tests/lit.cfg.py
+++ b/cross-project-tests/lit.cfg.py
@@ -96,7 +96,8 @@ def get_required_attr(config, attr_name):
 
 if not hasattr(config, "lld_src_dir"):
     config.lld_src_dir = ""
-llvm_config.use_lld(required=("lld" in config.llvm_enabled_projects))
+if llvm_config.use_lld(required=("lld" in config.llvm_enabled_projects)):
+    config.available_features.add("lld")
 
 if "compiler-rt" in config.llvm_enabled_projects:
     config.available_features.add("compiler-rt")
diff --git a/cross-project-tests/webassembly/lit.local.cfg b/cross-project-tests/webassembly/lit.local.cfg
new file mode 100644
index 0000000000000..a7797c41723be
--- /dev/null
+++ b/cross-project-tests/webassembly/lit.local.cfg
@@ -0,0 +1,8 @@
+import os
+from lit.llvm import llvm_config
+
+if "WebAssembly" not in config.targets_to_build or "lld" not in config.available_features:
+    config.unsupported = True
+
+config.suffixes.add(".s")
+
diff --git a/llvm/test/tools/llvm-symbolizer/wasm-basic.s b/cross-project-tests/webassembly/wasm-basic.s
similarity index 100%
rename from llvm/test/tools/llvm-symbolizer/wasm-basic.s
rename to cross-project-tests/webassembly/wasm-basic.s
diff --git a/llvm/test/tools/llvm-symbolizer/lit.local.cfg b/llvm/test/tools/llvm-symbolizer/lit.local.cfg
deleted file mode 100644
index 21771693b720e..0000000000000
--- a/llvm/test/tools/llvm-symbolizer/lit.local.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-from lit.llvm import llvm_config
-
-if llvm_config.use_lld(required=False):
-    config.available_features.add("lld")