Index: compiler-rt/trunk/test/xray/TestCases/Linux/fdr-mode.cc
===================================================================
--- compiler-rt/trunk/test/xray/TestCases/Linux/fdr-mode.cc
+++ compiler-rt/trunk/test/xray/TestCases/Linux/fdr-mode.cc
@@ -7,6 +7,7 @@
 // RUN: rm fdr-unwrite-test-*
 // FIXME: Make llvm-xray work on non-x86_64 as well.
 // REQUIRES: x86_64-linux
+// REQUIRES: built-in-llvm-tree
 
 #include "xray/xray_log_interface.h"
 #include <cassert>
Index: compiler-rt/trunk/test/xray/TestCases/Linux/fdr-thread-order.cc
===================================================================
--- compiler-rt/trunk/test/xray/TestCases/Linux/fdr-thread-order.cc
+++ compiler-rt/trunk/test/xray/TestCases/Linux/fdr-thread-order.cc
@@ -4,6 +4,8 @@
 // RUN: rm fdr-thread-order.*
 // FIXME: Make llvm-xray work on non-x86_64 as well.
 // REQUIRES: x86_64-linux
+// REQUIRES: built-in-llvm-tree
+
 #include "xray/xray_log_interface.h"
 #include <thread>
 #include <cassert>
Index: compiler-rt/trunk/test/xray/lit.site.cfg.in
===================================================================
--- compiler-rt/trunk/test/xray/lit.site.cfg.in
+++ compiler-rt/trunk/test/xray/lit.site.cfg.in
@@ -5,6 +5,10 @@
 config.xray_lit_source_dir = "@XRAY_LIT_SOURCE_DIR@"
 config.target_cflags = "@XRAY_TEST_TARGET_CFLAGS@"
 config.target_arch = "@XRAY_TEST_TARGET_ARCH@"
+config.built_with_llvm = ("@COMPILER_RT_STANDALONE_BUILD@" == "FALSE")
+
+if config.built_with_llvm:
+  config.available_features.add('built-in-llvm-tree')
 
 # Load common config for all compiler-rt lit tests
 lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")