diff --git a/libcxx/test/libcxx/atomics/diagnose_invalid_memory_order.verify.cpp b/libcxx/test/libcxx/atomics/diagnose_invalid_memory_order.verify.cpp
--- a/libcxx/test/libcxx/atomics/diagnose_invalid_memory_order.verify.cpp
+++ b/libcxx/test/libcxx/atomics/diagnose_invalid_memory_order.verify.cpp
@@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//
 
 // This test fails because diagnose_if doesn't emit all of the diagnostics
-// when -fdelayed-template-parsing is enabled, like it is on Windows.
-// XFAIL: LIBCXX-WINDOWS-FIXME
+// when -fdelayed-template-parsing is enabled, like it is in MSVC mode.
+// XFAIL: msvc
 
 // REQUIRES: diagnose-if-support
 // UNSUPPORTED: libcpp-has-no-threads