diff --git a/compiler-rt/test/tsan/Darwin/external-ignore-noninstrumented.cc b/compiler-rt/test/tsan/Darwin/external-ignore-noninstrumented.cc
--- a/compiler-rt/test/tsan/Darwin/external-ignore-noninstrumented.cc
+++ b/compiler-rt/test/tsan/Darwin/external-ignore-noninstrumented.cc
@@ -5,7 +5,7 @@
 // RUN:   -o %t-module.dylib -install_name @rpath/`basename %t-module.dylib`
 
 // RUN: %clangxx_tsan %s %t-module.dylib -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include <stdio.h>
 
@@ -15,5 +15,4 @@
   fprintf(stderr, "Done.\n");
 }
 
-// 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: %clang_tsan %s -o %t_with_tsan -framework Foundation
 
 // RUN: %run %t_no_tsan   2>&1 | FileCheck %s
-// 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>
 
@@ -35,4 +35,3 @@
 }
 
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/libcxx-call-once.mm b/compiler-rt/test/tsan/Darwin/libcxx-call-once.mm
--- a/compiler-rt/test/tsan/Darwin/libcxx-call-once.mm
+++ b/compiler-rt/test/tsan/Darwin/libcxx-call-once.mm
@@ -1,5 +1,5 @@
 // RUN: %clangxx_tsan %s -o %t -framework Foundation -std=c++11
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #import <Foundation/Foundation.h>
 
@@ -30,5 +30,4 @@
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/Darwin/libcxx-future.mm b/compiler-rt/test/tsan/Darwin/libcxx-future.mm
--- a/compiler-rt/test/tsan/Darwin/libcxx-future.mm
+++ b/compiler-rt/test/tsan/Darwin/libcxx-future.mm
@@ -1,5 +1,5 @@
 // RUN: %clangxx_tsan %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include <iostream>
 #include <future>
@@ -26,5 +26,4 @@
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr-recursive.mm b/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr-recursive.mm
--- a/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr-recursive.mm
+++ b/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr-recursive.mm
@@ -1,5 +1,5 @@
 // RUN: %clangxx_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>
 
@@ -33,4 +33,3 @@
 // CHECK: ~MyStruct
 // CHECK: ~InnerStruct
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr-stress.mm b/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr-stress.mm
--- a/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr-stress.mm
+++ b/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr-stress.mm
@@ -1,5 +1,5 @@
 // RUN: %clangxx_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>
 
@@ -72,4 +72,3 @@
 // CHECK: shared_call_counter = 1000000
 // CHECK: destructor_counter = 1000
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr.mm b/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr.mm
--- a/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr.mm
+++ b/compiler-rt/test/tsan/Darwin/libcxx-shared-ptr.mm
@@ -1,5 +1,5 @@
 // RUN: %clangxx_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>
 
@@ -47,4 +47,3 @@
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm b/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm
--- a/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm
+++ b/compiler-rt/test/tsan/Darwin/norace-objcxx-run-time.mm
@@ -1,5 +1,5 @@
 // RUN: %clang_tsan %s -lc++ -fobjc-arc -lobjc -o %t -framework Foundation %darwin_min_target_with_full_runtime_arc_support
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 // Check that we do not report races between:
 // - Object retain and initialize
@@ -110,4 +110,3 @@
 }
 
 // CHECK: Done.
-// CHECK-NOT: ThreadSanitizer: data race
diff --git a/compiler-rt/test/tsan/Darwin/objc-simple.mm b/compiler-rt/test/tsan/Darwin/objc-simple.mm
--- a/compiler-rt/test/tsan/Darwin/objc-simple.mm
+++ b/compiler-rt/test/tsan/Darwin/objc-simple.mm
@@ -1,7 +1,7 @@
 // Test that a simple Obj-C program runs and exits without any warnings.
 
 // 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>
 
@@ -10,4 +10,3 @@
 }
 
 // CHECK: Hello world
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/objc-synchronize-nested-recursive.mm b/compiler-rt/test/tsan/Darwin/objc-synchronize-nested-recursive.mm
--- a/compiler-rt/test/tsan/Darwin/objc-synchronize-nested-recursive.mm
+++ b/compiler-rt/test/tsan/Darwin/objc-synchronize-nested-recursive.mm
@@ -1,5 +1,5 @@
 // RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #import <Foundation/Foundation.h>
 
@@ -29,7 +29,6 @@
   }
 
   NSLog(@"PASS");
-// CHECK-NOT: ThreadSanitizer
 // CHECK: PASS
   return 0;
 }
diff --git a/compiler-rt/test/tsan/Darwin/objc-synchronize-tagged.mm b/compiler-rt/test/tsan/Darwin/objc-synchronize-tagged.mm
--- a/compiler-rt/test/tsan/Darwin/objc-synchronize-tagged.mm
+++ b/compiler-rt/test/tsan/Darwin/objc-synchronize-tagged.mm
@@ -1,5 +1,5 @@
 // RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #import <Foundation/Foundation.h>
 
@@ -59,4 +59,3 @@
 }
 
 // CHECK: Hello world
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/objc-synchronize.mm b/compiler-rt/test/tsan/Darwin/objc-synchronize.mm
--- a/compiler-rt/test/tsan/Darwin/objc-synchronize.mm
+++ b/compiler-rt/test/tsan/Darwin/objc-synchronize.mm
@@ -1,5 +1,5 @@
 // RUN: %clangxx_tsan %s -o %t -framework Foundation -fobjc-arc %darwin_min_target_with_full_runtime_arc_support
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #import <Foundation/Foundation.h>
 
