Index: test/asan/TestCases/Posix/no_asan_gen_globals.c
===================================================================
--- test/asan/TestCases/Posix/no_asan_gen_globals.c
+++ 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
Index: test/asan/TestCases/coverage-order-pcs.cc
===================================================================
--- test/asan/TestCases/coverage-order-pcs.cc
+++ 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>
 
Index: test/asan/TestCases/coverage-tracing.cc
===================================================================
--- test/asan/TestCases/coverage-tracing.cc
+++ 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>
Index: test/asan/TestCases/intra-object-overflow.cc
===================================================================
--- test/asan/TestCases/intra-object-overflow.cc
+++ 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 {
Index: test/asan/TestCases/no_asan_gen_globals.c
===================================================================
--- test/asan/TestCases/no_asan_gen_globals.c
+++ test/asan/TestCases/no_asan_gen_globals.c
@@ -1,13 +0,0 @@
-// FIXME: https://code.google.com/p/address-sanitizer/issues/detail?id=316
-// 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
-// RUN: nm %t.exe | FileCheck %s
-
-int x, y, z;
-int main() { return 0; }
-// CHECK-NOT: __asan_gen_