Index: clang/test/Analysis/cfg-rich-constructors.cpp
===================================================================
--- clang/test/Analysis/cfg-rich-constructors.cpp
+++ clang/test/Analysis/cfg-rich-constructors.cpp
@@ -459,7 +459,7 @@
 // TODO: Should provide construction context for the constructor,
 // even if there is no specific trigger statement here.
 // CHECK: void simpleTemporary()
-// CHECK           1: C() (CXXConstructExpr, class C)
+// CHECK:          1: C() (CXXConstructExpr, class C)
 void simpleTemporary() {
   C();
 }
Index: clang/test/CodeGenCXX/noescape.cpp
===================================================================
--- clang/test/CodeGenCXX/noescape.cpp
+++ clang/test/CodeGenCXX/noescape.cpp
@@ -45,7 +45,7 @@
 }
 
 // CHECK-LABEL: define i8* @_Z5test1Pv(
-// CHECK : %call = call {{.*}} @_ZnwmPv({{.*}}, {{.*}} nocapture {{.*}})
+// CHECK: %call = call {{.*}} @_ZnwmPv({{.*}}, {{.*}} nocapture {{.*}})
 void *test1(void *p0) {
   return ::operator new(16, p0);
 }
Index: clang/test/CodeGenObjC/externally-retained.m
===================================================================
--- clang/test/CodeGenObjC/externally-retained.m
+++ clang/test/CodeGenObjC/externally-retained.m
@@ -22,7 +22,7 @@
 void param(ObjTy *p) EXT_RET {
   // CHECK-LABEL: define void @param
   // CHECK-NOT: llvm.objc.
-  // CHECK ret
+  // CHECK: ret
 }
 
 void local() {
Index: clang/test/CodeGenOpenCLCXX/addrspace-operators.cl
===================================================================
--- clang/test/CodeGenOpenCLCXX/addrspace-operators.cl
+++ clang/test/CodeGenOpenCLCXX/addrspace-operators.cl
@@ -46,7 +46,7 @@
 //CHECK: %me = getelementptr inbounds %class.C, %class.C addrspace(4)* %this1, i32 0, i32 0
 //CHECK: store i32 [[E]], i32 addrspace(4)* %me
 
-//CHECK define linkonce_odr void @_ZNU3AS41C8OrAssignE1E(%class.C addrspace(4)* %this, i32 %e)
+//CHECK: define linkonce_odr void @_ZNU3AS41C8OrAssignE1E(%class.C addrspace(4)* %this, i32 %e)
 //CHECK: [[E:%[0-9]+]] = load i32, i32* %e.addr
 //CHECK: %mi = getelementptr inbounds %class.C, %class.C addrspace(4)* %this1, i32 0, i32 1
 //CHECK: [[MI:%[0-9]+]] = load i32, i32 addrspace(4)* %mi