diff --git a/test/Analysis/CostModel/AArch64/cost-scalable-vector-gep.ll b/test/Analysis/CostModel/AArch64/cost-scalable-vector-gep.ll
index 4bc6889e3fd..019aa014836 100644
--- a/test/Analysis/CostModel/AArch64/cost-scalable-vector-gep.ll
+++ b/test/Analysis/CostModel/AArch64/cost-scalable-vector-gep.ll
@@ -6,7 +6,7 @@
 ; warning when performing cost analysis.
 
 ; If this check fails please read test/CodeGen/AArch64/README for instructions on how to resolve it.
-; WARN-NOT: warning: {{.*}}TypeSize is not scalable
+; WARN-NOT: warning:
 
 ; CHECK: Cost Model: Found an estimated cost of 1 for instruction:   %retval = getelementptr
 define <vscale x 16 x i8>* @gep_scalable_vector(<vscale x 16 x i8>* %ptr) {
diff --git a/test/Analysis/LoopAccessAnalysis/gep-induction-operand-typesize-warning.ll b/test/Analysis/LoopAccessAnalysis/gep-induction-operand-typesize-warning.ll
index 7e4e5bacd12..050b09925b4 100644
--- a/test/Analysis/LoopAccessAnalysis/gep-induction-operand-typesize-warning.ll
+++ b/test/Analysis/LoopAccessAnalysis/gep-induction-operand-typesize-warning.ll
@@ -6,7 +6,7 @@
 ; warning in the llvm::getGEPInductionOperand function.
 
 ; If this check fails please read test/CodeGen/AArch64/README for instructions on how to resolve it.
-; WARN-NOT: warning: {{.*}}TypeSize is not scalable
+; WARN-NOT: warning:
 
 define void @get_gep_induction_operand_typesize_warning(i64 %n, <vscale x 4 x i32>* %a) {
 entry:
diff --git a/test/Analysis/LoopAccessAnalysis/runtime-pointer-checking-insert-typesize.ll b/test/Analysis/LoopAccessAnalysis/runtime-pointer-checking-insert-typesize.ll
index d1a980f51c3..e8d25883a6c 100644
--- a/test/Analysis/LoopAccessAnalysis/runtime-pointer-checking-insert-typesize.ll
+++ b/test/Analysis/LoopAccessAnalysis/runtime-pointer-checking-insert-typesize.ll
@@ -7,7 +7,7 @@
 ; this function was previously unaware of scalable types.
 
 ; If this check fails please read test/CodeGen/AArch64/README for instructions on how to resolve it.
-; CHECK-NOT: warning: {{.*}}TypeSize is not scalable
+; CHECK-NOT: warning:
 
 define void @runtime_pointer_checking_insert_typesize(<vscale x 4 x i32>* %a,
                                                       <vscale x 4 x i32>* %b) {
diff --git a/test/CodeGen/AArch64/dag-combine-lifetime-end-store-typesize.ll b/test/CodeGen/AArch64/dag-combine-lifetime-end-store-typesize.ll
index fd5b85a57de..ba8d8cb0a0d 100644
--- a/test/CodeGen/AArch64/dag-combine-lifetime-end-store-typesize.ll
+++ b/test/CodeGen/AArch64/dag-combine-lifetime-end-store-typesize.ll
@@ -5,7 +5,7 @@
 ; node linked to a scalable store.
 
 ; If this check fails please read test/CodeGen/AArch64/README for instructions on how to resolve it.
-; CHECK-NOT: warning: {{.*}}TypeSize is not scalable
+; CHECK-NOT: warning:
 
 declare void @llvm.lifetime.start.p0i8(i64, i8* nocapture)
 declare void @llvm.lifetime.end.p0i8(i64, i8* nocapture)
diff --git a/test/CodeGen/AArch64/sve-redundant-store.ll b/test/CodeGen/AArch64/sve-redundant-store.ll
index 65fd1e22de0..0673272c19b 100644
--- a/test/CodeGen/AArch64/sve-redundant-store.ll
+++ b/test/CodeGen/AArch64/sve-redundant-store.ll
@@ -3,7 +3,7 @@
 ; RUN: FileCheck --check-prefix=WARN --allow-empty %s <%t
 
 ; If this check fails please read test/CodeGen/AArch64/README for instructions on how to resolve it.
-; WARN-NOT: warning: {{.*}}TypeSize is not scalable
+; WARN-NOT: warning:
 
 ; #include <arm_sve.h>
 ; #include <stdint.h>
diff --git a/test/Transforms/InstCombine/gep-can-replace-gep-idx-with-zero-typesize.ll b/test/Transforms/InstCombine/gep-can-replace-gep-idx-with-zero-typesize.ll
index c20128d5fe0..68e840bfe25 100644
--- a/test/Transforms/InstCombine/gep-can-replace-gep-idx-with-zero-typesize.ll
+++ b/test/Transforms/InstCombine/gep-can-replace-gep-idx-with-zero-typesize.ll
@@ -13,7 +13,7 @@
 
 ; If this check fails please read test/CodeGen/AArch64/README for instructions
 ; on how to resolve it.
-; WARN-NOT: warning: {{.*}}TypeSize is not scalable
+; WARN-NOT: warning:
 
 declare void @do_something(<vscale x 4 x i32> %x)
 
diff --git a/test/Transforms/LoopVectorize/AArch64/sve-scalable-load-in-loop.ll b/test/Transforms/LoopVectorize/AArch64/sve-scalable-load-in-loop.ll
index addaa42765c..34264562e71 100644
--- a/test/Transforms/LoopVectorize/AArch64/sve-scalable-load-in-loop.ll
+++ b/test/Transforms/LoopVectorize/AArch64/sve-scalable-load-in-loop.ll
@@ -9,7 +9,7 @@
 ; TypeSize error.
 
 ; If this check fails please read test/CodeGen/AArch64/README for instructions on how to resolve it.
-; WARN-NOT: warning: {{.*}}TypeSize is not scalable
+; WARN-NOT: warning:
 
 ; #include <arm_sve.h>
 ;