@@ -54,4 +54,3 @@
 }
 
 // CHECK: Hello world
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/osatomics-add.mm b/compiler-rt/test/tsan/Darwin/osatomics-add.mm
--- a/compiler-rt/test/tsan/Darwin/osatomics-add.mm
+++ b/compiler-rt/test/tsan/Darwin/osatomics-add.mm
@@ -1,5 +1,5 @@
 // RUN: %clangxx_tsan %s -o %t -framework Foundation -std=c++11
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #import <Foundation/Foundation.h>
 #import <libkern/OSAtomic.h>
@@ -45,4 +45,3 @@
 
 // CHECK: start
 // CHECK: end, g = 42
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/osatomics-list.mm b/compiler-rt/test/tsan/Darwin/osatomics-list.mm
--- a/compiler-rt/test/tsan/Darwin/osatomics-list.mm
+++ b/compiler-rt/test/tsan/Darwin/osatomics-list.mm
@@ -1,5 +1,5 @@
 // RUN: %clangxx_tsan %s -o %t -framework Foundation -std=c++11
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #import <Foundation/Foundation.h>
 #import <libkern/OSAtomic.h>
@@ -40,4 +40,3 @@
 
 // CHECK: data = 42
 // CHECK: done
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/osspinlock-norace.cc b/compiler-rt/test/tsan/Darwin/osspinlock-norace.cc
--- a/compiler-rt/test/tsan/Darwin/osspinlock-norace.cc
+++ b/compiler-rt/test/tsan/Darwin/osspinlock-norace.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -31,4 +31,3 @@
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Darwin/signals-blocked.cc b/compiler-rt/test/tsan/Darwin/signals-blocked.cc
--- a/compiler-rt/test/tsan/Darwin/signals-blocked.cc
+++ b/compiler-rt/test/tsan/Darwin/signals-blocked.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include <pthread.h>
 #include <stdio.h>
@@ -69,7 +69,5 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: SIGNAL DELIVERED
 // CHECK: DONE
-// CHECK-NOT: WARNING: ThreadSanitizer:
diff --git a/compiler-rt/test/tsan/Darwin/xpc-cancel.mm b/compiler-rt/test/tsan/Darwin/xpc-cancel.mm
--- a/compiler-rt/test/tsan/Darwin/xpc-cancel.mm
+++ b/compiler-rt/test/tsan/Darwin/xpc-cancel.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'
 
 // UNSUPPORTED: ios
 
@@ -35,5 +35,4 @@
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/Darwin/xpc.mm b/compiler-rt/test/tsan/Darwin/xpc.mm
--- a/compiler-rt/test/tsan/Darwin/xpc.mm
+++ b/compiler-rt/test/tsan/Darwin/xpc.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'
 
 // UNSUPPORTED: ios
 
@@ -73,4 +73,3 @@
 }
 
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/Linux/mutex_robust.cc b/compiler-rt/test/tsan/Linux/mutex_robust.cc
--- a/compiler-rt/test/tsan/Linux/mutex_robust.cc
+++ b/compiler-rt/test/tsan/Linux/mutex_robust.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -29,8 +29,6 @@
 }
 
 // This is a correct code, and tsan must not bark.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK-NOT: EOWNERDEAD
 // CHECK: DONE
-// CHECK-NOT: WARNING: ThreadSanitizer
 
diff --git a/compiler-rt/test/tsan/Linux/thread_timedjoin.c b/compiler-rt/test/tsan/Linux/thread_timedjoin.c
--- a/compiler-rt/test/tsan/Linux/thread_timedjoin.c
+++ b/compiler-rt/test/tsan/Linux/thread_timedjoin.c
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #define _GNU_SOURCE
 #include "../test.h"
 #include <errno.h>
@@ -34,6 +34,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
-// CHECK-NOT: WARNING: ThreadSanitizer: thread leak
 // CHECK: PASS
diff --git a/compiler-rt/test/tsan/Linux/thread_tryjoin.c b/compiler-rt/test/tsan/Linux/thread_tryjoin.c
--- a/compiler-rt/test/tsan/Linux/thread_tryjoin.c
+++ b/compiler-rt/test/tsan/Linux/thread_tryjoin.c
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #define _GNU_SOURCE
 #include "../test.h"
 #include <errno.h>
@@ -36,6 +36,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
-// CHECK-NOT: WARNING: ThreadSanitizer: thread leak
 // CHECK: PASS
diff --git a/compiler-rt/test/tsan/Linux/user_fopen.cc b/compiler-rt/test/tsan/Linux/user_fopen.cc
--- a/compiler-rt/test/tsan/Linux/user_fopen.cc
+++ b/compiler-rt/test/tsan/Linux/user_fopen.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -30,5 +30,4 @@
 }
 
 // CHECK: user fopen
-// CHECK-NOT: ThreadSanitizer
 
diff --git a/compiler-rt/test/tsan/Linux/user_malloc.cc b/compiler-rt/test/tsan/Linux/user_malloc.cc
--- a/compiler-rt/test/tsan/Linux/user_malloc.cc
+++ b/compiler-rt/test/tsan/Linux/user_malloc.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 // UNSUPPORTED: powerpc64le
 
@@ -31,5 +31,4 @@
 }
 
 // CHECK: user malloc
-// CHECK-NOT: ThreadSanitizer
 
