diff --git a/tests/ui/never_loop.stderr b/tests/ui/never_loop.stderr
index 1f9df6f9c..e62fe0c29 100644
--- a/tests/ui/never_loop.stderr
+++ b/tests/ui/never_loop.stderr
@@ -24,13 +24,14 @@ error: this loop never actually loops
 error: this loop never actually loops
   --> $DIR/never_loop.rs:47:2
    |
-47 | /  loop { // never loops
+47 |       loop { // never loops
+   |  _____^
 48 | |         while i == 0 { // never loops
 49 | |             break
 50 | |         }
 51 | |         return
-52 | |  }
-   | |__^
+52 | |     }
+   | |_____^
 
 error: this loop never actually loops
   --> $DIR/never_loop.rs:48:9
@@ -43,11 +44,12 @@ error: this loop never actually loops
 error: this loop never actually loops
   --> $DIR/never_loop.rs:59:3
    |
-59 | /   loop { // never loops
+59 |           loop { // never loops
+   |  _________^
 60 | |             if x == 5 { break }
-61 | |    continue 'outer
-62 | |   }
-   | |___^
+61 | |             continue 'outer
+62 | |         }
+   | |_________^
 
 error: this loop never actually loops
   --> $DIR/never_loop.rs:92:5
diff --git a/tests/ui/overflow_check_conditional.stderr b/tests/ui/overflow_check_conditional.stderr
index 9f23e96c0..6efcbfe38 100644
--- a/tests/ui/overflow_check_conditional.stderr
+++ b/tests/ui/overflow_check_conditional.stderr
@@ -1,50 +1,50 @@
 error: You are trying to use classic C overflow conditions that will fail in Rust.
   --> $DIR/overflow_check_conditional.rs:11:5
    |
-11 |  if a + b < a {
-   |     ^^^^^^^^^
+11 |     if a + b < a {
+   |        ^^^^^^^^^
    |
    = note: `-D overflow-check-conditional` implied by `-D warnings`
 
 error: You are trying to use classic C overflow conditions that will fail in Rust.
   --> $DIR/overflow_check_conditional.rs:14:5
    |
-14 |  if a > a + b {
-   |     ^^^^^^^^^
+14 |     if a > a + b {
+   |        ^^^^^^^^^
 
 error: You are trying to use classic C overflow conditions that will fail in Rust.
   --> $DIR/overflow_check_conditional.rs:17:5
    |
-17 |  if a + b < b {
-   |     ^^^^^^^^^
+17 |     if a + b < b {
+   |        ^^^^^^^^^
 
 error: You are trying to use classic C overflow conditions that will fail in Rust.
   --> $DIR/overflow_check_conditional.rs:20:5
    |
-20 |  if b > a + b {
-   |     ^^^^^^^^^
+20 |     if b > a + b {
+   |        ^^^^^^^^^
 
 error: You are trying to use classic C underflow conditions that will fail in Rust.
   --> $DIR/overflow_check_conditional.rs:23:5
    |
-23 |  if a - b > b {
-   |     ^^^^^^^^^
+23 |     if a - b > b {
+   |        ^^^^^^^^^
 
 error: You are trying to use classic C underflow conditions that will fail in Rust.
   --> $DIR/overflow_check_conditional.rs:26:5
    |
-26 |  if b < a - b {
-   |     ^^^^^^^^^
+26 |     if b < a - b {
+   |        ^^^^^^^^^
 
 error: You are trying to use classic C underflow conditions that will fail in Rust.
   --> $DIR/overflow_check_conditional.rs:29:5
    |
-29 |  if a - b > a {
-   |     ^^^^^^^^^
+29 |     if a - b > a {
+   |        ^^^^^^^^^
 
 error: You are trying to use classic C underflow conditions that will fail in Rust.
   --> $DIR/overflow_check_conditional.rs:32:5
    |
-32 |  if a < a - b {
-   |     ^^^^^^^^^
+32 |     if a < a - b {
+   |        ^^^^^^^^^
 
diff --git a/tests/ui/redundant_closure_call.stderr b/tests/ui/redundant_closure_call.stderr
index d8ec72fda..5acc3e9dd 100644
--- a/tests/ui/redundant_closure_call.stderr
+++ b/tests/ui/redundant_closure_call.stderr
@@ -1,32 +1,32 @@
 error: Closure called just once immediately after it was declared
   --> $DIR/redundant_closure_call.rs:15:2
    |
-15 |  i = closure();
-   |  ^^^^^^^^^^^^^
+15 |     i = closure();
+   |     ^^^^^^^^^^^^^
    |
    = note: `-D redundant-closure-call` implied by `-D warnings`
 
 error: Closure called just once immediately after it was declared
   --> $DIR/redundant_closure_call.rs:18:2
    |
-18 |  i = closure(3);
-   |  ^^^^^^^^^^^^^^
+18 |     i = closure(3);
+   |     ^^^^^^^^^^^^^^
 
 error: Try not to call a closure in the expression where it is declared.
  --> $DIR/redundant_closure_call.rs:7:10
   |
-7 |  let a = (|| 42)();
-  |          ^^^^^^^^^ help: Try doing something like: : `42`
+7 |     let a = (|| 42)();
+  |             ^^^^^^^^^ help: Try doing something like: : `42`
 
 error: Try not to call a closure in the expression where it is declared.
   --> $DIR/redundant_closure_call.rs:10:14
    |
-10 |  let mut k = (|m| m+1)(i);
-   |              ^^^^^^^^^^^^
+10 |     let mut k = (|m| m+1)(i);
+   |                 ^^^^^^^^^^^^
 
 error: Try not to call a closure in the expression where it is declared.
   --> $DIR/redundant_closure_call.rs:12:6
    |
-12 |  k = (|a,b| a*b)(1,5);
-   |      ^^^^^^^^^^^^^^^^
+12 |     k = (|a,b| a*b)(1,5);
+   |         ^^^^^^^^^^^^^^^^