diff --git a/src/libsyntax/parse/lexer/tokentrees.rs b/src/libsyntax/parse/lexer/tokentrees.rs
index e2fd7faf90387..e8404adec0f89 100644
--- a/src/libsyntax/parse/lexer/tokentrees.rs
+++ b/src/libsyntax/parse/lexer/tokentrees.rs
@@ -49,7 +49,7 @@ impl<'a> StringReader<'a> {
                 let msg = "this file contains an un-closed delimiter";
                 let mut err = self.sess.span_diagnostic.struct_span_err(self.span, msg);
                 for &(_, sp) in &self.open_braces {
-                    err.span_help(sp, "did you mean to close this delimiter?");
+                    err.span_label(sp, "un-closed delimiter");
                 }
 
                 Err(err)
@@ -94,7 +94,7 @@ impl<'a> StringReader<'a> {
                             // delimiter. The previous unclosed delimiters could actually be
                             // closed! The parser just hasn't gotten to them yet.
                             if let Some(&(_, sp)) = self.open_braces.last() {
-                                err.span_label(sp, "unclosed delimiter");
+                                err.span_label(sp, "un-closed delimiter");
                             };
                             err.emit();
                         }
diff --git a/src/test/ui/issue-10636-1.rs b/src/test/ui/issue-10636-1.rs
index fdd50773593a8..375b951ee1585 100644
--- a/src/test/ui/issue-10636-1.rs
+++ b/src/test/ui/issue-10636-1.rs
@@ -10,7 +10,8 @@
 
 // compile-flags: -Z parse-only
 
-struct Obj { //~ NOTE: unclosed delimiter
+struct Obj {
+    //~^ NOTE: un-closed delimiter
     member: usize
 )
 //~^ ERROR incorrect close delimiter
diff --git a/src/test/ui/issue-10636-1.stderr b/src/test/ui/issue-10636-1.stderr
index af80e259fbd25..49b6d08aff505 100644
--- a/src/test/ui/issue-10636-1.stderr
+++ b/src/test/ui/issue-10636-1.stderr
@@ -1,9 +1,9 @@
 error: incorrect close delimiter: `)`
-  --> $DIR/issue-10636-1.rs:15:1
+  --> $DIR/issue-10636-1.rs:16:1
    |
-LL | struct Obj { //~ NOTE: unclosed delimiter
-   |            - unclosed delimiter
-LL |     member: usize
+LL | struct Obj {
+   |            - un-closed delimiter
+...
 LL | )
    | ^ incorrect close delimiter
 
diff --git a/src/test/ui/parser-recovery-1.rs b/src/test/ui/parser-recovery-1.rs
index 9fb4d6facddab..f51bcb9e70cad 100644
--- a/src/test/ui/parser-recovery-1.rs
+++ b/src/test/ui/parser-recovery-1.rs
@@ -14,11 +14,12 @@
 
 trait Foo {
     fn bar() {
-        let x = foo(); //~ ERROR cannot find function `foo` in this scope
-
+        let x = foo();
+        //~^ ERROR cannot find function `foo` in this scope
 }
 
 fn main() {
-    let x = y.;  //~ ERROR unexpected token
-                 //~^ ERROR cannot find value `y` in this scope
+    let x = y.;
+    //~^ ERROR unexpected token
+    //~| ERROR cannot find value `y` in this scope
 } //~ ERROR this file contains an un-closed delimiter
diff --git a/src/test/ui/parser-recovery-1.stderr b/src/test/ui/parser-recovery-1.stderr
index bf4070682fbb3..7d2f80148de33 100644
--- a/src/test/ui/parser-recovery-1.stderr
+++ b/src/test/ui/parser-recovery-1.stderr
@@ -1,31 +1,28 @@
 error: this file contains an un-closed delimiter
-  --> $DIR/parser-recovery-1.rs:24:55
+  --> $DIR/parser-recovery-1.rs:25:55
    |
+LL | trait Foo {
+   |           - un-closed delimiter
+...
 LL | } //~ ERROR this file contains an un-closed delimiter
    |                                                       ^
-   |
-help: did you mean to close this delimiter?
-  --> $DIR/parser-recovery-1.rs:15:11
-   |
-LL | trait Foo {
-   |           ^
 
 error: unexpected token: `;`
   --> $DIR/parser-recovery-1.rs:22:15
    |
-LL |     let x = y.;  //~ ERROR unexpected token
+LL |     let x = y.;
    |               ^
 
 error[E0425]: cannot find function `foo` in this scope
   --> $DIR/parser-recovery-1.rs:17:17
    |
-LL |         let x = foo(); //~ ERROR cannot find function `foo` in this scope
+LL |         let x = foo();
    |                 ^^^ not found in this scope
 
 error[E0425]: cannot find value `y` in this scope
   --> $DIR/parser-recovery-1.rs:22:13
    |
-LL |     let x = y.;  //~ ERROR unexpected token
+LL |     let x = y.;
    |             ^ not found in this scope
 
 error[E0601]: `main` function not found in crate `parser_recovery_1`
diff --git a/src/test/ui/parser-recovery-2.stderr b/src/test/ui/parser-recovery-2.stderr
index 1025dad3af773..2965e4eb58124 100644
--- a/src/test/ui/parser-recovery-2.stderr
+++ b/src/test/ui/parser-recovery-2.stderr
@@ -2,7 +2,7 @@ error: incorrect close delimiter: `)`
   --> $DIR/parser-recovery-2.rs:18:5
    |
 LL |     fn bar() {
-   |              - unclosed delimiter
+   |              - un-closed delimiter
 LL |         let x = foo(); //~ ERROR cannot find function `foo` in this scope
 LL |     ) //~ ERROR incorrect close delimiter: `)`
    |     ^ incorrect close delimiter
diff --git a/src/test/ui/resolve/token-error-correct-2.stderr b/src/test/ui/resolve/token-error-correct-2.stderr
index fcd4b4888b0ad..6965c864569c1 100644
--- a/src/test/ui/resolve/token-error-correct-2.stderr
+++ b/src/test/ui/resolve/token-error-correct-2.stderr
@@ -2,7 +2,7 @@ error: incorrect close delimiter: `)`
   --> $DIR/token-error-correct-2.rs:16:5
    |
 LL |     if foo {
-   |            - unclosed delimiter
+   |            - un-closed delimiter
 LL |     //~^ ERROR: cannot find value `foo`
 LL |     ) //~ ERROR: incorrect close delimiter: `)`
    |     ^ incorrect close delimiter
diff --git a/src/test/ui/resolve/token-error-correct-3.stderr b/src/test/ui/resolve/token-error-correct-3.stderr
index a546c2704d915..b6946f62388a7 100644
--- a/src/test/ui/resolve/token-error-correct-3.stderr
+++ b/src/test/ui/resolve/token-error-correct-3.stderr
@@ -2,7 +2,7 @@ error: incorrect close delimiter: `}`
   --> $DIR/token-error-correct-3.rs:30:9
    |
 LL |             callback(path.as_ref(); //~ ERROR expected one of
-   |                     - unclosed delimiter
+   |                     - un-closed delimiter
 ...
 LL |         } else { //~ ERROR: incorrect close delimiter: `}`
    |         ^ incorrect close delimiter
diff --git a/src/test/ui/resolve/token-error-correct.stderr b/src/test/ui/resolve/token-error-correct.stderr
index 1e246b6f085bd..7081a5976294d 100644
--- a/src/test/ui/resolve/token-error-correct.stderr
+++ b/src/test/ui/resolve/token-error-correct.stderr
@@ -2,7 +2,7 @@ error: incorrect close delimiter: `}`
   --> $DIR/token-error-correct.rs:16:1
    |
 LL |     foo(bar(;
-   |            - unclosed delimiter
+   |            - un-closed delimiter
 LL |     //~^ ERROR: expected expression, found `;`
 LL | }
    | ^ incorrect close delimiter
diff --git a/src/test/ui/token/issue-10636-2.stderr b/src/test/ui/token/issue-10636-2.stderr
index 634191bb5ef4e..10dc5f655698e 100644
--- a/src/test/ui/token/issue-10636-2.stderr
+++ b/src/test/ui/token/issue-10636-2.stderr
@@ -2,7 +2,7 @@ error: incorrect close delimiter: `}`
   --> $DIR/issue-10636-2.rs:18:1
    |
 LL |     option.map(|some| 42;
-   |               - unclosed delimiter
+   |               - un-closed delimiter
 ...
 LL | } //~ ERROR: incorrect close delimiter
    | ^ incorrect close delimiter