diff --git a/compiler-rt/test/tsan/annotate_happens_before.cc b/compiler-rt/test/tsan/annotate_happens_before.cc
--- a/compiler-rt/test/tsan/annotate_happens_before.cc
+++ b/compiler-rt/test/tsan/annotate_happens_before.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 /*
@@ -52,6 +52,5 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: DONE
 
diff --git a/compiler-rt/test/tsan/atexit2.cc b/compiler-rt/test/tsan/atexit2.cc
--- a/compiler-rt/test/tsan/atexit2.cc
+++ b/compiler-rt/test/tsan/atexit2.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -20,7 +20,5 @@
     atexit(atexit1);
 }
 
-// CHECK-NOT: FATAL: ThreadSanitizer
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: run count: 10000
 
diff --git a/compiler-rt/test/tsan/atexit3.cc b/compiler-rt/test/tsan/atexit3.cc
--- a/compiler-rt/test/tsan/atexit3.cc
+++ b/compiler-rt/test/tsan/atexit3.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -36,6 +36,4 @@
   atexit(atexit5);
 }
 
-// CHECK-NOT: FATAL: ThreadSanitizer
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: 54321
diff --git a/compiler-rt/test/tsan/atomic_norace.cc b/compiler-rt/test/tsan/atomic_norace.cc
--- a/compiler-rt/test/tsan/atomic_norace.cc
+++ b/compiler-rt/test/tsan/atomic_norace.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 const int kTestCount = 4;
diff --git a/compiler-rt/test/tsan/barrier.cc b/compiler-rt/test/tsan/barrier.cc
--- a/compiler-rt/test/tsan/barrier.cc
+++ b/compiler-rt/test/tsan/barrier.cc
@@ -1,5 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
-// CHECK-NOT: ThreadSanitizer: data race
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 // CHECK: DONE
 
 // pthread barriers are not available on OS X
diff --git a/compiler-rt/test/tsan/benign_race.cc b/compiler-rt/test/tsan/benign_race.cc
--- a/compiler-rt/test/tsan/benign_race.cc
+++ b/compiler-rt/test/tsan/benign_race.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 int Global;
diff --git a/compiler-rt/test/tsan/blacklist.cc b/compiler-rt/test/tsan/blacklist.cc
--- a/compiler-rt/test/tsan/blacklist.cc
+++ b/compiler-rt/test/tsan/blacklist.cc
@@ -1,7 +1,7 @@
 // Test blacklist functionality for TSan.
 
 // RUN: echo "fun:*Blacklisted_Thread2*" > %t.blacklist
-// RUN: %clangxx_tsan -O1 %s -fsanitize-blacklist=%t.blacklist -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -fsanitize-blacklist=%t.blacklist -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdio.h>
 
diff --git a/compiler-rt/test/tsan/cond.c b/compiler-rt/test/tsan/cond.c
--- a/compiler-rt/test/tsan/cond.c
+++ b/compiler-rt/test/tsan/cond.c
@@ -1,7 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
-// CHECK-NOT: ThreadSanitizer WARNING: double lock
-// CHECK-NOT: ThreadSanitizer WARNING: mutex unlock by another thread
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 // CHECK: OK
 
 #include <stdio.h>
diff --git a/compiler-rt/test/tsan/cond_destruction.cc b/compiler-rt/test/tsan/cond_destruction.cc
--- a/compiler-rt/test/tsan/cond_destruction.cc
+++ b/compiler-rt/test/tsan/cond_destruction.cc
@@ -1,7 +1,7 @@
 // RUN: %clangxx_tsan -O1 %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
-// RUN: %run %t arg 2>&1 | FileCheck %s
-// RUN: %run %t arg arg 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
+// RUN: %run %t arg 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
+// RUN: %run %t arg arg 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 // Test for destruction of pthread_cond_t.
diff --git a/compiler-rt/test/tsan/custom_mutex3.cc b/compiler-rt/test/tsan/custom_mutex3.cc
--- a/compiler-rt/test/tsan/custom_mutex3.cc
+++ b/compiler-rt/test/tsan/custom_mutex3.cc
@@ -1,5 +1,5 @@
 // RUN: %clangxx_tsan -O1 --std=c++11 %s -o %t
-// RUN: %env_tsan_opts=report_destroy_locked=0 %run %t 2>&1 | FileCheck %s
+// RUN: %env_tsan_opts=report_destroy_locked=0 %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "custom_mutex.h"
 
 // Regression test for a bug.
@@ -42,5 +42,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/default_options.cc b/compiler-rt/test/tsan/default_options.cc
--- a/compiler-rt/test/tsan/default_options.cc
+++ b/compiler-rt/test/tsan/default_options.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdio.h>
 
@@ -28,5 +28,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/dl_iterate_phdr.cc b/compiler-rt/test/tsan/dl_iterate_phdr.cc
--- a/compiler-rt/test/tsan/dl_iterate_phdr.cc
+++ b/compiler-rt/test/tsan/dl_iterate_phdr.cc
@@ -1,5 +1,5 @@
 // RUN: %clangxx_tsan -O1 %s -DBUILD_SO -fPIC -shared -o %t-so.so
-// RUN: %clangxx_tsan -O1 %s %link_libcxx_tsan -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s %link_libcxx_tsan -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 // dl_iterate_phdr doesn't exist on OS X.
 // UNSUPPORTED: darwin
@@ -53,5 +53,4 @@
 
 #endif  // BUILD_SO
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/dtls.c b/compiler-rt/test/tsan/dtls.c
--- a/compiler-rt/test/tsan/dtls.c
+++ b/compiler-rt/test/tsan/dtls.c
@@ -1,6 +1,6 @@
 // RUN: %clang_tsan %s -o %t
 // RUN: %clang_tsan %s -DBUILD_SO -fPIC -o %t-so.so -shared
-// RUN: %run %t 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 // XFAIL: netbsd
 
 // Test that tsan cleans up dynamic TLS memory between reuse.
@@ -59,5 +59,4 @@
 }
 #endif
 
-// CHECK-NOT: ThreadSanitizer: data race
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/fd_close_norace.cc b/compiler-rt/test/tsan/fd_close_norace.cc
--- a/compiler-rt/test/tsan/fd_close_norace.cc
+++ b/compiler-rt/test/tsan/fd_close_norace.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/compiler-rt/test/tsan/fd_close_norace2.cc b/compiler-rt/test/tsan/fd_close_norace2.cc
--- a/compiler-rt/test/tsan/fd_close_norace2.cc
+++ b/compiler-rt/test/tsan/fd_close_norace2.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -26,5 +26,4 @@
   fprintf(stderr, "OK\n");
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: OK
diff --git a/compiler-rt/test/tsan/fd_dup_norace.cc b/compiler-rt/test/tsan/fd_dup_norace.cc
--- a/compiler-rt/test/tsan/fd_dup_norace.cc
+++ b/compiler-rt/test/tsan/fd_dup_norace.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/compiler-rt/test/tsan/fd_dup_norace2.cc b/compiler-rt/test/tsan/fd_dup_norace2.cc
--- a/compiler-rt/test/tsan/fd_dup_norace2.cc
+++ b/compiler-rt/test/tsan/fd_dup_norace2.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -56,5 +56,4 @@
   fprintf(stderr, "DONE\n");
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/fd_pipe_norace.cc b/compiler-rt/test/tsan/fd_pipe_norace.cc
--- a/compiler-rt/test/tsan/fd_pipe_norace.cc
+++ b/compiler-rt/test/tsan/fd_pipe_norace.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/compiler-rt/test/tsan/fd_socket_connect_norace.cc b/compiler-rt/test/tsan/fd_socket_connect_norace.cc
--- a/compiler-rt/test/tsan/fd_socket_connect_norace.cc
+++ b/compiler-rt/test/tsan/fd_socket_connect_norace.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <arpa/inet.h>
 #include <assert.h>
 #include <netinet/in.h>
diff --git a/compiler-rt/test/tsan/fd_socket_norace.cc b/compiler-rt/test/tsan/fd_socket_norace.cc
--- a/compiler-rt/test/tsan/fd_socket_norace.cc
+++ b/compiler-rt/test/tsan/fd_socket_norace.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <arpa/inet.h>
 #include <assert.h>
 #include <netinet/in.h>
diff --git a/compiler-rt/test/tsan/fd_socketpair_norace.cc b/compiler-rt/test/tsan/fd_socketpair_norace.cc
--- a/compiler-rt/test/tsan/fd_socketpair_norace.cc
+++ b/compiler-rt/test/tsan/fd_socketpair_norace.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/compiler-rt/test/tsan/fiber_asm.cc b/compiler-rt/test/tsan/fiber_asm.cc
--- a/compiler-rt/test/tsan/fiber_asm.cc
+++ b/compiler-rt/test/tsan/fiber_asm.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 // REQUIRES: x86_64-target-arch
 // UNSUPPORTED: darwin
 #include "test.h"
@@ -82,5 +82,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: PASS
diff --git a/compiler-rt/test/tsan/fiber_from_thread.cc b/compiler-rt/test/tsan/fiber_from_thread.cc
--- a/compiler-rt/test/tsan/fiber_from_thread.cc
+++ b/compiler-rt/test/tsan/fiber_from_thread.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 // UNSUPPORTED: darwin
 #include "test.h"
 #include <ucontext.h>
@@ -44,5 +44,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: PASS
diff --git a/compiler-rt/test/tsan/fiber_longjmp.cc b/compiler-rt/test/tsan/fiber_longjmp.cc
--- a/compiler-rt/test/tsan/fiber_longjmp.cc
+++ b/compiler-rt/test/tsan/fiber_longjmp.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 // UNSUPPORTED: darwin
 #include "test.h"
 #include <setjmp.h>
@@ -76,5 +76,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: PASS
diff --git a/compiler-rt/test/tsan/fiber_simple.cc b/compiler-rt/test/tsan/fiber_simple.cc
--- a/compiler-rt/test/tsan/fiber_simple.cc
+++ b/compiler-rt/test/tsan/fiber_simple.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 // UNSUPPORTED: darwin
 #include "test.h"
 #include <ucontext.h>
@@ -32,5 +32,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: PASS
diff --git a/compiler-rt/test/tsan/fiber_two_threads.cc b/compiler-rt/test/tsan/fiber_two_threads.cc
--- a/compiler-rt/test/tsan/fiber_two_threads.cc
+++ b/compiler-rt/test/tsan/fiber_two_threads.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 // UNSUPPORTED: darwin
 #include "test.h"
 #include <ucontext.h>
@@ -58,5 +58,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: PASS
diff --git a/compiler-rt/test/tsan/ignore_free.cc b/compiler-rt/test/tsan/ignore_free.cc
--- a/compiler-rt/test/tsan/ignore_free.cc
+++ b/compiler-rt/test/tsan/ignore_free.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 extern "C" {
@@ -30,5 +30,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: OK
diff --git a/compiler-rt/test/tsan/ignore_malloc.cc b/compiler-rt/test/tsan/ignore_malloc.cc
--- a/compiler-rt/test/tsan/ignore_malloc.cc
+++ b/compiler-rt/test/tsan/ignore_malloc.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 extern "C" {
@@ -31,5 +31,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: OK
diff --git a/compiler-rt/test/tsan/ignore_race.cc b/compiler-rt/test/tsan/ignore_race.cc
--- a/compiler-rt/test/tsan/ignore_race.cc
+++ b/compiler-rt/test/tsan/ignore_race.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 int Global;
diff --git a/compiler-rt/test/tsan/java_alloc.cc b/compiler-rt/test/tsan/java_alloc.cc
--- a/compiler-rt/test/tsan/java_alloc.cc
+++ b/compiler-rt/test/tsan/java_alloc.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "java.h"
 
 int const kHeapSize = 1024 * 1024;
@@ -33,6 +33,5 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK-NOT: FAILED
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/java_finalizer.cc b/compiler-rt/test/tsan/java_finalizer.cc
--- a/compiler-rt/test/tsan/java_finalizer.cc
+++ b/compiler-rt/test/tsan/java_finalizer.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "java.h"
 
 void *Thread(void *p) {
@@ -25,5 +25,4 @@
   return __tsan_java_fini();
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/java_heap_init.cc b/compiler-rt/test/tsan/java_heap_init.cc
--- a/compiler-rt/test/tsan/java_heap_init.cc
+++ b/compiler-rt/test/tsan/java_heap_init.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "java.h"
 #include <errno.h>
 #include <sys/mman.h>
@@ -24,5 +24,4 @@
   return __tsan_java_fini();
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/java_lock.cc b/compiler-rt/test/tsan/java_lock.cc
--- a/compiler-rt/test/tsan/java_lock.cc
+++ b/compiler-rt/test/tsan/java_lock.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "java.h"
 
 jptr varaddr;
@@ -33,5 +33,4 @@
   return __tsan_java_fini();
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/java_lock_move.cc b/compiler-rt/test/tsan/java_lock_move.cc
--- a/compiler-rt/test/tsan/java_lock_move.cc
+++ b/compiler-rt/test/tsan/java_lock_move.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "java.h"
 
 jptr varaddr;
@@ -39,5 +39,4 @@
   return __tsan_java_fini();
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/java_lock_rec.cc b/compiler-rt/test/tsan/java_lock_rec.cc
--- a/compiler-rt/test/tsan/java_lock_rec.cc
+++ b/compiler-rt/test/tsan/java_lock_rec.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "java.h"
 
 jptr varaddr;
@@ -52,6 +52,5 @@
   return __tsan_java_fini();
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK-NOT: FAILED
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/java_move_overlap.cc b/compiler-rt/test/tsan/java_move_overlap.cc
--- a/compiler-rt/test/tsan/java_move_overlap.cc
+++ b/compiler-rt/test/tsan/java_move_overlap.cc
@@ -1,6 +1,6 @@
 // RUN: %clangxx_tsan -O1 %s -o %t
-// RUN: %run %t 2>&1 | FileCheck %s
-// RUN: %run %t arg 2>&1 | FileCheck %s
+// RUN: %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
+// RUN: %run %t arg 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "java.h"
 
 jptr varaddr1_old;
@@ -70,5 +70,4 @@
   return __tsan_java_fini();
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/java_rwlock.cc b/compiler-rt/test/tsan/java_rwlock.cc
--- a/compiler-rt/test/tsan/java_rwlock.cc
+++ b/compiler-rt/test/tsan/java_rwlock.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "java.h"
 
 jptr varaddr;
@@ -33,5 +33,4 @@
   return __tsan_java_fini();
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/java_volatile.cc b/compiler-rt/test/tsan/java_volatile.cc
--- a/compiler-rt/test/tsan/java_volatile.cc
+++ b/compiler-rt/test/tsan/java_volatile.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "java.h"
 
 jptr varaddr;
@@ -38,5 +38,4 @@
   return __tsan_java_fini();
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/libcxx/std_shared_ptr.cc b/compiler-rt/test/tsan/libcxx/std_shared_ptr.cc
--- a/compiler-rt/test/tsan/libcxx/std_shared_ptr.cc
+++ b/compiler-rt/test/tsan/libcxx/std_shared_ptr.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s %link_libcxx_tsan -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s %link_libcxx_tsan -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <stdio.h>
 #include <memory>
 #include <thread>
@@ -18,7 +18,6 @@
   t1.join();
   t2.join();
   printf("%d %d\n", v1, v2);
-  // CHECK-NOT: ThreadSanitizer: data race
   // CHECK: 42 42
   return 0;
 }
diff --git a/compiler-rt/test/tsan/libdispatch/after.c b/compiler-rt/test/tsan/libdispatch/after.c
--- a/compiler-rt/test/tsan/libdispatch/after.c
+++ b/compiler-rt/test/tsan/libdispatch/after.c
@@ -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/libdispatch/async-norace.c b/compiler-rt/test/tsan/libdispatch/async-norace.c
--- a/compiler-rt/test/tsan/libdispatch/async-norace.c
+++ b/compiler-rt/test/tsan/libdispatch/async-norace.c
@@ -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/libdispatch/barrier.c b/compiler-rt/test/tsan/libdispatch/barrier.c
--- a/compiler-rt/test/tsan/libdispatch/barrier.c
+++ b/compiler-rt/test/tsan/libdispatch/barrier.c
@@ -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/libdispatch/blocks.c b/compiler-rt/test/tsan/libdispatch/blocks.c
--- a/compiler-rt/test/tsan/libdispatch/blocks.c
+++ b/compiler-rt/test/tsan/libdispatch/blocks.c
@@ -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/libdispatch/fd.c b/compiler-rt/test/tsan/libdispatch/fd.c
--- a/compiler-rt/test/tsan/libdispatch/fd.c
+++ b/compiler-rt/test/tsan/libdispatch/fd.c
@@ -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>
 
@@ -58,5 +58,4 @@
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/libdispatch/groups-norace.c b/compiler-rt/test/tsan/libdispatch/groups-norace.c
--- a/compiler-rt/test/tsan/libdispatch/groups-norace.c
+++ b/compiler-rt/test/tsan/libdispatch/groups-norace.c
@@ -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/libdispatch/io-barrier.c b/compiler-rt/test/tsan/libdispatch/io-barrier.c
--- a/compiler-rt/test/tsan/libdispatch/io-barrier.c
+++ b/compiler-rt/test/tsan/libdispatch/io-barrier.c
@@ -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>
 
@@ -46,5 +46,4 @@
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/libdispatch/io-cleanup.c b/compiler-rt/test/tsan/libdispatch/io-cleanup.c
--- a/compiler-rt/test/tsan/libdispatch/io-cleanup.c
+++ b/compiler-rt/test/tsan/libdispatch/io-cleanup.c
@@ -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>
 
@@ -54,5 +54,4 @@
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/libdispatch/io.c b/compiler-rt/test/tsan/libdispatch/io.c
--- a/compiler-rt/test/tsan/libdispatch/io.c
+++ b/compiler-rt/test/tsan/libdispatch/io.c
@@ -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>
 
@@ -115,5 +115,4 @@
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/libdispatch/serial-queue-norace.c b/compiler-rt/test/tsan/libdispatch/serial-queue-norace.c
--- a/compiler-rt/test/tsan/libdispatch/serial-queue-norace.c
+++ b/compiler-rt/test/tsan/libdispatch/serial-queue-norace.c
@@ -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/libdispatch/source-cancel.c b/compiler-rt/test/tsan/libdispatch/source-cancel.c
--- a/compiler-rt/test/tsan/libdispatch/source-cancel.c
+++ b/compiler-rt/test/tsan/libdispatch/source-cancel.c
@@ -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/libdispatch/source-cancel2.c b/compiler-rt/test/tsan/libdispatch/source-cancel2.c
--- a/compiler-rt/test/tsan/libdispatch/source-cancel2.c
+++ b/compiler-rt/test/tsan/libdispatch/source-cancel2.c
@@ -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/libdispatch/source-event.c b/compiler-rt/test/tsan/libdispatch/source-event.c
--- a/compiler-rt/test/tsan/libdispatch/source-event.c
+++ b/compiler-rt/test/tsan/libdispatch/source-event.c
@@ -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/libdispatch/source-event2.c b/compiler-rt/test/tsan/libdispatch/source-event2.c
--- a/compiler-rt/test/tsan/libdispatch/source-event2.c
+++ b/compiler-rt/test/tsan/libdispatch/source-event2.c
@@ -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/libdispatch/source-registration.c b/compiler-rt/test/tsan/libdispatch/source-registration.c
--- a/compiler-rt/test/tsan/libdispatch/source-registration.c
+++ b/compiler-rt/test/tsan/libdispatch/source-registration.c
@@ -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/libdispatch/source-registration2.c b/compiler-rt/test/tsan/libdispatch/source-registration2.c
--- a/compiler-rt/test/tsan/libdispatch/source-registration2.c
+++ b/compiler-rt/test/tsan/libdispatch/source-registration2.c
@@ -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/libdispatch/sync-norace.c b/compiler-rt/test/tsan/libdispatch/sync-norace.c
--- a/compiler-rt/test/tsan/libdispatch/sync-norace.c
+++ b/compiler-rt/test/tsan/libdispatch/sync-norace.c
@@ -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/libdispatch/target-queue-norace.c b/compiler-rt/test/tsan/libdispatch/target-queue-norace.c
--- a/compiler-rt/test/tsan/libdispatch/target-queue-norace.c
+++ b/compiler-rt/test/tsan/libdispatch/target-queue-norace.c
@@ -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.
diff --git a/compiler-rt/test/tsan/mutex_annotations.cc b/compiler-rt/test/tsan/mutex_annotations.cc
--- a/compiler-rt/test/tsan/mutex_annotations.cc
+++ b/compiler-rt/test/tsan/mutex_annotations.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 // Test that a linker-initialized mutex can be created/destroyed while in use.
@@ -45,5 +45,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/race_on_speculative_load.cc b/compiler-rt/test/tsan/race_on_speculative_load.cc
--- a/compiler-rt/test/tsan/race_on_speculative_load.cc
+++ b/compiler-rt/test/tsan/race_on_speculative_load.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 // Regtest for https://github.com/google/sanitizers/issues/447
 // This is a correct program and tsan should not report a race.
 #include "test.h"
@@ -25,6 +25,5 @@
   barrier_wait(&barrier);
   pthread_join(t, 0);
   fprintf(stderr, "PASS\n");
-  // CHECK-NOT: ThreadSanitizer: data race
   // CHECK: PASS
 }
diff --git a/compiler-rt/test/tsan/race_top_suppression.cc b/compiler-rt/test/tsan/race_top_suppression.cc
--- a/compiler-rt/test/tsan/race_top_suppression.cc
+++ b/compiler-rt/test/tsan/race_top_suppression.cc
@@ -1,6 +1,6 @@
 // RUN: echo "race_top:TopFunction" > %t.supp
 // RUN: %clangxx_tsan -O1 %s -o %t
-// RUN: %env_tsan_opts=suppressions='%t.supp' %run %t 2>&1 | FileCheck %s
+// RUN: %env_tsan_opts=suppressions='%t.supp' %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 // RUN: rm %t.supp
 #include "test.h"
 
diff --git a/compiler-rt/test/tsan/real_deadlock_detector_stress_test.cc b/compiler-rt/test/tsan/real_deadlock_detector_stress_test.cc
--- a/compiler-rt/test/tsan/real_deadlock_detector_stress_test.cc
+++ b/compiler-rt/test/tsan/real_deadlock_detector_stress_test.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s %link_libcxx_tsan -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s %link_libcxx_tsan -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 #include <pthread.h>
 #include <stdlib.h>
@@ -182,6 +182,5 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: DONE
 
diff --git a/compiler-rt/test/tsan/signal_block.cc b/compiler-rt/test/tsan/signal_block.cc
--- a/compiler-rt/test/tsan/signal_block.cc
+++ b/compiler-rt/test/tsan/signal_block.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 // Test that a signal is not delivered when it is blocked.
 
@@ -55,6 +55,4 @@
   return 0;
 }
 
-// CHECK-NOT: ThreadSanitizer CHECK
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/signal_longjmp.cc b/compiler-rt/test/tsan/signal_longjmp.cc
--- a/compiler-rt/test/tsan/signal_longjmp.cc
+++ b/compiler-rt/test/tsan/signal_longjmp.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 // Test case for longjumping out of signal handler:
 // https://github.com/google/sanitizers/issues/482
@@ -76,5 +76,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/signal_recursive.cc b/compiler-rt/test/tsan/signal_recursive.cc
--- a/compiler-rt/test/tsan/signal_recursive.cc
+++ b/compiler-rt/test/tsan/signal_recursive.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 // Test case for recursive signal handlers, adopted from:
 // https://github.com/google/sanitizers/issues/478
@@ -121,6 +121,4 @@
 }
 
 // CHECK-NOT: FAILED
-// CHECK-NOT: ThreadSanitizer CHECK failed
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/signal_reset.cc b/compiler-rt/test/tsan/signal_reset.cc
--- a/compiler-rt/test/tsan/signal_reset.cc
+++ b/compiler-rt/test/tsan/signal_reset.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 // UNSUPPORTED: darwin
 #include <pthread.h>
 #include <stdio.h>
@@ -70,6 +70,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: DONE
-// CHECK-NOT: WARNING: ThreadSanitizer:
diff --git a/compiler-rt/test/tsan/signal_sync.cc b/compiler-rt/test/tsan/signal_sync.cc
--- a/compiler-rt/test/tsan/signal_sync.cc
+++ b/compiler-rt/test/tsan/signal_sync.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 // UNSUPPORTED: darwin
 #include "test.h"
 #include <signal.h>
@@ -51,6 +51,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: DONE
-// CHECK-NOT: WARNING: ThreadSanitizer:
diff --git a/compiler-rt/test/tsan/signal_sync2.cc b/compiler-rt/test/tsan/signal_sync2.cc
--- a/compiler-rt/test/tsan/signal_sync2.cc
+++ b/compiler-rt/test/tsan/signal_sync2.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 // UNSUPPORTED: darwin
 #include <pthread.h>
 #include <stdio.h>
@@ -73,5 +73,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/signal_thread.cc b/compiler-rt/test/tsan/signal_thread.cc
--- a/compiler-rt/test/tsan/signal_thread.cc
+++ b/compiler-rt/test/tsan/signal_thread.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 // UNSUPPORTED: darwin
 #include <pthread.h>
 #include <stdio.h>
@@ -48,6 +48,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: DONE
-// CHECK-NOT: WARNING: ThreadSanitizer:
diff --git a/compiler-rt/test/tsan/signal_write.cc b/compiler-rt/test/tsan/signal_write.cc
--- a/compiler-rt/test/tsan/signal_write.cc
+++ b/compiler-rt/test/tsan/signal_write.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>
@@ -21,7 +21,6 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: HELLO FROM SIGNAL
 // CHECK: DONE
 
diff --git a/compiler-rt/test/tsan/stack_sync_reuse.cc b/compiler-rt/test/tsan/stack_sync_reuse.cc
--- a/compiler-rt/test/tsan/stack_sync_reuse.cc
+++ b/compiler-rt/test/tsan/stack_sync_reuse.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 // Test case https://github.com/google/sanitizers/issues/494
diff --git a/compiler-rt/test/tsan/static_init1.cc b/compiler-rt/test/tsan/static_init1.cc
--- a/compiler-rt/test/tsan/static_init1.cc
+++ b/compiler-rt/test/tsan/static_init1.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/compiler-rt/test/tsan/static_init2.cc b/compiler-rt/test/tsan/static_init2.cc
--- a/compiler-rt/test/tsan/static_init2.cc
+++ b/compiler-rt/test/tsan/static_init2.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/compiler-rt/test/tsan/static_init4.cc b/compiler-rt/test/tsan/static_init4.cc
--- a/compiler-rt/test/tsan/static_init4.cc
+++ b/compiler-rt/test/tsan/static_init4.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/compiler-rt/test/tsan/static_init5.cc b/compiler-rt/test/tsan/static_init5.cc
--- a/compiler-rt/test/tsan/static_init5.cc
+++ b/compiler-rt/test/tsan/static_init5.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/compiler-rt/test/tsan/static_init6.cc b/compiler-rt/test/tsan/static_init6.cc
--- a/compiler-rt/test/tsan/static_init6.cc
+++ b/compiler-rt/test/tsan/static_init6.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/compiler-rt/test/tsan/suppressions_global.cc b/compiler-rt/test/tsan/suppressions_global.cc
--- a/compiler-rt/test/tsan/suppressions_global.cc
+++ b/compiler-rt/test/tsan/suppressions_global.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdio.h>
 
@@ -25,5 +25,4 @@
 }
 
 // CHECK-NOT: failed to open suppressions file
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 
diff --git a/compiler-rt/test/tsan/suppressions_mutex.cc b/compiler-rt/test/tsan/suppressions_mutex.cc
--- a/compiler-rt/test/tsan/suppressions_mutex.cc
+++ b/compiler-rt/test/tsan/suppressions_mutex.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 void __attribute__((noinline)) suppress_this(pthread_mutex_t *mu) {
@@ -15,5 +15,4 @@
 }
 
 // CHECK-NOT: failed to open suppressions file
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/suppressions_race.cc b/compiler-rt/test/tsan/suppressions_race.cc
--- a/compiler-rt/test/tsan/suppressions_race.cc
+++ b/compiler-rt/test/tsan/suppressions_race.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 int Global;
@@ -27,5 +27,4 @@
 }
 
 // CHECK-NOT: failed to open suppressions file
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 
diff --git a/compiler-rt/test/tsan/suppressions_race2.cc b/compiler-rt/test/tsan/suppressions_race2.cc
--- a/compiler-rt/test/tsan/suppressions_race2.cc
+++ b/compiler-rt/test/tsan/suppressions_race2.cc
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %env_tsan_opts=suppressions='%s.supp' %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 int Global;
@@ -27,5 +27,4 @@
 }
 
 // CHECK-NOT: failed to open suppressions file
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 
diff --git a/compiler-rt/test/tsan/thread_detach.c b/compiler-rt/test/tsan/thread_detach.c
--- a/compiler-rt/test/tsan/thread_detach.c
+++ b/compiler-rt/test/tsan/thread_detach.c
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 void *Thread(void *x) {
@@ -16,5 +16,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: thread leak
 // CHECK: PASS
diff --git a/compiler-rt/test/tsan/thread_detach2.c b/compiler-rt/test/tsan/thread_detach2.c
--- a/compiler-rt/test/tsan/thread_detach2.c
+++ b/compiler-rt/test/tsan/thread_detach2.c
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 // Test for https://llvm.org/bugs/show_bug.cgi?id=23235
@@ -24,5 +24,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: PASS
diff --git a/compiler-rt/test/tsan/thread_exit.c b/compiler-rt/test/tsan/thread_exit.c
--- a/compiler-rt/test/tsan/thread_exit.c
+++ b/compiler-rt/test/tsan/thread_exit.c
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 
 // Crashes on powerpc64be
 // UNSUPPORTED: powerpc64
@@ -25,5 +25,4 @@
   return 0;
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: PASS
diff --git a/compiler-rt/test/tsan/thread_leak.c b/compiler-rt/test/tsan/thread_leak.c
--- a/compiler-rt/test/tsan/thread_leak.c
+++ b/compiler-rt/test/tsan/thread_leak.c
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdio.h>
 
diff --git a/compiler-rt/test/tsan/thread_leak2.c b/compiler-rt/test/tsan/thread_leak2.c
--- a/compiler-rt/test/tsan/thread_leak2.c
+++ b/compiler-rt/test/tsan/thread_leak2.c
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdio.h>
 
diff --git a/compiler-rt/test/tsan/thread_leak4.c b/compiler-rt/test/tsan/thread_leak4.c
--- a/compiler-rt/test/tsan/thread_leak4.c
+++ b/compiler-rt/test/tsan/thread_leak4.c
@@ -1,4 +1,4 @@
-// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include "test.h"
 
 void *Thread(void *x) {
@@ -14,5 +14,4 @@
 }
 
 // CHECK: DONE
-// CHECK-NOT: WARNING: ThreadSanitizer: thread leak
 
diff --git a/compiler-rt/test/tsan/tsan-vs-gvn.cc b/compiler-rt/test/tsan/tsan-vs-gvn.cc
--- a/compiler-rt/test/tsan/tsan-vs-gvn.cc
+++ b/compiler-rt/test/tsan/tsan-vs-gvn.cc
@@ -1,6 +1,6 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_tsan -O2 %s -o %t && %run %t 2>&1 | FileCheck %s
-// RUN: %clangxx_tsan -O3 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
+// RUN: %clangxx_tsan -O2 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
+// RUN: %clangxx_tsan -O3 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 //
 // Check that load widening is not tsan-hostile.
 #include <pthread.h>
@@ -34,5 +34,4 @@
   fprintf(stderr, "PASS\n");
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK: PASS
diff --git a/compiler-rt/test/tsan/unaligned_norace.cc b/compiler-rt/test/tsan/unaligned_norace.cc
--- a/compiler-rt/test/tsan/unaligned_norace.cc
+++ b/compiler-rt/test/tsan/unaligned_norace.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -80,5 +80,4 @@
   fprintf(stderr, "OK\n");
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer:
 // CHECK: OK
diff --git a/compiler-rt/test/tsan/vfork.cc b/compiler-rt/test/tsan/vfork.cc
--- a/compiler-rt/test/tsan/vfork.cc
+++ b/compiler-rt/test/tsan/vfork.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,6 +46,5 @@
   fprintf(stderr, "DONE\n");
 }
 
-// CHECK-NOT: WARNING: ThreadSanitizer: data race
 // CHECK-NOT: FAIL to vfork
 // CHECK: DONE
diff --git a/compiler-rt/test/tsan/vptr_benign_race.cc b/compiler-rt/test/tsan/vptr_benign_race.cc
--- a/compiler-rt/test/tsan/vptr_benign_race.cc
+++ b/compiler-rt/test/tsan/vptr_benign_race.cc
@@ -1,4 +1,4 @@
-// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
+// RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s --implicit-check-not='ThreadSanitizer'
 #include <pthread.h>
 #include <stdio.h>
 
@@ -56,4 +56,3 @@
   fprintf(stderr, "PASS\n");
 }
 // CHECK: PASS
-// CHECK-NOT: WARNING: ThreadSanitizer: data race