diff --git a/flang/test/Driver/config-file.f90 b/flang/test/Driver/config-file.f90
index 6991fda9bd483..2ad9b71d01613 100644
--- a/flang/test/Driver/config-file.f90
+++ b/flang/test/Driver/config-file.f90
@@ -77,13 +77,13 @@
 ! CHECK-LINKING-LIBOMP-GOES-AFTER: "--as-needed" "{{.*}}-{{.*}}.o" "-lmylib" "foo.a" "-lm" "-Bstatic" "-lhappy" "-Bdynamic" {{.*}}"-lomp"
 ! CHECK-NOLINKING: Configuration file: {{.*}}Inputs{{.}}config-l.cfg
 ! CHECK-NOLINKING: "-ffast-math"
-! CHECK-NOLINKING-NO: "-lm" "-Bstatic" "-lhappy" "-Bdynamic"
+! CHECK-NOLINKING-NOT: "-lm" "-Bstatic" "-lhappy" "-Bdynamic"
 ! CHECK-NOLINKING-OPENMP: Configuration file: {{.*}}Inputs{{.}}config-l.cfg
 ! CHECK-NOLINKING-OPENMP: "-ffast-math" {{.*}}"-fopenmp"
-! CHECK-NOLINKING-OPENMP-NO: "-lm" "-Bstatic" "-lhappy" "-Bdynamic" {{.}}"-lomp"
+! CHECK-NOLINKING-OPENMP-NOT: "-lm" "-Bstatic" "-lhappy" "-Bdynamic" {{.}}"-lomp"
 ! CHECK-LINKING-MSVC: Configuration file: {{.*}}Inputs{{.}}config-l.cfg
 ! CHECK-LINKING-MSVC: "-ffast-math"
 ! CHECK-LINKING-MSVC: "--as-needed" "{{.*}}-{{.*}}.o" "mylib.lib" "foo.lib" "m.lib" "-Bstatic" "happy.lib" "-Bdynamic"
 ! CHECK-NOLINKING-MSVC: Configuration file: {{.*}}Inputs{{.}}config-l.cfg
 ! CHECK-NOLINKING-MSVC: "-ffast-math"
-! CHECK-NOLINKING-MSVC-NO: "m.lib" "-Bstatic" "happy.lib" "-Bdynamic"
+! CHECK-NOLINKING-MSVC-NOT: "m.lib" "-Bstatic" "happy.lib" "-Bdynamic"
diff --git a/flang/test/Lower/CUDA/cuda-data-transfer.cuf b/flang/test/Lower/CUDA/cuda-data-transfer.cuf
index cbddcd79c6333..1c03a76cae76a 100644
--- a/flang/test/Lower/CUDA/cuda-data-transfer.cuf
+++ b/flang/test/Lower/CUDA/cuda-data-transfer.cuf
@@ -393,4 +393,4 @@ end subroutine
 ! CHECK: %[[ALLOC_TMP:.*]] = fir.allocmem !fir.array<10xi32> {bindc_name = ".tmp", uniq_name = ""}
 ! CHECK: %[[TMP:.*]]:2 = hlfir.declare %[[ALLOC_TMP]](%{{.*}}) {uniq_name = ".tmp"} : (!fir.heap<!fir.array<10xi32>>, !fir.shape<1>) -> (!fir.heap<!fir.array<10xi32>>, !fir.heap<!fir.array<10xi32>>)
 ! CHECK: cuf.data_transfer %[[ADEV_DECL]]#1 to %[[TMP]]#0 {transfer_kind = #cuf.cuda_transfer<device_host>} : !fir.ref<!fir.array<10xi32>>, !fir.heap<!fir.array<10xi32>>
-! CHECL: hlfir.assign 
+! CHECK: hlfir.assign
diff --git a/flang/test/Lower/HLFIR/type-info-components.f90 b/flang/test/Lower/HLFIR/type-info-components.f90
index ee36f9cf6588f..9faf35656166e 100644
--- a/flang/test/Lower/HLFIR/type-info-components.f90
+++ b/flang/test/Lower/HLFIR/type-info-components.f90
@@ -17,7 +17,7 @@ subroutine test_1(x)
   type(sometype) :: x
 end subroutine
 ! CHECK-LABEL:   fir.type_info @_QFtest_1Tsometype
