diff --git a/clang/test/Driver/unknown-std.S b/clang/test/Driver/unknown-std.S
--- a/clang/test/Driver/unknown-std.S
+++ b/clang/test/Driver/unknown-std.S
@@ -1,2 +1,2 @@
 // RUN: %clang -std=c++11 %s -E -o /dev/null 2>&1 | FileCheck %s --allow-empty
-// CHECK-NOT: error
+// CHECK-NOT: error:
diff --git a/clang/test/Index/allow-editor-placeholders.cpp b/clang/test/Index/allow-editor-placeholders.cpp
--- a/clang/test/Index/allow-editor-placeholders.cpp
+++ b/clang/test/Index/allow-editor-placeholders.cpp
@@ -2,4 +2,4 @@
 
 <#placeholder#>;
 
-// CHECK-NOT: error
+// CHECK-NOT: error:
diff --git a/clang/test/VFS/real-path-found-first.m b/clang/test/VFS/real-path-found-first.m
--- a/clang/test/VFS/real-path-found-first.m
+++ b/clang/test/VFS/real-path-found-first.m
@@ -39,7 +39,7 @@
 // RUN:     -ivfsoverlay %t.yaml -fsyntax-only -Rmodule-include-translation \
 // RUN:     -Werror=non-modular-include-in-framework-module | FileCheck %s
 // CHECK: warning: treating
-// CHECK-NOT: error
+// CHECK-NOT: error:
 
 // With a VFS-mapped module map file
 // RUN: mv %t/SomeFramework.framework/Modules/module.modulemap %t/hide_module.map
diff --git a/clang/test/VFS/vfsroot-include.c b/clang/test/VFS/vfsroot-include.c
--- a/clang/test/VFS/vfsroot-include.c
+++ b/clang/test/VFS/vfsroot-include.c
@@ -13,4 +13,4 @@
 #include "actual_header.h"
 // CHECK: fatal error: 'actual_header.h' file not found
 // CHECK: 1 error generated.
-// CHECK-NOT: error
+// CHECK-NOT: error: