diff --git a/compiler-rt/test/profile/instrprof-value-prof-2.c b/compiler-rt/test/profile/instrprof-value-prof-2.c
index a5939fe5c53c..88a2de039979 100644
--- a/compiler-rt/test/profile/instrprof-value-prof-2.c
+++ b/compiler-rt/test/profile/instrprof-value-prof-2.c
@@ -72,6 +72,7 @@ int main(int argc, const char *argv[]) {
   }
 }
 
+// CHECK:         Counters:
 // CHECK-1-LABEL:   caller_with_value_site_never_called2:
 // CHECK-1-NEXT:    Hash: 0x0000000000000000
 // CHECK-1-NEXT:    Counters:
diff --git a/compiler-rt/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-constants.cpp b/compiler-rt/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-constants.cpp
index 2c3c156592be..971553cdc312 100644
--- a/compiler-rt/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-constants.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-constants.cpp
@@ -16,6 +16,7 @@ int main(int argc, char *argv[]) {
   base = (char *)0;
   result = base + 0;
   // CHECK-C: {{.*}}.cpp:[[@LINE-1]]:17: runtime error: applying zero offset to null pointer
+  // CHECK-CPP-NOT: runtime error:
 
   base = (char *)0;
   result = base + 1;
diff --git a/compiler-rt/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-summary.cpp b/compiler-rt/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-summary.cpp
index 1f819747202d..2fca1264855d 100644
--- a/compiler-rt/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-summary.cpp
+++ b/compiler-rt/test/ubsan/TestCases/Pointer/nullptr-and-nonzero-offset-summary.cpp
@@ -17,6 +17,8 @@ int main(int argc, char *argv[]) {
   result = base + 0;
   // CHECK-NOTYPE-C: SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior {{.*}}summary.cpp:[[@LINE-1]]:17
   // CHECK-TYPE-C: SUMMARY: UndefinedBehaviorSanitizer: nullptr-with-offset {{.*}}summary.cpp:[[@LINE-2]]:17
+  // CHECK-NOTYPE-CPP-NOT: SUMMARY:
+  // CHECK-TYPE-CPP-NOT: SUMMARY:
 
   base = (char *)0;
   result = base + 1;