diff --git a/compiler-rt/test/tsan/libdispatch/dispatch_main.c b/compiler-rt/test/tsan/libdispatch/dispatch_main.c
index 43b0d08cc30b..9e4a3ea42add 100644
--- a/compiler-rt/test/tsan/libdispatch/dispatch_main.c
+++ b/compiler-rt/test/tsan/libdispatch/dispatch_main.c
@@ -2,7 +2,7 @@
 // quits the main thread.
 
 // 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>
 
@@ -36,6 +36,5 @@ int main() {
 }
 
 // CHECK: Hello world
+// CHECK: 123
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
-// CHECK-NOT: CHECK failed
diff --git a/compiler-rt/test/tsan/libdispatch/groups-destructor.cc b/compiler-rt/test/tsan/libdispatch/groups-destructor.cc
index 100f6fc7cd4b..a551af63a46b 100644
--- a/compiler-rt/test/tsan/libdispatch/groups-destructor.cc
+++ b/compiler-rt/test/tsan/libdispatch/groups-destructor.cc
@@ -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 <dispatch/dispatch.h>
 
@@ -39,5 +39,4 @@ int main(int argc, const char *argv[]) {
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/libdispatch/groups-leave.c b/compiler-rt/test/tsan/libdispatch/groups-leave.c
index 0e487870a05e..f63d6e5f57fb 100644
--- a/compiler-rt/test/tsan/libdispatch/groups-leave.c
+++ b/compiler-rt/test/tsan/libdispatch/groups-leave.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>
 
@@ -52,5 +52,4 @@ int main() {
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.
diff --git a/compiler-rt/test/tsan/libdispatch/groups-stress.c b/compiler-rt/test/tsan/libdispatch/groups-stress.c
index 0fdaac05037c..0f24ff7c954e 100644
--- a/compiler-rt/test/tsan/libdispatch/groups-stress.c
+++ b/compiler-rt/test/tsan/libdispatch/groups-stress.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>
 
@@ -41,5 +41,3 @@ int main() {
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
-// CHECK-NOT: CHECK failed
diff --git a/compiler-rt/test/tsan/libdispatch/once.c b/compiler-rt/test/tsan/libdispatch/once.c
index 00227b88e905..d473b34269d0 100644
--- a/compiler-rt/test/tsan/libdispatch/once.c
+++ b/compiler-rt/test/tsan/libdispatch/once.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>
 
@@ -52,4 +52,3 @@ int main() {
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/libdispatch/semaphore-norace.c b/compiler-rt/test/tsan/libdispatch/semaphore-norace.c
index ce94a3cbf259..36e03dce80a9 100644
--- a/compiler-rt/test/tsan/libdispatch/semaphore-norace.c
+++ b/compiler-rt/test/tsan/libdispatch/semaphore-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>
 
@@ -28,4 +28,3 @@ int main() {
 
 // CHECK: Hello world.
 // CHECK: Done.
-// CHECK-NOT: WARNING: ThreadSanitizer
diff --git a/compiler-rt/test/tsan/libdispatch/suspend.c b/compiler-rt/test/tsan/libdispatch/suspend.c
index 5566faf0ca74..617ad917e2a6 100644
--- a/compiler-rt/test/tsan/libdispatch/suspend.c
+++ b/compiler-rt/test/tsan/libdispatch/suspend.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>
 
@@ -43,5 +43,4 @@ int main(int argc, const char *argv[]) {
 }
 
 // CHECK: Hello world.
-// CHECK-NOT: WARNING: ThreadSanitizer
 // CHECK: Done.