diff --git a/libcxx/test/std/input.output/iostream.format/std.manip/setfill_wchar_max.pass.cpp b/libcxx/test/std/input.output/iostream.format/std.manip/setfill_wchar_max.pass.cpp
index f22850877dd626f..d220a5c36a23bb1 100644
--- a/libcxx/test/std/input.output/iostream.format/std.manip/setfill_wchar_max.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/std.manip/setfill_wchar_max.pass.cpp
@@ -15,8 +15,8 @@
 // version 2 implementation fixes the problem.
 
 // XFAIL: target={{.*}}-windows{{.*}} && libcpp-abi-version=1
-// XFAIL: target=armv{{7|8}}l-linux-gnueabihf && libcpp-abi-version=1
-// XFAIL: target=aarch64-linux-gnu && libcpp-abi-version=1
+// XFAIL: target=armv{{7|8}}l{{.*}}-linux-gnueabihf && libcpp-abi-version=1
+// XFAIL: target=aarch64{{.*}}-linux-gnu && libcpp-abi-version=1
 
 #include <iomanip>
 #include <ostream>