Index: test/ubsan/TestCases/Misc/nonnull-arg.cpp
===================================================================
--- test/ubsan/TestCases/Misc/nonnull-arg.cpp
+++ test/ubsan/TestCases/Misc/nonnull-arg.cpp
@@ -8,8 +8,8 @@
 // RUN: not %run %t 0f 2>&1 | FileCheck %s --check-prefix=FUNC
 // RUN: not %run %t 0v 2>&1 | FileCheck %s --check-prefix=VARIADIC
 //
-// AArch64 lacks var args instrumentation.
-// XFAIL: aarch64
+// AArch64 lacks variadic instrumentation for MSAN.
+// REQUIRES: stable-runtime
 
 class C {
   int *null_;
Index: test/ubsan/TestCases/TypeCheck/vptr-virtual-base-construction.cpp
===================================================================
--- test/ubsan/TestCases/TypeCheck/vptr-virtual-base-construction.cpp
+++ test/ubsan/TestCases/TypeCheck/vptr-virtual-base-construction.cpp
@@ -1,7 +1,7 @@
 // RUN: %clangxx -frtti -fsanitize=vptr -fno-sanitize-recover=vptr %s -o %t
 // RUN: %run %t
 
-// REQUIRES: cxxabi
+// REQUIRES: stable-runtime, cxxabi
 
 int volatile n;
 
Index: test/ubsan/TestCases/TypeCheck/vptr-virtual-base.cpp
===================================================================
--- test/ubsan/TestCases/TypeCheck/vptr-virtual-base.cpp
+++ test/ubsan/TestCases/TypeCheck/vptr-virtual-base.cpp
@@ -1,7 +1,7 @@
 // RUN: %clangxx -frtti -fsanitize=vptr -fno-sanitize-recover=vptr -g %s -O3 -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s
 
-// REQUIRES: cxxabi
+// REQUIRES: stable-runtime, cxxabi
 
 struct S { virtual int f() { return 0; } };
 struct T : virtual S {};
Index: test/ubsan/lit.common.cfg
===================================================================
--- test/ubsan/lit.common.cfg
+++ test/ubsan/lit.common.cfg
@@ -75,7 +75,7 @@
 
 # Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
 # because the test hangs or fails on one configuration and not the other.
-if config.target_arch.startswith('arm') == False:
+if config.target_arch.startswith('arm') == False and config.target_arch != 'aarch64':
   config.available_features.add('stable-runtime')
 
 if config.host_os == 'Linux' and config.target_arch != 'powerpc64' and \