diff --git a/compiler-rt/test/tsan/Darwin/gcd-after.mm b/compiler-rt/test/tsan/Darwin/gcd-after.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-after.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-after.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -39,4 +39,3 @@
 
 // CHECK: start
 // CHECK: done
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/gcd-async-norace.mm b/compiler-rt/test/tsan/Darwin/gcd-async-norace.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-async-norace.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-async-norace.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -24,4 +24,3 @@
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/gcd-barrier.mm b/compiler-rt/test/tsan/Darwin/gcd-barrier.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-barrier.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-barrier.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -44,4 +44,3 @@
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/gcd-blocks.mm b/compiler-rt/test/tsan/Darwin/gcd-blocks.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-blocks.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-blocks.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -33,5 +33,3 @@
 // CHECK: start
 // CHECK: block_var = 42
 // CHECK: done
-// CHECK-NOT: WARNING: ThreadSanitizer
-// CHECK-NOT: CHECK failed
diff --git a/compiler-rt/test/tsan/Darwin/gcd-data.mm b/compiler-rt/test/tsan/Darwin/gcd-data.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-data.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-data.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t -framework Foundation
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #import <Foundation/Foundation.h>
 
@@ -32,5 +32,4 @@
 
 // CHECK: Hello world.
 // CHECK: Data destructor.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/Darwin/gcd-fd.mm b/compiler-rt/test/tsan/Darwin/gcd-fd.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-fd.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-fd.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t -framework Foundation
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #import <Foundation/Foundation.h>
 
@@ -56,5 +56,4 @@
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/Darwin/gcd-groups-norace.mm b/compiler-rt/test/tsan/Darwin/gcd-groups-norace.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-groups-norace.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-groups-norace.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -48,4 +48,3 @@
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/gcd-io-barrier.mm b/compiler-rt/test/tsan/Darwin/gcd-io-barrier.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-io-barrier.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-io-barrier.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t -framework Foundation
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #import <Foundation/Foundation.h>
 
@@ -44,5 +44,4 @@
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/Darwin/gcd-io-cleanup.mm b/compiler-rt/test/tsan/Darwin/gcd-io-cleanup.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-io-cleanup.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-io-cleanup.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t -framework Foundation
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #import <Foundation/Foundation.h>
 
@@ -52,5 +52,4 @@
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/Darwin/gcd-io.mm b/compiler-rt/test/tsan/Darwin/gcd-io.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-io.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-io.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t -framework Foundation
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #import <Foundation/Foundation.h>
 
@@ -113,5 +113,4 @@
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/Darwin/gcd-serial-queue-norace.mm b/compiler-rt/test/tsan/Darwin/gcd-serial-queue-norace.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-serial-queue-norace.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-serial-queue-norace.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -35,4 +35,3 @@
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/gcd-source-cancel.mm b/compiler-rt/test/tsan/Darwin/gcd-source-cancel.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-source-cancel.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-source-cancel.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -35,4 +35,3 @@
 }
 
 // CHECK: global = 42
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/gcd-source-cancel2.mm b/compiler-rt/test/tsan/Darwin/gcd-source-cancel2.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-source-cancel2.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-source-cancel2.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -38,4 +38,3 @@
 }
 
 // CHECK: global = 42
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/gcd-source-event.mm b/compiler-rt/test/tsan/Darwin/gcd-source-event.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-source-event.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-source-event.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -34,4 +34,3 @@
 }
 
 // CHECK: global = 42
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/gcd-source-event2.mm b/compiler-rt/test/tsan/Darwin/gcd-source-event2.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-source-event2.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-source-event2.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -37,4 +37,3 @@
 }
 
 // CHECK: global = 42
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/gcd-source-registration.mm b/compiler-rt/test/tsan/Darwin/gcd-source-registration.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-source-registration.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-source-registration.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -32,4 +32,3 @@
 }
 
 // CHECK: global = 42
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/gcd-source-registration2.mm b/compiler-rt/test/tsan/Darwin/gcd-source-registration2.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-source-registration2.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-source-registration2.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -35,4 +35,3 @@
 }
 
 // CHECK: global = 42
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/gcd-source-serial.mm b/compiler-rt/test/tsan/Darwin/gcd-source-serial.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-source-serial.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-source-serial.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t -framework Foundation
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #import <Foundation/Foundation.h>
 
@@ -29,5 +29,4 @@
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/Darwin/gcd-sync-block-copy.mm b/compiler-rt/test/tsan/Darwin/gcd-sync-block-copy.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-sync-block-copy.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-sync-block-copy.mm
@@ -4,7 +4,7 @@
 // RUN: %run %t_no_tsan 2>&1 | FileCheck %s
 
 // RUN: %clang_tsan %s -o %t_with_tsan -framework Foundation
-// RUN: %run %t_with_tsan 2>&1 | FileCheck %s
+// RUN: %run %t_with_tsan 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #import <Foundation/Foundation.h>
 
@@ -31,4 +31,3 @@
 }
 
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/gcd-sync-norace.mm b/compiler-rt/test/tsan/Darwin/gcd-sync-norace.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-sync-norace.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-sync-norace.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -34,4 +34,3 @@
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/gcd-target-queue-norace.mm b/compiler-rt/test/tsan/Darwin/gcd-target-queue-norace.mm
--- a/compiler-rt/test/tsan/Darwin/gcd-target-queue-norace.mm
+++ b/compiler-rt/test/tsan/Darwin/gcd-target-queue-norace.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include "dispatch/dispatch.h"
 
@@ -37,5 +37,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.