diff --git a/compiler-rt/test/asan/TestCases/no_asan_gen_globals.c b/compiler-rt/test/asan/TestCases/Posix/no_asan_gen_globals.c
similarity index 99%
rename from compiler-rt/test/asan/TestCases/no_asan_gen_globals.c
rename to compiler-rt/test/asan/TestCases/Posix/no_asan_gen_globals.c
index 2b13deace4b5f..c686f83ac4a89 100644
--- a/compiler-rt/test/asan/TestCases/no_asan_gen_globals.c
+++ b/compiler-rt/test/asan/TestCases/Posix/no_asan_gen_globals.c
@@ -2,7 +2,6 @@
 // XFAIL: android
 // FIXME: http://llvm.org/bugs/show_bug.cgi?id=22682
 // REQUIRES: asan-64-bits
-//
 // Make sure __asan_gen_* strings do not end up in the symbol table.
 
 // RUN: %clang_asan %s -o %t.exe
diff --git a/compiler-rt/test/asan/TestCases/coverage-order-pcs.cc b/compiler-rt/test/asan/TestCases/coverage-order-pcs.cc
index dcab69474a6c3..e81c910454556 100644
--- a/compiler-rt/test/asan/TestCases/coverage-order-pcs.cc
+++ b/compiler-rt/test/asan/TestCases/coverage-order-pcs.cc
@@ -19,7 +19,7 @@
 //
 // RUN: rm -rf $DIR
 // Ordering works only in 64-bit mode for now.
-// REQUIRES: asan-64-bits
+// REQUIRES: asan-64-bits, shell
 // UNSUPPORTED: android
 #include <stdio.h>
 
diff --git a/compiler-rt/test/asan/TestCases/coverage-tracing.cc b/compiler-rt/test/asan/TestCases/coverage-tracing.cc
index b7755f847dbb6..278cfb141f07d 100644
--- a/compiler-rt/test/asan/TestCases/coverage-tracing.cc
+++ b/compiler-rt/test/asan/TestCases/coverage-tracing.cc
@@ -24,7 +24,7 @@
 // RUN: not diff b.points bf.points
 // RUN: rm -rf   %T/coverage-tracing
 //
-// REQUIRES: asan-64-bits
+// REQUIRES: asan-64-bits, shell
 // UNSUPPORTED: android
 
 #include <stdlib.h>
diff --git a/compiler-rt/test/asan/TestCases/intra-object-overflow.cc b/compiler-rt/test/asan/TestCases/intra-object-overflow.cc
index e48a261f55cc3..4032cc1448582 100644
--- a/compiler-rt/test/asan/TestCases/intra-object-overflow.cc
+++ b/compiler-rt/test/asan/TestCases/intra-object-overflow.cc
@@ -4,6 +4,8 @@
 //
 // FIXME: fix 32-bits.
 // REQUIRES: asan-64-bits
+// FIXME: Implement ASan intra-object padding in Clang's MS record layout
+// UNSUPPORTED: win32
 #include <stdio.h>
 #include <stdlib.h>
 class Foo {