Index: test/asan/TestCases/Posix/mmap_limit_mb.cc
===================================================================
--- test/asan/TestCases/Posix/mmap_limit_mb.cc
+++ test/asan/TestCases/Posix/mmap_limit_mb.cc
@@ -9,7 +9,7 @@
 // RUN: %env_asan_opts=mmap_limit_mb=300 not %run %t 500 1000000 2>&1 | FileCheck %s
 //
 // FIXME: Windows doesn't implement mmap_limit_mb.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <assert.h>
 #include <stdlib.h>
Index: test/asan/TestCases/Posix/strndup_oob_test.cc
===================================================================
--- test/asan/TestCases/Posix/strndup_oob_test.cc
+++ test/asan/TestCases/Posix/strndup_oob_test.cc
@@ -7,7 +7,7 @@
 // RUN: %clangxx_asan -O3 -xc %s -o %t && not %run %t 2>&1 | FileCheck %s
 
 // Unwind problem on arm: "main" is missing from the allocation stack trace.
-// UNSUPPORTED: win32,s390,arm && !fast-unwinder-works
+// UNSUPPORTED: windows-msvc,s390,arm && !fast-unwinder-works
 
 #include <string.h>
 
Index: test/asan/TestCases/Posix/strndup_oob_test2.cc
===================================================================
--- test/asan/TestCases/Posix/strndup_oob_test2.cc
+++ test/asan/TestCases/Posix/strndup_oob_test2.cc
@@ -7,7 +7,7 @@
 // RUN: %clang_asan -O3 -xc %s -o %t && not %run %t 2>&1 | FileCheck %s
 
 // Unwind problem on arm: "main" is missing from the allocation stack trace.
-// UNSUPPORTED: win32,s390,arm && !fast-unwinder-works
+// UNSUPPORTED: windows-msvc,s390,arm && !fast-unwinder-works
 
 #include <string.h>
 
Index: test/asan/TestCases/asan_and_llvm_coverage_test.cc
===================================================================
--- test/asan/TestCases/asan_and_llvm_coverage_test.cc
+++ test/asan/TestCases/asan_and_llvm_coverage_test.cc
@@ -2,7 +2,7 @@
 // RUN: %env_asan_opts=check_initialization_order=1 %run %t 2>&1 | FileCheck %s
 
 // We don't really support running tests using profile runtime on Windows.
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 #include <stdio.h>
 int foo() { return 1; }
 int XXX = foo();
Index: test/asan/TestCases/atoll_strict.c
===================================================================
--- test/asan/TestCases/atoll_strict.c
+++ test/asan/TestCases/atoll_strict.c
@@ -11,7 +11,7 @@
 // RUN: %env_asan_opts=strict_string_checks=true not %run %t test3 2>&1 | FileCheck %s --check-prefix=CHECK3
 
 // FIXME: Needs Windows interceptor.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <assert.h>
 #include <stdlib.h>
Index: test/asan/TestCases/heavy_uar_test.cc
===================================================================
--- test/asan/TestCases/heavy_uar_test.cc
+++ test/asan/TestCases/heavy_uar_test.cc
@@ -1,6 +1,6 @@
 // RUN: %clangxx_asan -O0 %s -o %t && %env_asan_opts=detect_stack_use_after_return=1 not %run %t 2>&1 | FileCheck %s
 // RUN: %clangxx_asan -O2 %s -o %t && %env_asan_opts=detect_stack_use_after_return=1 not %run %t 2>&1 | FileCheck %s
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 // FIXME: Fix this test under GCC.
 // REQUIRES: Clang
Index: test/asan/TestCases/initialization-bug.cc
===================================================================
--- test/asan/TestCases/initialization-bug.cc
+++ test/asan/TestCases/initialization-bug.cc
@@ -6,7 +6,7 @@
 // Do not test with optimization -- the error may be optimized away.
 
 // FIXME: https://code.google.com/p/address-sanitizer/issues/detail?id=186
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 // The test is expected to fail on OS X Yosemite and older
 // UNSUPPORTED: osx-no-ld64-live_support