-! CHECK-SAME     component_info {
+! CHECK-SAME:    component_info {
 ! CHECK:           fir.dt_component "i" lbs [-1] init @_QFtest_1E.di.sometype.i
 ! CHECK-NOT:       fir.dt_component "j"
 ! CHECK:           fir.dt_component "p" init @_QFtest_1E.di.sometype.p
@@ -35,7 +35,7 @@ subroutine test_nesting(x)
   type(sometype2) :: x
 end subroutine
 ! CHECK-LABEL:   fir.type_info @_QFtest_nestingTsome_sub_type
-! CHECK-SAME     component_info {
+! CHECK-SAME:    component_info {
 ! CHECK:           fir.dt_component "i" init @_QFtest_nestingE.di.some_sub_type.i
 ! CHECK:         }
 
@@ -50,6 +50,6 @@ subroutine data_like(x)
   type(sometype3) :: x
 end subroutine
 ! CHECK-LABEL:   fir.type_info @_QFdata_likeTsometype3
-! CHECK-SAME     component_info {
+! CHECK-SAME:    component_info {
 ! CHECK:           fir.dt_component "i" init @_QFdata_likeE.di.sometype3.i
 ! CHECK:         }
diff --git a/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-multiple-variables.f90 b/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-multiple-variables.f90
index 5d31de10d74f8..0b0d0e7ae3735 100644
--- a/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-multiple-variables.f90
+++ b/flang/test/Lower/OpenMP/DelayedPrivatization/target-private-multiple-variables.f90
@@ -148,9 +148,9 @@ end subroutine target_allocatable
 ! CHECK-SAME:     map_entries(
 ! CHECK-SAME:       %[[MAPPED_MI0]] -> %[[MAPPED_ARG0:[^,]+]],
 ! CHECK-SAME:       %[[ALLOC_VAR_MAP]] -> %[[MAPPED_ARG1:[^,]+]]
-! CHECK-SAME        %[[REAL_ARR_DESC_MAP]] -> %[[MAPPED_ARG2:[^,]+]]
-! CHECK_SAME        %[[CHAR_VAR_DESC_MAP]] -> %[[MAPPED_ARG3:.[^,]+]] :
-! CHECK-SAME        !fir.ref<i32>, !fir.ref<!fir.box<!fir.heap<i32>>>, !fir.ref<!fir.box<!fir.array<?xf32>>>, !fir.ref<!fir.boxchar<1>>)
+! CHECK-SAME:       %[[REAL_ARR_DESC_MAP]] -> %[[MAPPED_ARG2:[^,]+]]
+! CHECK-SAME:       %[[CHAR_VAR_DESC_MAP]] -> %[[MAPPED_ARG3:.[^,]+]] :
+! CHECK-SAME:       !fir.ref<i32>, !fir.ref<!fir.box<!fir.heap<i32>>>, !fir.ref<!fir.box<!fir.array<?xf32>>>, !fir.ref<!fir.boxchar<1>>)
 ! CHECK-SAME:     private(
 ! CHECK-SAME:       @[[ALLOC_PRIVATIZER_SYM]] %{{[^[:space:]]+}}#0 -> %[[ALLOC_ARG:[^,]+]] [map_idx=1],
 ! CHECK-SAME:       @[[REAL_PRIVATIZER_SYM]] %{{[^[:space:]]+}}#0 -> %[[REAL_ARG:[^,]+]],
diff --git a/flang/test/Lower/OpenMP/copyprivate2.f90 b/flang/test/Lower/OpenMP/copyprivate2.f90
index 3412ba2c63c4d..993a81d199f56 100644
--- a/flang/test/Lower/OpenMP/copyprivate2.f90
+++ b/flang/test/Lower/OpenMP/copyprivate2.f90
@@ -43,7 +43,7 @@
 !CHECK:           omp.single copyprivate(
 !CHECK-SAME:        %[[A]]#0 -> @_copy_box_heap_Uxi32 : !fir.ref<!fir.box<!fir.heap<!fir.array<?xi32>>>>,
 !CHECK-SAME:        %[[P]]#0 -> @_copy_box_ptr_i32 : !fir.ref<!fir.box<!fir.ptr<i32>>>)
-!CHEK:          }
+!CHECK:         }
 subroutine test_alloc_ptr()
   integer, allocatable :: a(:)
   integer, pointer :: p
diff --git a/flang/test/Lower/OpenMP/wsloop-reduction-mul-byref.f90 b/flang/test/Lower/OpenMP/wsloop-reduction-mul-byref.f90
index 18554fbb72aee..9e445defe15ba 100644
--- a/flang/test/Lower/OpenMP/wsloop-reduction-mul-byref.f90
+++ b/flang/test/Lower/OpenMP/wsloop-reduction-mul-byref.f90
@@ -27,7 +27,7 @@
 ! CHECK-SAME:    alloc {
 ! CHECK:           %[[REF:.*]] = fir.alloca i64
 ! CHECK:           omp.yield(%[[REF]] : !fir.ref<i64>)
-! CHECK-LABE:    } init {
+! CHECK-LABEL:   } init {
 ! CHECK:         ^bb0(%[[VAL_0:.*]]: !fir.ref<i64>, %[[ALLOC:.*]]: !fir.ref<i64>):
 ! CHECK:           %[[VAL_1:.*]] = arith.constant 1 : i64
 ! CHECK:           fir.store %[[VAL_1]] to %[[ALLOC]] : !fir.ref<i64>