diff --git a/polly/test/CodeGen/OpenMP/single_loop.ll b/polly/test/CodeGen/OpenMP/single_loop.ll
index e5aee840ade74..da27f62fd4f4c 100644
--- a/polly/test/CodeGen/OpenMP/single_loop.ll
+++ b/polly/test/CodeGen/OpenMP/single_loop.ll
@@ -86,7 +86,7 @@
 ; IR-STRIDE4:   call void @GOMP_parallel_loop_runtime_start(ptr @single_parallel_loop_polly_subfn, ptr %polly.par.userContext, i32 0, i64 0, i64 1024, i64 4)
 ; IR-STRIDE4:  add nsw i64 %polly.indvar, 3
 ; IR-STRIDE4:  %polly.indvar_next = add nsw i64 %polly.indvar, 4
-; IR-STRIDE4   %polly.adjust_ub = sub i64 %polly.par.UBAdjusted, 4
+; IR-STRIDE4:  %polly.adjust_ub = sub i64 %polly.par.UBAdjusted, 4
 
 ; LIBOMP-IR-STATIC-CHUNKED: %struct.ident_t = type { i32, i32, i32, i32, ptr }
 
diff --git a/polly/test/CodeGen/conflict-between-loop-invariant-code-hosting-and-escape-map-computation.ll b/polly/test/CodeGen/conflict-between-loop-invariant-code-hosting-and-escape-map-computation.ll
index 5dba93373b70b..9fccf52725c2d 100644
--- a/polly/test/CodeGen/conflict-between-loop-invariant-code-hosting-and-escape-map-computation.ll
+++ b/polly/test/CodeGen/conflict-between-loop-invariant-code-hosting-and-escape-map-computation.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadNPMPolly -polly-process-unprofitable -passes=polly-codegen -disable-output < %s
+; RUN: opt %loadNPMPolly -polly-process-unprofitable -passes=polly-codegen -S < %s | FileCheck %s
 ;
 ; CHECK: store i32 %tmp14_p_scalar_, ptr %tmp14.s2a
 ; CHECK: %tmp14.final_reload = load i32, ptr %tmp14.s2a
diff --git a/polly/test/CodeGen/entry_with_trivial_phi.ll b/polly/test/CodeGen/entry_with_trivial_phi.ll
index f2c9da04d6495..0b49a9c5ebade 100644
--- a/polly/test/CodeGen/entry_with_trivial_phi.ll
+++ b/polly/test/CodeGen/entry_with_trivial_phi.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadNPMPolly -passes=polly-codegen -S < %s
+; RUN: opt %loadNPMPolly -passes=polly-codegen -S < %s | FileCheck %s
 ;
 ; The entry of this scop's simple region (entry.split => for.end) has an trivial
 ; PHI node. LCSSA may create such PHI nodes. This is a breakdown of this case in
@@ -11,10 +11,10 @@ entry:
   br label %entry.split
 
 ; CHECK-LABEL: %polly.split_new_and_old
-; CHECK-NEXT:    store float %a, ptr %b.phiops
+; CHECK-NEXT:    store float %a, ptr %b.phiops, align 4
 
 ; CHECK-LABEL: polly.stmt.entry.split
-; CHECK-NEXT:    %b.phiops.reload = load float, ptr %b.phiops
+; CHECK-NEXT:    %b.phiops.reload = load float, ptr %b.phiops, align 4
 
 entry.split:
   %b = phi float [ %a, %entry ]
diff --git a/polly/test/CodeGen/inner_scev_sdiv_1.ll b/polly/test/CodeGen/inner_scev_sdiv_1.ll
index d210105c46baf..f15ee610cc631 100644
--- a/polly/test/CodeGen/inner_scev_sdiv_1.ll
+++ b/polly/test/CodeGen/inner_scev_sdiv_1.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadNPMPolly -S -passes=polly-codegen < %s
+; RUN: opt %loadNPMPolly -S -passes=polly-codegen < %s | FileCheck %s
 ;
 ; Excerpt from the test-suite's oggenc reduced using bugpoint.
 ;
diff --git a/polly/test/CodeGen/multidim_alias_check.ll b/polly/test/CodeGen/multidim_alias_check.ll
index 93e34e2fd0fc1..f82cc90b06a36 100644
--- a/polly/test/CodeGen/multidim_alias_check.ll
+++ b/polly/test/CodeGen/multidim_alias_check.ll
@@ -1,4 +1,4 @@
-; RUN: opt %loadNPMPolly -passes=polly-codegen < %s
+; RUN: opt %loadNPMPolly -S -passes=polly-codegen < %s | FileCheck %s
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 
 ; CHECK: %polly.access.sext.A = sext i32 %n to i64
diff --git a/polly/test/CodeGen/phi_loop_carried_float_escape.ll b/polly/test/CodeGen/phi_loop_carried_float_escape.ll
index 9fd8ad413128a..05aed6b4ccf6c 100644
--- a/polly/test/CodeGen/phi_loop_carried_float_escape.ll
+++ b/polly/test/CodeGen/phi_loop_carried_float_escape.ll
@@ -25,7 +25,7 @@
 
 ; CHECK-LABEL: polly.stmt.bb1{{[0-9]*}}:
 ; CHECK-NEXT:    %tmp.0.phiops.reload[[R1:[0-9]*]] = load float, ptr %tmp.0.phiops
