diff --git a/compiler-rt/test/builtins/Unit/gcc_personality_test.c b/compiler-rt/test/builtins/Unit/gcc_personality_test.c
--- a/compiler-rt/test/builtins/Unit/gcc_personality_test.c
+++ b/compiler-rt/test/builtins/Unit/gcc_personality_test.c
@@ -1,5 +1,5 @@
-// FIXME: XFAIL as currently it cannot be built by lit properly.
-// XFAIL: *
+// FIXME: UNSUPPORTED as currently it cannot be built by lit properly.
+// UNSUPPORTED: true
 // RUN: %clangxx_builtins %s %librt -o %t && %run %t
 
 #include <stdlib.h>
diff --git a/compiler-rt/test/crt/dso_handle.cpp b/compiler-rt/test/crt/dso_handle.cpp
--- a/compiler-rt/test/crt/dso_handle.cpp
+++ b/compiler-rt/test/crt/dso_handle.cpp
@@ -4,7 +4,7 @@
 // RUN: %clangxx -g -o %t -nostdlib %crt1 %crti %crtbegin %t.o %libstdcxx -lc -lm %libgcc %t.so %crtend %crtn
 // RUN: %run %t 2>&1 | FileCheck %s
 
-// XFAIL: arm
+// UNSUPPORTED: arm, aarch64
 
 #include <stdio.h>