diff --git a/compiler-rt/test/safestack/lit.cfg b/compiler-rt/test/safestack/lit.cfg
index 13fc92fa4b2b..535c09742ca9 100644
--- a/compiler-rt/test/safestack/lit.cfg
+++ b/compiler-rt/test/safestack/lit.cfg
@@ -22,3 +22,8 @@ if config.lto_supported:
 # SafeStack tests are currently supported on Linux, FreeBSD and Darwin only.
 if config.host_os not in ['Linux', 'FreeBSD', 'Darwin']:
    config.unsupported = True
+
+# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
+# because the test fail due some runtime issue.
+if config.target_arch != 'aarch64':
+  config.available_features.add('stable-runtime')
diff --git a/compiler-rt/test/safestack/overflow.c b/compiler-rt/test/safestack/overflow.c
index 14e29823cd99..27436947e49c 100644
--- a/compiler-rt/test/safestack/overflow.c
+++ b/compiler-rt/test/safestack/overflow.c
@@ -7,6 +7,8 @@
 // Test that buffer overflows on the unsafe stack do not affect variables on the
 // safe stack.
 
+// REQUIRES: stable-runtime
+
 __attribute__((noinline))
 void fct(volatile int *buffer)
 {