Index: compiler-rt/test/fuzzer/cxxstring.test
===================================================================
--- compiler-rt/test/fuzzer/cxxstring.test
+++ compiler-rt/test/fuzzer/cxxstring.test
@@ -1,4 +1,4 @@
-UNSUPPORTED: windows,freebsd
+UNSUPPORTED: freebsd
 
 RUN: %cpp_compiler %S/CxxStringEqTest.cpp -o %t-CxxStringEqTest
 
Index: compiler-rt/test/fuzzer/minimize_crash.test
===================================================================
--- compiler-rt/test/fuzzer/minimize_crash.test
+++ compiler-rt/test/fuzzer/minimize_crash.test
@@ -1,4 +1,3 @@
-UNSUPPORTED: windows
 RUN: %cpp_compiler %S/NullDerefTest.cpp -o %t-NullDerefTest
 RUN: %cpp_compiler %S/SingleByteInputTest.cpp -o %t-SingleByteInputTest
 RUN: mkdir -p %t.dir
Index: compiler-rt/test/fuzzer/minimize_two_crashes.test
===================================================================
--- compiler-rt/test/fuzzer/minimize_two_crashes.test
+++ compiler-rt/test/fuzzer/minimize_two_crashes.test
@@ -1,5 +1,5 @@
 # Test that the minimizer stops when it sees a different bug.
-UNSUPPORTED: freebsd,windows
+UNSUPPORTED: freebsd
 
 # TODO: Find out why test fails on Darwin with -O2.
 RUN: %cpp_compiler -O0 %S/TwoDifferentBugsTest.cpp -o %t-TwoDifferentBugsTest
Index: compiler-rt/test/fuzzer/null-deref-on-empty.test
===================================================================
--- compiler-rt/test/fuzzer/null-deref-on-empty.test
+++ compiler-rt/test/fuzzer/null-deref-on-empty.test
@@ -1,4 +1,3 @@
-UNSUPPORTED: windows
 RUN: %cpp_compiler %S/NullDerefOnEmptyTest.cpp -o %t-NullDerefOnEmptyTest
 
 RUN: not %run %t-NullDerefOnEmptyTest -print_final_stats=1 2>&1 | FileCheck %s --check-prefix=NULL_DEREF_ON_EMPTY
Index: compiler-rt/test/fuzzer/null-deref.test
===================================================================
--- compiler-rt/test/fuzzer/null-deref.test
+++ compiler-rt/test/fuzzer/null-deref.test
@@ -1,4 +1,3 @@
-UNSUPPORTED: windows
 RUN: %cpp_compiler %S/NullDerefTest.cpp -o %t-NullDerefTest
 
 RUN: not %run %t-NullDerefTest                  2>&1 | FileCheck %s --check-prefix=NullDerefTest
Index: compiler-rt/test/fuzzer/value-profile-cmp.test
===================================================================
--- compiler-rt/test/fuzzer/value-profile-cmp.test
+++ compiler-rt/test/fuzzer/value-profile-cmp.test
@@ -1,5 +1,4 @@
-# FIXME: Disabled on Windows because of hangs.
-UNSUPPORTED: windows, ios
+UNSUPPORTED: ios
 CHECK: BINGO
 RUN: %cpp_compiler %S/SimpleCmpTest.cpp -o %t-SimpleCmpTest
 RUN: not %run %t-SimpleCmpTest -seed=1 -use_cmp=0 -use_value_profile=1 -runs=100000000 2>&1 | FileCheck %s
Index: compiler-rt/test/fuzzer/value-profile-cmp4.test
===================================================================
--- compiler-rt/test/fuzzer/value-profile-cmp4.test
+++ compiler-rt/test/fuzzer/value-profile-cmp4.test
@@ -1,5 +1,3 @@
-# FIXME: Disabled on Windows because of hangs.
-UNSUPPORTED: windows
 CHECK: BINGO
 RUN: %cpp_compiler %S/AbsNegAndConstant64Test.cpp -o %t-AbsNegAndConstant64Test
 RUN: not %run %t-AbsNegAndConstant64Test -seed=1 -use_cmp=0 -use_value_profile=1 -runs=100000000 2>&1 | FileCheck %s
Index: compiler-rt/test/fuzzer/value-profile-load.test
===================================================================
--- compiler-rt/test/fuzzer/value-profile-load.test
+++ compiler-rt/test/fuzzer/value-profile-load.test
@@ -1,5 +1,3 @@
-# FIXME: Disabled on Windows because of hangs.
-UNSUPPORTED: windows
 CHECK: AddressSanitizer: global-buffer-overflow
 RUN: %cpp_compiler %S/LoadTest.cpp -fsanitize-coverage=trace-gep -o %t-LoadTest
 RUN: not %run %t-LoadTest -seed=2 -use_cmp=0 -use_value_profile=1 -runs=20000000 2>&1 | FileCheck %s