-; CHECK-:        store float %tmp.0.phiops.reload[[R1]], ptr %tmp.0.s2a
+; CHECK:         store float %tmp.0.phiops.reload[[R1]], ptr %tmp.0.s2a
 
 ; CHECK-LABEL: polly.stmt.bb4:
 ; CHECK:         %tmp.0.s2a.reload[[R3:[0-9]*]] = load float, ptr %tmp.0.s2a
diff --git a/polly/test/CodeGen/scalar-references-used-in-scop-compute.ll b/polly/test/CodeGen/scalar-references-used-in-scop-compute.ll
index 0b49da0d0e091..77306c1046133 100644
--- a/polly/test/CodeGen/scalar-references-used-in-scop-compute.ll
+++ b/polly/test/CodeGen/scalar-references-used-in-scop-compute.ll
@@ -3,7 +3,7 @@
 ; Test the code generation in the presence of a scalar out-of-scop value being
 ; used from within the SCoP.
 
-; CHECH-LABEL: @scalar-function-argument
+; CHECK-LABEL: @scalar-function-argument
 ; CHECK: polly.split_new_and_old
 
 
@@ -26,7 +26,7 @@ for.end:
   ret void
 }
 
-; CHECH-LABEL: @scalar-outside-of-scop
+; CHECK-LABEL: @scalar-outside-of-scop
 ; CHECK: polly.split_new_and_old
 
 define void @scalar-outside-of-scop(ptr %A) {
diff --git a/polly/test/ScheduleOptimizer/ManualOptimization/unroll_double.ll b/polly/test/ScheduleOptimizer/ManualOptimization/unroll_double.ll
index cccf136a1c4ac..e228d4a53779d 100644
--- a/polly/test/ScheduleOptimizer/ManualOptimization/unroll_double.ll
+++ b/polly/test/ScheduleOptimizer/ManualOptimization/unroll_double.ll
@@ -39,23 +39,23 @@ return:
 
 ; CHECK-LABEL: Printing analysis 'Polly - Optimize schedule of SCoP' for region: 'for => return' in function 'func':
 ; CHECK: domain: "{ Stmt_body[i0] : 0 <= i0 <= 11 }"
-; CHECK    sequence:
+; CHECK:    sequence:
 ; CHECK:   - filter: "{ Stmt_body[i0] : 0 <= i0 <= 3 }"
-; CHECK        sequence:
+; CHECK:        sequence:
 ; CHECK:       - filter: "{ Stmt_body[0] }"
 ; CHECK:       - filter: "{ Stmt_body[i0] : (-1 + i0) mod 4 = 0 }"
 ; CHECK:       - filter: "{ Stmt_body[i0] : (2 + i0) mod 4 = 0 }"
 ; CHECK:       - filter: "{ Stmt_body[i0] : (1 + i0) mod 4 = 0 }"
-; CHECK    sequence:
-; CHECK:   - filter: "{ Stmt_body[i0] : 4 <= i0 <= 7 }"
-; CHECK        sequence:
+; CHECK:       - filter: "{ Stmt_body[i0] : 4 <= i0 <= 7 }"
+; CHECK:    sequence:
+; CHECK:        sequence:
 ; CHECK:       - filter: "{ Stmt_body[4] }"
 ; CHECK:       - filter: "{ Stmt_body[i0] : (-1 + i0) mod 4 = 0 }"
 ; CHECK:       - filter: "{ Stmt_body[i0] : (2 + i0) mod 4 = 0 }"
 ; CHECK:       - filter: "{ Stmt_body[i0] : (1 + i0) mod 4 = 0 }"
-; CHECK    sequence:
-; CHECK:   - filter: "{ Stmt_body[i0] : 8 <= i0 <= 11 }"
-; CHECK        sequence:
+; CHECK:       - filter: "{ Stmt_body[i0] : 8 <= i0 <= 11 }"
+; CHECK:    sequence:
+; CHECK:        sequence:
 ; CHECK:       - filter: "{ Stmt_body[8] }"
 ; CHECK:       - filter: "{ Stmt_body[i0] : (-1 + i0) mod 4 = 0 }"
 ; CHECK:       - filter: "{ Stmt_body[i0] : (2 + i0) mod 4 = 0 }"
diff --git a/polly/test/ScopInfo/aliasing_multiple_alias_groups.ll b/polly/test/ScopInfo/aliasing_multiple_alias_groups.ll
index 9943802ec8595..6cb445360a1bc 100644
--- a/polly/test/ScopInfo/aliasing_multiple_alias_groups.ll
+++ b/polly/test/ScopInfo/aliasing_multiple_alias_groups.ll
@@ -60,4 +60,4 @@ for.end:                                          ; preds = %for.body
 ; TBAA-NEXT: {{\[\[}}
 ; TBAA-DAG:      <{ MemRef_Float0[(0)] }, { MemRef_Float0[(1024)] }>
 ; TBAA-DAG:      <{ MemRef_Float1[(0)] }, { MemRef_Float1[(1024)] }>
-; TBBA:      {{\]\]}}
+; TBAA:      {{\]\]}}
diff --git a/polly/test/ScopInfo/constant_start_integer.ll b/polly/test/ScopInfo/constant_start_integer.ll
index 8991f8250f0b7..ec79afa756afb 100644
--- a/polly/test/ScopInfo/constant_start_integer.ll
+++ b/polly/test/ScopInfo/constant_start_integer.ll
@@ -11,7 +11,7 @@ target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f3
 ;   }
 ; }
 
-; CHECK  p0: {0,+,256}<%for.cond1.preheader>
+; CHECK: p0: {0,+,256}<%for.cond1.preheader>
 ; CHECK-NOT: p1
 
 ; CHECK: ReadAccess