Index: test/ubsan/TestCases/TypeCheck/vptr.cpp
===================================================================
--- test/ubsan/TestCases/TypeCheck/vptr.cpp
+++ test/ubsan/TestCases/TypeCheck/vptr.cpp
@@ -25,6 +25,7 @@
 
 // FIXME: This test produces linker errors on Darwin.
 // XFAIL: darwin
+// REQUIRES: stable-runtime
 
 extern "C" {
 const char *__ubsan_default_options() {
Index: test/ubsan/lit.cfg
===================================================================
--- /dev/null
+++ test/ubsan/lit.cfg
@@ -0,0 +1,9 @@
+# -*- Python -*-
+
+import os
+import platform
+
+# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
+# because the test hangs.
+if config.target_arch != 'arm':
+  config.available_features.add('stable-runtime')