Index: test/asan/TestCases/intra-object-overflow.cc
===================================================================
--- test/asan/TestCases/intra-object-overflow.cc
+++ test/asan/TestCases/intra-object-overflow.cc
@@ -5,7 +5,7 @@
 // FIXME: fix 32-bits.
 // REQUIRES: asan-64-bits, shadow-scale-3
 // FIXME: Implement ASan intra-object padding in Clang's MS record layout
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 #include <stdio.h>
 #include <stdlib.h>
 class Foo {
Index: test/asan/TestCases/log-path_test.cc
===================================================================
--- test/asan/TestCases/log-path_test.cc
+++ test/asan/TestCases/log-path_test.cc
@@ -31,7 +31,7 @@
 // RUN: not cat %t.log.*
 
 // FIXME: log_path is not supported on Windows yet.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <stdlib.h>
 #include <string.h>
Index: test/asan/TestCases/pass-object-byval.cc
===================================================================
--- test/asan/TestCases/pass-object-byval.cc
+++ test/asan/TestCases/pass-object-byval.cc
@@ -5,7 +5,7 @@
 // RUN:     Assertion{{.*}}failed
 
 // ASan instrumentation can't insert red-zones around inalloca parameters.
-// XFAIL: win32 && asan-32-bits
+// XFAIL: windows-msvc && asan-32-bits
 
 #include <cassert>
 
Index: test/asan/TestCases/printf-2.c
===================================================================
--- test/asan/TestCases/printf-2.c
+++ test/asan/TestCases/printf-2.c
@@ -6,7 +6,7 @@
 // RUN: %env_asan_opts=replace_str=0:intercept_strlen=0:replace_intrin=0 not %run %t 2>&1 | FileCheck --check-prefix=CHECK-ON %s
 
 // FIXME: printf is not intercepted on Windows yet.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <stdio.h>
 #include <stdlib.h>
Index: test/asan/TestCases/printf-3.c
===================================================================
--- test/asan/TestCases/printf-3.c
+++ test/asan/TestCases/printf-3.c
@@ -4,7 +4,7 @@
 // RUN: not %run %t 2>&1 | FileCheck --check-prefix=CHECK-ON %s
 
 // FIXME: printf is not intercepted on Windows yet.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <stdio.h>
 int main() {
Index: test/asan/TestCases/printf-4.c
===================================================================
--- test/asan/TestCases/printf-4.c
+++ test/asan/TestCases/printf-4.c
@@ -4,7 +4,7 @@
 
 // FIXME: sprintf is not intercepted on Windows yet. But this test can
 // pass if sprintf calls memmove, which is intercepted, so we can't XFAIL it.
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 #include <stdio.h>
 int main() {
Index: test/asan/TestCases/printf-5.c
===================================================================
--- test/asan/TestCases/printf-5.c
+++ test/asan/TestCases/printf-5.c
@@ -5,7 +5,7 @@
 // RUN: %env_asan_opts=replace_intrin=0 not %run %t 2>&1 | FileCheck --check-prefix=CHECK-ON %s
 
 // FIXME: printf is not intercepted on Windows yet.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <stdio.h>
 #include <string.h>
Index: test/asan/TestCases/printf-m.c
===================================================================
--- test/asan/TestCases/printf-m.c
+++ test/asan/TestCases/printf-m.c
@@ -1,7 +1,7 @@
 // RUN: %clang_asan -O2 %s -o %t && %run %t
 
 // FIXME: printf is not intercepted on Windows yet.
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 #include <stdio.h>
 
Index: test/asan/TestCases/set_shadow_test.c
===================================================================
--- test/asan/TestCases/set_shadow_test.c
+++ test/asan/TestCases/set_shadow_test.c
@@ -6,7 +6,7 @@
 // RUN: not %run %t 0xf5 2>&1 | FileCheck %s -check-prefix=XF5
 // RUN: not %run %t 0xf8 2>&1 | FileCheck %s -check-prefix=XF8
 
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <assert.h>
 #include <sanitizer/asan_interface.h>
Index: test/asan/TestCases/strcasestr-1.c
===================================================================
--- test/asan/TestCases/strcasestr-1.c
+++ test/asan/TestCases/strcasestr-1.c
@@ -6,7 +6,7 @@
 // RUN: %env_asan_opts=intercept_strstr=false:replace_str=false %run %t 2>&1
 
 // There's no interceptor for strcasestr on Windows
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #define _GNU_SOURCE
 #include <assert.h>
Index: test/asan/TestCases/strcasestr-2.c
===================================================================
--- test/asan/TestCases/strcasestr-2.c
+++ test/asan/TestCases/strcasestr-2.c
@@ -6,7 +6,7 @@
 // RUN: %env_asan_opts=intercept_strstr=false:replace_str=false:intercept_strlen=false %run %t 2>&1
 
 // There's no interceptor for strcasestr on Windows
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #define _GNU_SOURCE
 #include <assert.h>
Index: test/asan/TestCases/strcasestr_strict.c
===================================================================
--- test/asan/TestCases/strcasestr_strict.c
+++ test/asan/TestCases/strcasestr_strict.c
@@ -4,7 +4,7 @@
 // RUN: %env_asan_opts=strict_string_checks=true not %run %t 2>&1 | FileCheck %s
 
 // There's no interceptor for strcasestr on Windows
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #define _GNU_SOURCE
 #include <assert.h>
Index: test/asan/TestCases/strcat-overlap.cc
===================================================================
--- test/asan/TestCases/strcat-overlap.cc
+++ test/asan/TestCases/strcat-overlap.cc
@@ -31,7 +31,7 @@
 // depending on how strcat() is implemented. For now only run
 // on platforms where we know the test passes.
 // REQUIRES: x86_64h-darwin || x86_64-darwin || i386-darwin || x86_64-linux || i386-linux
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 // UNSUPPORTED: android
 
 #include <string.h>
Index: test/asan/TestCases/strncasecmp_strict.c
===================================================================
--- test/asan/TestCases/strncasecmp_strict.c
+++ test/asan/TestCases/strncasecmp_strict.c
@@ -14,7 +14,7 @@
 // RUN: %env_asan_opts=strict_string_checks=false %run %t i 2>&1
 // RUN: %env_asan_opts=strict_string_checks=true not %run %t i 2>&1 | FileCheck %s
 
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <assert.h>
 #include <stdlib.h>
Index: test/asan/TestCases/strtoll_strict.c
===================================================================
--- test/asan/TestCases/strtoll_strict.c
+++ test/asan/TestCases/strtoll_strict.c
@@ -24,7 +24,7 @@
 
 // FIXME: Enable strtoll interceptor.
 // REQUIRES: shadow-scale-3
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <assert.h>
 #include <stdlib.h>
Index: test/asan/TestCases/suppressions-exec-relative-location.cc
===================================================================
--- test/asan/TestCases/suppressions-exec-relative-location.cc
+++ test/asan/TestCases/suppressions-exec-relative-location.cc
@@ -24,7 +24,7 @@
 // RUN:   FileCheck --check-prefix=CHECK-WRONG-FILE-NAME %s
 
 // XFAIL: android
-// XFAIL: win32
+// XFAIL: windows-msvc
 // UNSUPPORTED: ios
 
 #include <stdio.h>
Index: test/asan/TestCases/suppressions-function.cc
===================================================================
--- test/asan/TestCases/suppressions-function.cc
+++ test/asan/TestCases/suppressions-function.cc
@@ -7,7 +7,7 @@
 // RUN: %clangxx_asan -O3 %s -o %t && %env_asan_opts=suppressions='"%t.supp"' %run %t 2>&1 | FileCheck --check-prefix=CHECK-IGNORE %s
 
 // FIXME: Windows symbolizer needs work to make this pass.
-// XFAIL: android,win32
+// XFAIL: android,windows-msvc
 // UNSUPPORTED: ios
 
 // FIXME: atos does not work for inlined functions, yet llvm-symbolizer
Index: test/asan/TestCases/time_interceptor.cc
===================================================================
--- test/asan/TestCases/time_interceptor.cc
+++ test/asan/TestCases/time_interceptor.cc
@@ -3,7 +3,7 @@
 // Test the time() interceptor.
 
 // There's no interceptor for time() on Windows yet.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <stdio.h>
 #include <stdlib.h>
Index: test/asan/TestCases/verbose-log-path_test.cc
===================================================================
--- test/asan/TestCases/verbose-log-path_test.cc
+++ test/asan/TestCases/verbose-log-path_test.cc
@@ -10,7 +10,7 @@
 // RUN: FileCheck %s --check-prefix=CHECK-ERROR < %t-dir/asan.log.verbose-log-path_test-binary.*
 
 // FIXME: only FreeBSD, NetBSD and Linux have verbose log paths now.
-// XFAIL: win32,android
+// XFAIL: windows-msvc,android
 // UNSUPPORTED: ios
 
 #include <stdlib.h>
Index: test/cfi/bad-split.cpp
===================================================================
--- test/cfi/bad-split.cpp
+++ test/cfi/bad-split.cpp
@@ -1,7 +1,7 @@
 // GlobalSplit used to lose type metadata for classes with virtual bases but no virtual methods.
 // RUN: %clangxx_cfi -o %t1 %s && %run %t1
 
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 struct Z {
 };
Index: test/cfi/cross-dso-diagnostic.cpp
===================================================================
--- test/cfi/cross-dso-diagnostic.cpp
+++ test/cfi/cross-dso-diagnostic.cpp
@@ -4,7 +4,7 @@
 // RUN: %clangxx_cfi_diag -g -o %t_exe_suffix %s %ld_flags_rpath_exe
 // RUN: %t_exe_suffix 2>&1 | FileCheck -DDSONAME=%xdynamiclib_namespec %s
 
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 // REQUIRES: cxxabi
 
 #include <dlfcn.h>
Index: test/cfi/mfcall.cpp
===================================================================
--- test/cfi/mfcall.cpp
+++ test/cfi/mfcall.cpp
@@ -1,4 +1,4 @@
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 // RUN: %clangxx_cfi -o %t %s
 // RUN: %expect_crash %run %t a
Index: test/cfi/target_uninstrumented.cpp
===================================================================
--- test/cfi/target_uninstrumented.cpp
+++ test/cfi/target_uninstrumented.cpp
@@ -3,7 +3,7 @@
 // RUN: %run %t 2>&1 | FileCheck %s
 
 // REQUIRES: cxxabi
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 #include <stdio.h>
 #include <string.h>
Index: test/cfi/two-vcalls.cpp
===================================================================
--- test/cfi/two-vcalls.cpp
+++ test/cfi/two-vcalls.cpp
@@ -4,7 +4,7 @@
 // This test checks that we don't generate two type checks,
 // if two virtual calls are in the same function.
 
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 // REQUIRES: cxxabi
 
 // TODO(krasin): implement the optimization to not emit two type checks.
Index: test/msan/strndup.cc
===================================================================
--- test/msan/strndup.cc
+++ test/msan/strndup.cc
@@ -4,7 +4,7 @@
 // When built as C on Linux, strndup is transformed to __strndup.
 // RUN: %clangxx_msan -O3 -xc %s -o %t && not %run %t 2>&1 | FileCheck --check-prefix=ON %s
 
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 #include <assert.h>
 #include <stdlib.h>
Index: test/sanitizer_common/TestCases/allocator_returns_null.cc
===================================================================
--- test/sanitizer_common/TestCases/allocator_returns_null.cc
+++ test/sanitizer_common/TestCases/allocator_returns_null.cc
@@ -36,7 +36,7 @@
 // RUN:   | FileCheck %s --check-prefix=CHECK-NULL
 
 // TODO(alekseyshl): win32 is disabled due to failing errno tests, fix it there.
-// UNSUPPORTED: ubsan, win32
+// UNSUPPORTED: ubsan, windows-msvc
 
 #include <assert.h>
 #include <errno.h>
Index: test/sanitizer_common/TestCases/malloc_hook.cc
===================================================================
--- test/sanitizer_common/TestCases/malloc_hook.cc
+++ test/sanitizer_common/TestCases/malloc_hook.cc
@@ -1,7 +1,7 @@
 // RUN: %clangxx -O2 %s -o %t && %run %t 2>&1 | FileCheck %s
 
 // Malloc/free hooks are not supported on Windows.
-// XFAIL: win32
+// XFAIL: windows-msvc
 // XFAIL: ubsan
 
 #include <stdlib.h>
Index: test/sanitizer_common/TestCases/strcasestr.c
===================================================================
--- test/sanitizer_common/TestCases/strcasestr.c
+++ test/sanitizer_common/TestCases/strcasestr.c
@@ -1,7 +1,7 @@
 // RUN: %clang %s -o %t && %run %t 2>&1
 
 // There's no interceptor for strcasestr on Windows
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #define _GNU_SOURCE
 #include <assert.h>
Index: test/ubsan/TestCases/Misc/enum.cpp
===================================================================
--- test/ubsan/TestCases/Misc/enum.cpp
+++ test/ubsan/TestCases/Misc/enum.cpp
@@ -4,7 +4,7 @@
 
 // FIXME: UBSan fails to add the correct instrumentation code for some reason on
 // Windows.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 enum E { a = 1 } e;
 #undef E
Index: test/ubsan/TestCases/Misc/log-path_test.cc
===================================================================
--- test/ubsan/TestCases/Misc/log-path_test.cc
+++ test/ubsan/TestCases/Misc/log-path_test.cc
@@ -21,7 +21,7 @@
 // RUN: not cat %t.log.*
 
 // FIXME: log_path is not supported on Windows yet.
-// XFAIL: win32
+// XFAIL: windows-msvc
 
 #include <stdio.h>
 #include <stdlib.h>
Index: test/ubsan/TestCases/Misc/monitor.cpp
===================================================================
--- test/ubsan/TestCases/Misc/monitor.cpp
+++ test/ubsan/TestCases/Misc/monitor.cpp
@@ -4,7 +4,7 @@
 // __ubsan_on_report is not defined as weak. Redefining it here isn't supported
 // on Windows.
 //
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 // Linkage issue
 // XFAIL: openbsd
 
Index: test/ubsan/TestCases/TypeCheck/Function/function.cpp
===================================================================
--- test/ubsan/TestCases/TypeCheck/Function/function.cpp
+++ test/ubsan/TestCases/TypeCheck/Function/function.cpp
@@ -2,7 +2,7 @@
 // RUN: %run %t 2>&1 | FileCheck %s
 // Verify that we can disable symbolization if needed:
 // RUN: %env_ubsan_opts=symbolize=0 %run %t 2>&1 | FileCheck %s --check-prefix=NOSYM
-// XFAIL: win32,win64
+// XFAIL: windows-msvc
 // Unsupported function flag
 // UNSUPPORTED: openbsd
 
Index: test/ubsan/TestCases/TypeCheck/PR33221.cpp
===================================================================
--- test/ubsan/TestCases/TypeCheck/PR33221.cpp
+++ test/ubsan/TestCases/TypeCheck/PR33221.cpp
@@ -2,7 +2,7 @@
 // RUN: %run %t 2>&1 | FileCheck %s
 
 // REQUIRES: cxxabi
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 #include <string.h>
 
Index: test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp
===================================================================
--- test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp
+++ test/ubsan/TestCases/TypeCheck/vptr-corrupted-vtable-itanium.cpp
@@ -1,7 +1,7 @@
 // RUN: %clangxx -frtti -fsanitize=vptr -fno-sanitize-recover=vptr,null -g %s -O3 -o %t
 // RUN: not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-CORRUPTED-VTABLE --strict-whitespace
 
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 // REQUIRES: stable-runtime, cxxabi
 #include <cstddef>
 
Index: test/ubsan/TestCases/TypeCheck/vptr-non-unique-typeinfo.cpp
===================================================================
--- test/ubsan/TestCases/TypeCheck/vptr-non-unique-typeinfo.cpp
+++ test/ubsan/TestCases/TypeCheck/vptr-non-unique-typeinfo.cpp
@@ -3,7 +3,7 @@
 // RUN: %run %t
 //
 // REQUIRES: cxxabi
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 struct X {
   virtual ~X() {}
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
@@ -2,7 +2,7 @@
 // RUN: %run %t
 
 // REQUIRES: cxxabi
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 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
@@ -2,7 +2,7 @@
 // RUN: not %run %t 2>&1 | FileCheck %s
 
 // REQUIRES: cxxabi
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 
 struct S { virtual int f() { return 0; } };
 struct T : virtual S {};
Index: test/ubsan/TestCases/TypeCheck/vptr.cpp
===================================================================
--- test/ubsan/TestCases/TypeCheck/vptr.cpp
+++ test/ubsan/TestCases/TypeCheck/vptr.cpp
@@ -37,7 +37,7 @@
 // RUN: %env_ubsan_opts=halt_on_error=1:suppressions='"%t.loc-supp"' not %run %t x- 2>&1 | FileCheck %s --check-prefix=CHECK-LOC-SUPPRESS
 
 // REQUIRES: stable-runtime, cxxabi
-// UNSUPPORTED: win32
+// UNSUPPORTED: windows-msvc
 // Suppressions file not pushed to the device.
 // UNSUPPORTED: android
 // Compilation error