diff --git a/src/test/compile-fail/E0005.rs b/src/test/compile-fail/E0005.rs
index 809b3af3bea2a..0405bba81b585 100644
--- a/src/test/compile-fail/E0005.rs
+++ b/src/test/compile-fail/E0005.rs
@@ -11,5 +11,4 @@
 fn main() {
     let x = Some(1);
     let Some(y) = x; //~ ERROR E0005
-    //~| NOTE pattern `None` not covered
 }
diff --git a/src/test/compile-fail/E0007.rs b/src/test/compile-fail/E0007.rs
index b72b5e3b2808b..d5acbdebbe9b9 100644
--- a/src/test/compile-fail/E0007.rs
+++ b/src/test/compile-fail/E0007.rs
@@ -13,9 +13,7 @@ fn main() {
     match x {
         op_string @ Some(s) => {},
         //~^ ERROR E0007
-        //~| NOTE binds an already bound by-move value by moving it
         //~| ERROR E0303
-        //~| NOTE not allowed after `@`
         None => {},
     }
 }
diff --git a/src/test/compile-fail/E0008.rs b/src/test/compile-fail/E0008.rs
index 20cc1cbd2232d..ba5720e6f0abd 100644
--- a/src/test/compile-fail/E0008.rs
+++ b/src/test/compile-fail/E0008.rs
@@ -12,7 +12,6 @@ fn main() {
     match Some("hi".to_string()) {
         Some(s) if s.len() == 0 => {},
         //~^ ERROR E0008
-        //~| NOTE moves value into pattern guard
         _ => {},
     }
 }
diff --git a/src/test/compile-fail/E0009.rs b/src/test/compile-fail/E0009.rs
index 767fc0cc5dc07..02e2e80e7eab1 100644
--- a/src/test/compile-fail/E0009.rs
+++ b/src/test/compile-fail/E0009.rs
@@ -14,8 +14,6 @@ fn main() {
     match x {
         Some((y, ref z)) => {},
         //~^ ERROR E0009
-        //~| NOTE by-move pattern here
-        //~| NOTE both by-ref and by-move used
         None => panic!()
     }
 }
diff --git a/src/test/compile-fail/E0010.rs b/src/test/compile-fail/E0010.rs
index ccaf01932d466..66a9319a7df43 100644
--- a/src/test/compile-fail/E0010.rs
+++ b/src/test/compile-fail/E0010.rs
@@ -12,6 +12,5 @@
 #![allow(warnings)]
 
 const CON : Box<i32> = box 0; //~ ERROR E0010
-                              //~| NOTE allocation not allowed in
 
 fn main() {}
diff --git a/src/test/compile-fail/E0017.rs b/src/test/compile-fail/E0017.rs
index 726a6f8c6feb4..c98c35a1442ad 100644
--- a/src/test/compile-fail/E0017.rs
+++ b/src/test/compile-fail/E0017.rs
@@ -12,10 +12,7 @@ static X: i32 = 1;
 const C: i32 = 2;
 
 const CR: &'static mut i32 = &mut C; //~ ERROR E0017
-                                     //~| NOTE constants require immutable values
 static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
-                                              //~| NOTE statics require immutable values
                                               //~| ERROR cannot borrow
 static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
-                                             //~| NOTE statics require immutable values
 fn main() {}
diff --git a/src/test/compile-fail/E0023.rs b/src/test/compile-fail/E0023.rs
index c3623e3177b56..24032c59844dc 100644
--- a/src/test/compile-fail/E0023.rs
+++ b/src/test/compile-fail/E0023.rs
@@ -18,10 +18,7 @@ fn main() {
     let x = Fruit::Apple(String::new(), String::new());
     match x {
         Fruit::Apple(a) => {}, //~ ERROR E0023
-                               //~| NOTE expected 2 fields, found 1
         Fruit::Apple(a, b, c) => {}, //~ ERROR E0023
-                                     //~| NOTE expected 2 fields, found 3
         Fruit::Pear(1, 2) => {}, //~ ERROR E0023
-                                 //~| NOTE expected 1 field, found 2
     }
 }
diff --git a/src/test/compile-fail/E0025.rs b/src/test/compile-fail/E0025.rs
index 1d15cef8bc930..81d0ea8a5e21d 100644
--- a/src/test/compile-fail/E0025.rs
+++ b/src/test/compile-fail/E0025.rs
@@ -17,6 +17,4 @@ fn main() {
     let x = Foo { a:1, b:2 };
     let Foo { a: x, a: y, b: 0 } = x;
     //~^ ERROR field `a` bound multiple times in the pattern
-    //~| NOTE multiple uses of `a` in pattern
-    //~| NOTE first use of `a`
 }
diff --git a/src/test/compile-fail/E0026.rs b/src/test/compile-fail/E0026.rs
index ac609da4cbdde..f8ad7b5a30e1c 100644
--- a/src/test/compile-fail/E0026.rs
+++ b/src/test/compile-fail/E0026.rs
@@ -18,6 +18,5 @@ fn main() {
     match thing {
         Thing { x, y, z } => {}
         //~^ ERROR struct `Thing` does not have a field named `z` [E0026]
-        //~| NOTE struct `Thing` does not have field `z`
     }
 }
diff --git a/src/test/compile-fail/E0027.rs b/src/test/compile-fail/E0027.rs
index ca496a24701fb..b63b0ab5dfdef 100644
--- a/src/test/compile-fail/E0027.rs
+++ b/src/test/compile-fail/E0027.rs
@@ -19,6 +19,5 @@ fn main() {
     match d {
         Dog { age: x } => {}
         //~^ ERROR pattern does not mention field `name`
-        //~| NOTE missing field `name`
     }
 }
diff --git a/src/test/compile-fail/E0029.rs b/src/test/compile-fail/E0029.rs
index e43290bb15416..80d215bd327c9 100644
--- a/src/test/compile-fail/E0029.rs
+++ b/src/test/compile-fail/E0029.rs
@@ -14,9 +14,6 @@ fn main() {
     match s {
         "hello" ... "world" => {}
         //~^ ERROR only char and numeric types are allowed in range patterns
-        //~| NOTE ranges require char or numeric types
-        //~| NOTE start type: &'static str
-        //~| NOTE end type: &'static str
         //~| ERROR non-reference pattern used to match a reference
         _ => {}
     }
diff --git a/src/test/compile-fail/E0030.rs b/src/test/compile-fail/E0030.rs
index 74e827b3379a7..ef3bded4beffb 100644
--- a/src/test/compile-fail/E0030.rs
+++ b/src/test/compile-fail/E0030.rs
@@ -13,6 +13,5 @@ fn main() {
     match 5u32 {
         1000 ... 5 => {}
         //~^ ERROR lower range bound must be less than or equal to upper
-        //~| NOTE lower bound larger than upper bound
     }
 }
diff --git a/src/test/compile-fail/E0033.rs b/src/test/compile-fail/E0033.rs
index 03d4747209392..3cdbb55f6deaf 100644
--- a/src/test/compile-fail/E0033.rs
+++ b/src/test/compile-fail/E0033.rs
@@ -15,12 +15,9 @@ trait SomeTrait {
 fn main() {
     let trait_obj: &SomeTrait = SomeTrait;
     //~^ ERROR expected value, found trait `SomeTrait`
-    //~| NOTE not a value
     //~| ERROR E0038
     //~| method `foo` has no receiver
-    //~| NOTE the trait `SomeTrait` cannot be made into an object
 
     let &invalid = trait_obj;
     //~^ ERROR E0033
-    //~| NOTE type `&SomeTrait` cannot be dereferenced
 }
diff --git a/src/test/compile-fail/E0034.rs b/src/test/compile-fail/E0034.rs
index 136a74f7a8b74..6eebd4d4d5360 100644
--- a/src/test/compile-fail/E0034.rs
+++ b/src/test/compile-fail/E0034.rs
@@ -20,15 +20,12 @@ trait Trait2 {
 
 impl Trait1 for Test {
     fn foo() {}
-    //~^ NOTE candidate #1 is defined in an impl of the trait `Trait1` for the type `Test`
 }
 
 impl Trait2 for Test {
     fn foo() {}
-    //~^ NOTE candidate #2 is defined in an impl of the trait `Trait2` for the type `Test`
 }
 
 fn main() {
     Test::foo() //~ ERROR multiple applicable items in scope
-    //~| NOTE multiple `foo` found
 }
diff --git a/src/test/compile-fail/E0038.rs b/src/test/compile-fail/E0038.rs
index 6cf3f1ebf19e4..8087928c051bb 100644
--- a/src/test/compile-fail/E0038.rs
+++ b/src/test/compile-fail/E0038.rs
@@ -14,8 +14,6 @@ trait Trait {
 
 fn call_foo(x: Box<Trait>) {
     //~^ ERROR E0038
-    //~| NOTE the trait `Trait` cannot be made into an object
-    //~| NOTE method `foo` references the `Self` type in its arguments or return type
     let y = x.foo();
 }
 
diff --git a/src/test/compile-fail/E0040.rs b/src/test/compile-fail/E0040.rs
index edfe22186e162..8385d68c540dd 100644
--- a/src/test/compile-fail/E0040.rs
+++ b/src/test/compile-fail/E0040.rs
@@ -22,5 +22,4 @@ fn main() {
     let mut x = Foo { x: -7 };
     x.drop();
     //~^ ERROR E0040
-    //~| NOTE explicit destructor calls not allowed
 }
diff --git a/src/test/compile-fail/E0045.rs b/src/test/compile-fail/E0045.rs
index 3f098861eb60c..57c639dd143a2 100644
--- a/src/test/compile-fail/E0045.rs
+++ b/src/test/compile-fail/E0045.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 extern "Rust" { fn foo(x: u8, ...); }   //~ ERROR E0045
-                                        //~| NOTE variadics require C or cdecl calling convention
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0049.rs b/src/test/compile-fail/E0049.rs
index 33ebd3f7aca5e..5867e11e9acc6 100644
--- a/src/test/compile-fail/E0049.rs
+++ b/src/test/compile-fail/E0049.rs
@@ -9,14 +9,13 @@
 // except according to those terms.
 
 trait Foo {
-    fn foo<T: Default>(x: T) -> Self; //~ NOTE expected 1 type parameter
+    fn foo<T: Default>(x: T) -> Self;
 }
 
 struct Bar;
 
 impl Foo for Bar {
     fn foo(x: bool) -> Self { Bar } //~ ERROR E0049
-                                    //~| NOTE found 0 type parameters
 }
 
 fn main() {
diff --git a/src/test/compile-fail/E0050.rs b/src/test/compile-fail/E0050.rs
index 5c53d62709aef..2ccc380c540d2 100644
--- a/src/test/compile-fail/E0050.rs
+++ b/src/test/compile-fail/E0050.rs
@@ -9,20 +9,17 @@
 // except according to those terms.
 
 trait Foo {
-    fn foo(&self, x: u8) -> bool; //~ NOTE trait requires 2 parameters
-    fn bar(&self, x: u8, y: u8, z: u8); //~ NOTE trait requires 4 parameters
-    fn less(&self); //~ NOTE trait requires 1 parameter
+    fn foo(&self, x: u8) -> bool;
+    fn bar(&self, x: u8, y: u8, z: u8);
+    fn less(&self);
 }
 
 struct Bar;
 
 impl Foo for Bar {
     fn foo(&self) -> bool { true } //~ ERROR E0050
-                                   //~| NOTE expected 2 parameters, found 1
     fn bar(&self) { } //~ ERROR E0050
-                      //~| NOTE expected 4 parameters, found 1
     fn less(&self, x: u8, y: u8, z: u8) { } //~ ERROR E0050
-                                            //~| NOTE expected 1 parameter, found 4
 }
 
 fn main() {
diff --git a/src/test/compile-fail/E0055.rs b/src/test/compile-fail/E0055.rs
index 2b2d278ad4cc6..6e186b81cad8d 100644
--- a/src/test/compile-fail/E0055.rs
+++ b/src/test/compile-fail/E0055.rs
@@ -20,5 +20,4 @@ fn main() {
     let ref_foo = &&Foo;
     ref_foo.foo();
     //~^ ERROR E0055
-    //~| NOTE deref recursion limit reached
 }
diff --git a/src/test/compile-fail/E0060.rs b/src/test/compile-fail/E0060.rs
index 8246c42a4d408..f4505209b6689 100644
--- a/src/test/compile-fail/E0060.rs
+++ b/src/test/compile-fail/E0060.rs
@@ -10,7 +10,6 @@
 
 extern "C" {
     fn printf(_: *const u8, ...) -> u32;
-    //~^ NOTE defined here
 }
 
 fn main() {
diff --git a/src/test/compile-fail/E0061.rs b/src/test/compile-fail/E0061.rs
index ebd4ad2e292ae..221e18cf89dd5 100644
--- a/src/test/compile-fail/E0061.rs
+++ b/src/test/compile-fail/E0061.rs
@@ -9,10 +9,8 @@
 // except according to those terms.
 
 fn f(a: u16, b: &str) {}
-//~^ NOTE defined here
 
 fn f2(a: u16) {}
-//~^ NOTE defined here
 
 fn main() {
     f(0);
diff --git a/src/test/compile-fail/E0062.rs b/src/test/compile-fail/E0062.rs
index 822d93e52d588..684c9464ff824 100644
--- a/src/test/compile-fail/E0062.rs
+++ b/src/test/compile-fail/E0062.rs
@@ -14,9 +14,8 @@ struct Foo {
 
 fn main() {
     let x = Foo {
-        x: 0, //~ NOTE first use of `x`
+        x: 0,
         x: 0,
         //~^ ERROR E0062
-        //~| NOTE used more than once
     };
 }
diff --git a/src/test/compile-fail/E0063.rs b/src/test/compile-fail/E0063.rs
index e7044102abc71..0208aff066b4d 100644
--- a/src/test/compile-fail/E0063.rs
+++ b/src/test/compile-fail/E0063.rs
@@ -41,14 +41,10 @@ struct TruncatedPluralFoo {
 fn main() {
     let w = SingleFoo { };
     //~^ ERROR missing field `x` in initializer of `SingleFoo`
-    //~| NOTE missing `x`
     let x = PluralFoo {x: 1};
     //~^ ERROR missing fields `y`, `z` in initializer of `PluralFoo`
-    //~| NOTE missing `y`, `z`
     let y = TruncatedFoo{x:1};
     //~^ missing fields `a`, `b`, `y` and 1 other field in initializer of `TruncatedFoo`
-    //~| NOTE `a`, `b`, `y` and 1 other field
     let z = TruncatedPluralFoo{x:1};
     //~^ ERROR missing fields `a`, `b`, `c` and 2 other fields in initializer of `TruncatedPluralFoo`
-    //~| NOTE missing `a`, `b`, `c` and 2 other fields
 }
diff --git a/src/test/compile-fail/E0067.rs b/src/test/compile-fail/E0067.rs
index 56d2e82806230..a3fc30ee1c71a 100644
--- a/src/test/compile-fail/E0067.rs
+++ b/src/test/compile-fail/E0067.rs
@@ -13,6 +13,4 @@ use std::collections::LinkedList;
 fn main() {
     LinkedList::new() += 1; //~ ERROR E0368
                             //~^ ERROR E0067
-                            //~^^ NOTE invalid expression for left-hand side
-                            //~| NOTE cannot use `+=` on type `std::collections::LinkedList<_>`
 }
diff --git a/src/test/compile-fail/E0069.rs b/src/test/compile-fail/E0069.rs
index 00facc9172802..a6a7898ed4e89 100644
--- a/src/test/compile-fail/E0069.rs
+++ b/src/test/compile-fail/E0069.rs
@@ -11,7 +11,6 @@
 fn foo() -> u8 {
     return;
     //~^ ERROR `return;` in a function whose return type is not `()`
-    //~| NOTE return type is not ()
 }
 
 fn main() {
diff --git a/src/test/compile-fail/E0071.rs b/src/test/compile-fail/E0071.rs
index 95653ae83e7cd..d71dc7966fa91 100644
--- a/src/test/compile-fail/E0071.rs
+++ b/src/test/compile-fail/E0071.rs
@@ -14,5 +14,4 @@ type FooAlias = Foo;
 fn main() {
     let u = FooAlias { value: 0 };
     //~^ ERROR expected struct, variant or union type, found enum `Foo` [E0071]
-    //~| NOTE not a struct
 }
diff --git a/src/test/compile-fail/E0076.rs b/src/test/compile-fail/E0076.rs
index c31dc62eb666b..b159cf107cefb 100644
--- a/src/test/compile-fail/E0076.rs
+++ b/src/test/compile-fail/E0076.rs
@@ -13,7 +13,6 @@
 #[repr(simd)]
 struct Bad(u16, u32, u32);
 //~^ ERROR E0076
-//~| NOTE SIMD elements must have the same type
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0081.rs b/src/test/compile-fail/E0081.rs
index 9911e093a8980..3b571667336ac 100644
--- a/src/test/compile-fail/E0081.rs
+++ b/src/test/compile-fail/E0081.rs
@@ -9,10 +9,9 @@
 // except according to those terms.
 
 enum Enum {
-    P = 3, //~ NOTE first use of `3isize`
+    P = 3,
     X = 3,
     //~^ ERROR discriminant value `3isize` already exists
-    //~| NOTE enum already has `3isize`
     Y = 5
 }
 
diff --git a/src/test/compile-fail/E0084.rs b/src/test/compile-fail/E0084.rs
index d19eed7124e82..2be206c9702bf 100644
--- a/src/test/compile-fail/E0084.rs
+++ b/src/test/compile-fail/E0084.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 #[repr(i32)] //~ ERROR: E0084
-enum Foo {} //~ NOTE: zero-variant enum
+enum Foo {}
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0087.rs b/src/test/compile-fail/E0087.rs
index 0b8150affc0c0..6dc08860614d7 100644
--- a/src/test/compile-fail/E0087.rs
+++ b/src/test/compile-fail/E0087.rs
@@ -13,8 +13,6 @@ fn bar<T>() {}
 
 fn main() {
     foo::<f64>(); //~ ERROR expected at most 0 type parameters, found 1 type parameter [E0087]
-                  //~^ NOTE expected 0 type parameters
 
     bar::<f64, u64>(); //~ ERROR expected at most 1 type parameter, found 2 type parameters [E0087]
-                       //~^ NOTE expected 1 type parameter
 }
diff --git a/src/test/compile-fail/E0089.rs b/src/test/compile-fail/E0089.rs
index 986630d818fff..21df9abd0932e 100644
--- a/src/test/compile-fail/E0089.rs
+++ b/src/test/compile-fail/E0089.rs
@@ -12,5 +12,4 @@ fn foo<T, U>() {}
 
 fn main() {
     foo::<f64>(); //~ ERROR expected 2 type parameters, found 1 type parameter [E0089]
-                  //~| NOTE expected 2 type parameters
 }
diff --git a/src/test/compile-fail/E0090.rs b/src/test/compile-fail/E0090.rs
index c37f37031add6..13b2131cc8be0 100644
--- a/src/test/compile-fail/E0090.rs
+++ b/src/test/compile-fail/E0090.rs
@@ -12,5 +12,4 @@ fn foo<'a: 'b, 'b: 'a>() {}
 
 fn main() {
     foo::<'static>(); //~ ERROR expected 2 lifetime parameters, found 1 lifetime parameter [E0090]
-                      //~^ NOTE expected 2 lifetime parameters
 }
diff --git a/src/test/compile-fail/E0091.rs b/src/test/compile-fail/E0091.rs
index 0d6c246de2a0e..da988dbf819ac 100644
--- a/src/test/compile-fail/E0091.rs
+++ b/src/test/compile-fail/E0091.rs
@@ -9,9 +9,7 @@
 // except according to those terms.
 
 type Foo<T> = u32; //~ ERROR E0091
-                   //~| NOTE unused type parameter
 type Foo2<A, B> = Box<A>; //~ ERROR E0091
-                          //~| NOTE unused type parameter
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0092.rs b/src/test/compile-fail/E0092.rs
index c8bb31a7857ee..b08164ac06d42 100644
--- a/src/test/compile-fail/E0092.rs
+++ b/src/test/compile-fail/E0092.rs
@@ -11,7 +11,7 @@
 #![feature(intrinsics)]
 extern "rust-intrinsic" {
     fn atomic_foo(); //~ ERROR E0092
-}                    //~| NOTE unrecognized atomic operation
+}
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0093.rs b/src/test/compile-fail/E0093.rs
index fdc48455a679c..d84f9f649113c 100644
--- a/src/test/compile-fail/E0093.rs
+++ b/src/test/compile-fail/E0093.rs
@@ -12,7 +12,6 @@
 extern "rust-intrinsic" {
     fn foo();
     //~^ ERROR E0093
-    //~| NOTE unrecognized intrinsic
 }
 
 fn main() {
diff --git a/src/test/compile-fail/E0094.rs b/src/test/compile-fail/E0094.rs
index d09353a203800..3a31874b24422 100644
--- a/src/test/compile-fail/E0094.rs
+++ b/src/test/compile-fail/E0094.rs
@@ -11,7 +11,6 @@
 #![feature(intrinsics)]
 extern "rust-intrinsic" {
     fn size_of<T, U>() -> usize; //~ ERROR E0094
-                                 //~| NOTE expected 1 type parameter
 }
 
 fn main() {
diff --git a/src/test/compile-fail/E0106.rs b/src/test/compile-fail/E0106.rs
index d5644ab060887..0674930a11cca 100644
--- a/src/test/compile-fail/E0106.rs
+++ b/src/test/compile-fail/E0106.rs
@@ -11,17 +11,14 @@
 struct Foo {
     x: &bool,
     //~^ ERROR E0106
-    //~| NOTE expected lifetime parameter
 }
 enum Bar {
     A(u8),
     B(&bool),
    //~^ ERROR E0106
-   //~| NOTE expected lifetime parameter
 }
 type MyStr = &str;
         //~^ ERROR E0106
-        //~| NOTE expected lifetime parameter
 
 struct Baz<'a>(&'a str);
 struct Buzz<'a, 'b>(&'a str, &'b str);
diff --git a/src/test/compile-fail/E0109.rs b/src/test/compile-fail/E0109.rs
index 2e4cbf8692693..9fc478422504b 100644
--- a/src/test/compile-fail/E0109.rs
+++ b/src/test/compile-fail/E0109.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 type X = u32<i32>; //~ ERROR E0109
-                   //~| NOTE type parameter not allowed
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0110.rs b/src/test/compile-fail/E0110.rs
index 5a9e7a43de96b..fd169f4acc5eb 100644
--- a/src/test/compile-fail/E0110.rs
+++ b/src/test/compile-fail/E0110.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 type X = u32<'static>; //~ ERROR E0110
-                       //~| NOTE lifetime parameter not allowed on this type
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0116.rs b/src/test/compile-fail/E0116.rs
index f885241eec4c7..cd7d8dc3efb98 100644
--- a/src/test/compile-fail/E0116.rs
+++ b/src/test/compile-fail/E0116.rs
@@ -10,8 +10,6 @@
 
 impl Vec<u8> {}
 //~^ ERROR E0116
-//~| NOTE impl for type defined outside of crate.
-//~| NOTE define and implement a trait or new type instead
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0117.rs b/src/test/compile-fail/E0117.rs
index 3da00da205fec..982f875c7b0a8 100644
--- a/src/test/compile-fail/E0117.rs
+++ b/src/test/compile-fail/E0117.rs
@@ -9,9 +9,6 @@
 // except according to those terms.
 
 impl Drop for u32 {} //~ ERROR E0117
-//~^ NOTE impl doesn't use types inside crate
-//~| NOTE the impl does not reference any types defined in this crate
-//~| NOTE define and implement a trait or new type instead
 //~| ERROR the Drop trait may only be implemented on structures
 //~| implementing Drop requires a struct
 
diff --git a/src/test/compile-fail/E0118.rs b/src/test/compile-fail/E0118.rs
index 3fc478f1e403e..d37ff34b861f4 100644
--- a/src/test/compile-fail/E0118.rs
+++ b/src/test/compile-fail/E0118.rs
@@ -9,8 +9,6 @@
 // except according to those terms.
 
 impl (u8, u8) { //~ ERROR E0118
-//~^ NOTE impl requires a base type
-//~| NOTE either implement a trait on it or create a newtype to wrap it instead
     fn get_state(&self) -> String {
         String::new()
     }
diff --git a/src/test/compile-fail/E0119.rs b/src/test/compile-fail/E0119.rs
index 56820bcd1840c..9528631b3047b 100644
--- a/src/test/compile-fail/E0119.rs
+++ b/src/test/compile-fail/E0119.rs
@@ -12,7 +12,7 @@ trait MyTrait {
     fn get(&self) -> usize;
 }
 
-impl<T> MyTrait for T { //~ NOTE first implementation here
+impl<T> MyTrait for T {
     fn get(&self) -> usize { 0 }
 }
 
@@ -21,7 +21,6 @@ struct Foo {
 }
 
 impl MyTrait for Foo { //~ ERROR E0119
-                       //~| NOTE conflicting implementation for `Foo`
     fn get(&self) -> usize { self.value }
 }
 
diff --git a/src/test/compile-fail/E0120.rs b/src/test/compile-fail/E0120.rs
index 80cc0d2680f7c..8d09b877f002b 100644
--- a/src/test/compile-fail/E0120.rs
+++ b/src/test/compile-fail/E0120.rs
@@ -12,7 +12,6 @@ trait MyTrait { fn foo() {} }
 
 impl Drop for MyTrait {
               //~^ ERROR E0120
-              //~| NOTE implementing Drop requires a struct
     fn drop(&mut self) {}
 }
 
diff --git a/src/test/compile-fail/E0124.rs b/src/test/compile-fail/E0124.rs
index 18c5074610656..3ef20c6dd4084 100644
--- a/src/test/compile-fail/E0124.rs
+++ b/src/test/compile-fail/E0124.rs
@@ -9,10 +9,9 @@
 // except according to those terms.
 
 struct Foo {
-    field1: i32, //~ NOTE `field1` first declared here
+    field1: i32,
     field1: i32,
     //~^ ERROR field `field1` is already declared [E0124]
-    //~| NOTE field already declared
 }
 
 fn main() {
diff --git a/src/test/compile-fail/E0128.rs b/src/test/compile-fail/E0128.rs
index f5829b9385941..37071012825ec 100644
--- a/src/test/compile-fail/E0128.rs
+++ b/src/test/compile-fail/E0128.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 struct Foo<T=U, U=()> { //~ ERROR E0128
-                        //~| NOTE defaulted type parameters cannot be forward declared
     field1: T,
     field2: U,
 }
diff --git a/src/test/compile-fail/E0130.rs b/src/test/compile-fail/E0130.rs
index e9e027fd1dc19..d11b59cdf334d 100644
--- a/src/test/compile-fail/E0130.rs
+++ b/src/test/compile-fail/E0130.rs
@@ -11,7 +11,6 @@
 extern {
     fn foo((a, b): (u32, u32));
     //~^ ERROR E0130
-    //~| NOTE pattern not allowed in foreign function
 }
 
 fn main() {
diff --git a/src/test/compile-fail/E0131.rs b/src/test/compile-fail/E0131.rs
index e6e924e2d966f..c7e31edd301d4 100644
--- a/src/test/compile-fail/E0131.rs
+++ b/src/test/compile-fail/E0131.rs
@@ -10,5 +10,4 @@
 
 fn main<T>() {
     //~^ ERROR E0131
-    //~| NOTE main cannot have type parameters
 }
diff --git a/src/test/compile-fail/E0132.rs b/src/test/compile-fail/E0132.rs
index 91ff6b85a42ce..25ccb344aba34 100644
--- a/src/test/compile-fail/E0132.rs
+++ b/src/test/compile-fail/E0132.rs
@@ -12,7 +12,6 @@
 
 #[start]
 fn f< T >() {} //~ ERROR E0132
-             //~| NOTE start function cannot have type parameters
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0133.rs b/src/test/compile-fail/E0133.rs
index f60d9a5083f6f..2e54f65e7bff4 100644
--- a/src/test/compile-fail/E0133.rs
+++ b/src/test/compile-fail/E0133.rs
@@ -13,5 +13,4 @@ unsafe fn f() { return; }
 fn main() {
     f();
     //~^ ERROR E0133
-    //~| NOTE call to unsafe function
 }
diff --git a/src/test/compile-fail/E0137.rs b/src/test/compile-fail/E0137.rs
index f45afc9f37bd5..067ebcc727cea 100644
--- a/src/test/compile-fail/E0137.rs
+++ b/src/test/compile-fail/E0137.rs
@@ -11,9 +11,8 @@
 #![feature(main)]
 
 #[main]
-fn foo() {} //~ NOTE first #[main] function
+fn foo() {}
 
 #[main]
 fn f() {}
 //~^ ERROR E0137
-//~| NOTE additional #[main] function
diff --git a/src/test/compile-fail/E0138.rs b/src/test/compile-fail/E0138.rs
index 11d90658ab26a..856616c857085 100644
--- a/src/test/compile-fail/E0138.rs
+++ b/src/test/compile-fail/E0138.rs
@@ -12,9 +12,7 @@
 
 #[start]
 fn foo(argc: isize, argv: *const *const u8) -> isize { 0 }
-//~^ NOTE previous `start` function here
 
 #[start]
 fn f(argc: isize, argv: *const *const u8) -> isize { 0 }
 //~^ ERROR E0138
-//~| NOTE multiple `start` functions
diff --git a/src/test/compile-fail/E0162.rs b/src/test/compile-fail/E0162.rs
index 0b63d7c3f85c7..e13b0af6f7977 100644
--- a/src/test/compile-fail/E0162.rs
+++ b/src/test/compile-fail/E0162.rs
@@ -13,7 +13,6 @@ struct Irrefutable(i32);
 fn main() {
     let irr = Irrefutable(0);
     if let Irrefutable(x) = irr { //~ ERROR E0162
-        //~| NOTE irrefutable pattern
         println!("{}", x);
     }
 }
diff --git a/src/test/compile-fail/E0164.rs b/src/test/compile-fail/E0164.rs
index cf6cf15115ac0..a7f10ddb5a7f8 100644
--- a/src/test/compile-fail/E0164.rs
+++ b/src/test/compile-fail/E0164.rs
@@ -18,7 +18,6 @@ impl Foo {
 fn bar(foo: Foo) -> u32 {
     match foo {
         Foo::B(i) => i, //~ ERROR E0164
-                        //~| NOTE not a tuple variant or struct
     }
 }
 
diff --git a/src/test/compile-fail/E0184.rs b/src/test/compile-fail/E0184.rs
index 9ec2eeba5cc5f..5d72d00ffe876 100644
--- a/src/test/compile-fail/E0184.rs
+++ b/src/test/compile-fail/E0184.rs
@@ -9,8 +9,6 @@
 // except according to those terms.
 
 #[derive(Copy)] //~ ERROR E0184
-                //~| NOTE Copy not allowed on types with destructors
-                //~| NOTE in this expansion of #[derive(Copy)]
 struct Foo;
 
 impl Drop for Foo {
diff --git a/src/test/compile-fail/E0191.rs b/src/test/compile-fail/E0191.rs
index dcfe441ab0d00..489ebb033f84e 100644
--- a/src/test/compile-fail/E0191.rs
+++ b/src/test/compile-fail/E0191.rs
@@ -13,7 +13,6 @@ trait Trait {
 }
 
 type Foo = Trait; //~ ERROR E0191
-                  //~| NOTE missing associated type `Bar` value
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0194.rs b/src/test/compile-fail/E0194.rs
index 6b1f718dd76c5..17e0751859d9f 100644
--- a/src/test/compile-fail/E0194.rs
+++ b/src/test/compile-fail/E0194.rs
@@ -8,11 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-trait Foo<T> { //~ NOTE first `T` declared here
+trait Foo<T> {
     fn do_something(&self) -> T;
     fn do_something_else<T: Clone>(&self, bar: T);
     //~^ ERROR E0194
-    //~| NOTE shadows another type parameter
 }
 
 fn main() {
diff --git a/src/test/compile-fail/E0206.rs b/src/test/compile-fail/E0206.rs
index 1131e8e1b01ca..da0370b301b5b 100644
--- a/src/test/compile-fail/E0206.rs
+++ b/src/test/compile-fail/E0206.rs
@@ -12,18 +12,13 @@ type Foo = i32;
 
 impl Copy for Foo { }
 //~^ ERROR the trait `Copy` may not be implemented for this type
-//~| NOTE type is not a structure or enumeration
 //~| ERROR only traits defined in the current crate can be implemented for arbitrary types
-//~| NOTE impl doesn't use types inside crate
-//~| NOTE the impl does not reference any types defined in this crate
-//~| NOTE define and implement a trait or new type instead
 
 #[derive(Copy, Clone)]
 struct Bar;
 
 impl Copy for &'static Bar { }
 //~^ ERROR the trait `Copy` may not be implemented for this type
-//~| NOTE type is not a structure or enumeration
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0207.rs b/src/test/compile-fail/E0207.rs
index fbddb81d7c70b..bd87dbaf786a5 100644
--- a/src/test/compile-fail/E0207.rs
+++ b/src/test/compile-fail/E0207.rs
@@ -11,7 +11,6 @@
 struct Foo;
 
 impl<T: Default> Foo { //~ ERROR E0207
-                       //~| NOTE unconstrained type parameter
     fn get(&self) -> T {
         <T as Default>::default()
     }
diff --git a/src/test/compile-fail/E0214.rs b/src/test/compile-fail/E0214.rs
index e9c3cb72c11b0..2b090391c743b 100644
--- a/src/test/compile-fail/E0214.rs
+++ b/src/test/compile-fail/E0214.rs
@@ -11,5 +11,4 @@
 fn main() {
     let v: Vec(&str) = vec!["foo"];
     //~^ ERROR E0214
-    //~| NOTE only traits may use parentheses
 }
diff --git a/src/test/compile-fail/E0220.rs b/src/test/compile-fail/E0220.rs
index c5a1824514d74..2866ffcd63792 100644
--- a/src/test/compile-fail/E0220.rs
+++ b/src/test/compile-fail/E0220.rs
@@ -13,8 +13,6 @@ trait Trait {
 }
 
 type Foo = Trait<F=i32>; //~ ERROR E0220
-                         //~| NOTE associated type `F` not found
                          //~| ERROR E0191
-                         //~| NOTE missing associated type `Bar` value
 fn main() {
 }
diff --git a/src/test/compile-fail/E0221.rs b/src/test/compile-fail/E0221.rs
index aed2b4084e810..99092465b0ae7 100644
--- a/src/test/compile-fail/E0221.rs
+++ b/src/test/compile-fail/E0221.rs
@@ -12,27 +12,24 @@ trait T1 {}
 trait T2 {}
 
 trait Foo {
-    type A: T1; //~ NOTE: ambiguous `A` from `Foo`
+    type A: T1;
 }
 
 trait Bar : Foo {
-    type A: T2; //~ NOTE: ambiguous `A` from `Bar`
+    type A: T2;
     fn do_something() {
         let _: Self::A;
         //~^ ERROR E0221
-        //~| NOTE ambiguous associated type `A`
     }
 }
 
 trait T3 {}
 
 trait My : std::str::FromStr {
-    type Err: T3; //~ NOTE: ambiguous `Err` from `My`
+    type Err: T3;
     fn test() {
         let _: Self::Err;
         //~^ ERROR E0221
-        //~| NOTE ambiguous associated type `Err`
-        //~| NOTE associated type `Self` could derive from `std::str::FromStr`
     }
 }
 
diff --git a/src/test/compile-fail/E0223.rs b/src/test/compile-fail/E0223.rs
index 56057b372599d..0683197b2b670 100644
--- a/src/test/compile-fail/E0223.rs
+++ b/src/test/compile-fail/E0223.rs
@@ -13,6 +13,4 @@ trait MyTrait { type X; }
 fn main() {
     let foo: MyTrait::X;
     //~^ ERROR ambiguous associated type
-    //~| NOTE ambiguous associated type
-    //~| NOTE specify the type using the syntax `<Type as MyTrait>::X`
 }
diff --git a/src/test/compile-fail/E0225.rs b/src/test/compile-fail/E0225.rs
index c2f610ecd2816..6c77443c5ede9 100644
--- a/src/test/compile-fail/E0225.rs
+++ b/src/test/compile-fail/E0225.rs
@@ -11,5 +11,4 @@
 fn main() {
     let _: Box<std::io::Read + std::io::Write>;
     //~^ ERROR only auto traits can be used as additional traits in a trait object [E0225]
-    //~| NOTE non-auto additional trait
 }
diff --git a/src/test/compile-fail/E0229.rs b/src/test/compile-fail/E0229.rs
index d15f9937f1382..b70fb092a5410 100644
--- a/src/test/compile-fail/E0229.rs
+++ b/src/test/compile-fail/E0229.rs
@@ -22,7 +22,6 @@ impl Foo for isize {
 
 fn baz<I>(x: &<I as Foo<A=Bar>>::A) {}
 //~^ ERROR associated type bindings are not allowed here [E0229]
-//~| NOTE associated type not allowed here
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0232.rs b/src/test/compile-fail/E0232.rs
index a33120bbebd23..04657c65c8e45 100644
--- a/src/test/compile-fail/E0232.rs
+++ b/src/test/compile-fail/E0232.rs
@@ -12,8 +12,6 @@
 
 #[rustc_on_unimplemented]
 //~^ ERROR E0232
-//~| NOTE value required here
-//~| NOTE eg `#[rustc_on_unimplemented = "foo"]`
 trait Bar {}
 
 fn main() {
diff --git a/src/test/compile-fail/E0243.rs b/src/test/compile-fail/E0243.rs
index d20435a37ff5b..615ce0b5d4265 100644
--- a/src/test/compile-fail/E0243.rs
+++ b/src/test/compile-fail/E0243.rs
@@ -11,7 +11,6 @@
 struct Foo<T> { x: T }
 struct Bar { x: Foo }
                 //~^ ERROR wrong number of type arguments: expected 1, found 0 [E0243]
-                //~| NOTE expected 1 type argument
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0244.rs b/src/test/compile-fail/E0244.rs
index 02d4b337894b2..9a78b3139d064 100644
--- a/src/test/compile-fail/E0244.rs
+++ b/src/test/compile-fail/E0244.rs
@@ -11,7 +11,6 @@
 struct Foo { x: bool }
 struct Bar<S, T> { x: Foo<S, T> }
                       //~^ ERROR wrong number of type arguments: expected 0, found 2 [E0244]
-                      //~| NOTE expected no type arguments
 
 
 fn main() {
diff --git a/src/test/compile-fail/E0253.rs b/src/test/compile-fail/E0253.rs
index 5a06c01241b4b..186d9019aaeba 100644
--- a/src/test/compile-fail/E0253.rs
+++ b/src/test/compile-fail/E0253.rs
@@ -16,6 +16,5 @@ mod foo {
 
 use foo::MyTrait::do_something;
     //~^ ERROR E0253
-    //~|NOTE cannot be imported directly
 
 fn main() {}
diff --git a/src/test/compile-fail/E0254.rs b/src/test/compile-fail/E0254.rs
index 996a6b97cd998..46c74fe3735a3 100644
--- a/src/test/compile-fail/E0254.rs
+++ b/src/test/compile-fail/E0254.rs
@@ -12,7 +12,6 @@
 #![allow(unused_extern_crates)]
 
 extern crate alloc;
-//~^ NOTE previous import of the extern crate `alloc` here
 
 mod foo {
     pub trait alloc {
@@ -22,7 +21,5 @@ mod foo {
 
 use foo::alloc;
 //~^ ERROR E0254
-//~| NOTE `alloc` reimported here
-//~| NOTE `alloc` must be defined only once in the type namespace of this module
 
 fn main() {}
diff --git a/src/test/compile-fail/E0259.rs b/src/test/compile-fail/E0259.rs
index e125cc0c19c37..5a47541c708be 100644
--- a/src/test/compile-fail/E0259.rs
+++ b/src/test/compile-fail/E0259.rs
@@ -12,12 +12,8 @@
 #![allow(unused_extern_crates)]
 
 extern crate alloc;
-//~^ NOTE previous import of the extern crate `alloc` here
 
 extern crate libc as alloc;
 //~^ ERROR E0259
-//~| NOTE `alloc` reimported here
-//~| NOTE `alloc` must be defined only once in the type namespace of this module
-//~| NOTE You can use `as` to change the binding name of the import
 
 fn main() {}
diff --git a/src/test/compile-fail/E0260.rs b/src/test/compile-fail/E0260.rs
index ad8888e58f79a..1b01bb12203d3 100644
--- a/src/test/compile-fail/E0260.rs
+++ b/src/test/compile-fail/E0260.rs
@@ -12,12 +12,9 @@
 #![allow(unused_extern_crates)]
 
 extern crate alloc;
-//~^ NOTE previous import of the extern crate `alloc` here
 
 mod alloc {
 //~^ ERROR the name `alloc` is defined multiple times [E0260]
-//~| NOTE `alloc` redefined here
-//~| NOTE `alloc` must be defined only once in the type namespace of this module
     pub trait MyTrait {
         fn do_something();
     }
diff --git a/src/test/compile-fail/E0263.rs b/src/test/compile-fail/E0263.rs
index 11a8ff443a845..722f1c25e07d1 100644
--- a/src/test/compile-fail/E0263.rs
+++ b/src/test/compile-fail/E0263.rs
@@ -10,8 +10,6 @@
 
 fn foo<'a, 'b, 'a>(x: &'a str, y: &'b str) {
     //~^ ERROR E0263
-    //~| NOTE declared twice
-    //~| NOTE previous declaration here
 }
 
 fn main() {}
diff --git a/src/test/compile-fail/E0267.rs b/src/test/compile-fail/E0267.rs
index b58fbce8bc648..6287256e866c9 100644
--- a/src/test/compile-fail/E0267.rs
+++ b/src/test/compile-fail/E0267.rs
@@ -10,5 +10,4 @@
 
 fn main() {
     let w = || { break; }; //~ ERROR E0267
-            //~| NOTE cannot break inside of a closure
 }
diff --git a/src/test/compile-fail/E0268.rs b/src/test/compile-fail/E0268.rs
index 3313e07667a1c..41e88e2f492a9 100644
--- a/src/test/compile-fail/E0268.rs
+++ b/src/test/compile-fail/E0268.rs
@@ -10,5 +10,4 @@
 
 fn main() {
     break; //~ ERROR E0268
-    //~| NOTE cannot break outside of a loop
 }
diff --git a/src/test/compile-fail/E0277-2.rs b/src/test/compile-fail/E0277-2.rs
index 816d352955427..4d1c50002a39c 100644
--- a/src/test/compile-fail/E0277-2.rs
+++ b/src/test/compile-fail/E0277-2.rs
@@ -25,9 +25,4 @@ fn is_send<T: Send>() { }
 fn main() {
     is_send::<Foo>();
     //~^ ERROR the trait bound `*const u8: std::marker::Send` is not satisfied in `Foo`
-    //~| NOTE: `*const u8` cannot be sent between threads safely
-    //~| NOTE: required because it appears within the type `Baz`
-    //~| NOTE: required because it appears within the type `Bar`
-    //~| NOTE: required because it appears within the type `Foo`
-    //~| NOTE: required by `is_send`
 }
diff --git a/src/test/compile-fail/E0277.rs b/src/test/compile-fail/E0277.rs
index 8b34936419db5..784f7465d439b 100644
--- a/src/test/compile-fail/E0277.rs
+++ b/src/test/compile-fail/E0277.rs
@@ -20,13 +20,8 @@ fn some_func<T: Foo>(foo: T) {
 
 fn f(p: Path) { }
 //~^ ERROR the trait bound `[u8]: std::marker::Sized` is not satisfied in `std::path::Path`
-//~| NOTE `[u8]` does not have a constant size known at compile-time
-//~| NOTE required because it appears within the type `std::path::Path`
-//~| NOTE all local variables must have a statically known size
 
 fn main() {
     some_func(5i32);
     //~^ ERROR the trait bound `i32: Foo` is not satisfied
-    //~| NOTE the trait `Foo` is not implemented for `i32`
-    //~| NOTE required by `some_func`
 }
diff --git a/src/test/compile-fail/E0297.rs b/src/test/compile-fail/E0297.rs
index 436e4c1f9d22e..afe4444c7afdf 100644
--- a/src/test/compile-fail/E0297.rs
+++ b/src/test/compile-fail/E0297.rs
@@ -13,5 +13,4 @@ fn main() {
 
     for Some(x) in xs {}
     //~^ ERROR E0005
-    //~| NOTE pattern `None` not covered
 }
diff --git a/src/test/compile-fail/E0301.rs b/src/test/compile-fail/E0301.rs
index b7872509f5408..06e98289b0d57 100644
--- a/src/test/compile-fail/E0301.rs
+++ b/src/test/compile-fail/E0301.rs
@@ -12,7 +12,6 @@ fn main() {
     match Some(()) {
         None => { },
         option if option.take().is_none() => {}, //~ ERROR E0301
-        //~| NOTE borrowed mutably in pattern guard
         Some(_) => { }
     }
 }
diff --git a/src/test/compile-fail/E0302.rs b/src/test/compile-fail/E0302.rs
index 5ad74fd6cab05..6a5ad40b10907 100644
--- a/src/test/compile-fail/E0302.rs
+++ b/src/test/compile-fail/E0302.rs
@@ -12,7 +12,6 @@ fn main() {
     match Some(()) {
         None => { },
         option if { option = None; false } => { }, //~ ERROR E0302
-        //~| NOTE assignment in pattern guard
         Some(_) => { }
     }
 }
diff --git a/src/test/compile-fail/E0303.rs b/src/test/compile-fail/E0303.rs
index e631fe2a8a7cc..6027414fdbd4b 100644
--- a/src/test/compile-fail/E0303.rs
+++ b/src/test/compile-fail/E0303.rs
@@ -12,10 +12,7 @@ fn main() {
     match Some("hi".to_string()) {
         ref op_string_ref @ Some(s) => {},
         //~^ ERROR pattern bindings are not allowed after an `@` [E0303]
-        //~| NOTE not allowed after `@`
         //~| ERROR E0009
-        //~| NOTE by-move pattern here
-        //~| NOTE both by-ref and by-move used
         None => {},
     }
 }
diff --git a/src/test/compile-fail/E0365.rs b/src/test/compile-fail/E0365.rs
index ea5fd6ed4772f..a1efcde42b05b 100644
--- a/src/test/compile-fail/E0365.rs
+++ b/src/test/compile-fail/E0365.rs
@@ -14,7 +14,5 @@ mod foo {
 
 pub use foo as foo2;
 //~^ ERROR `foo` is private, and cannot be reexported [E0365]
-//~| NOTE reexport of private `foo`
-//~| NOTE consider declaring type or module `foo` with `pub`
 
 fn main() {}
diff --git a/src/test/compile-fail/E0375.rs b/src/test/compile-fail/E0375.rs
index 29d8e920c4ce7..094ed35cc2d6d 100644
--- a/src/test/compile-fail/E0375.rs
+++ b/src/test/compile-fail/E0375.rs
@@ -21,8 +21,5 @@ struct Foo<T: ?Sized, U: ?Sized> {
 
 impl<T, U> CoerceUnsized<Foo<U, T>> for Foo<T, U> {}
 //~^ ERROR E0375
-//~| NOTE requires multiple coercions
-//~| NOTE `CoerceUnsized` may only be implemented for a coercion between structures with one field being coerced
-//~| NOTE currently, 2 fields need coercions: b (T to U), c (U to T)
 
 fn main() {}
diff --git a/src/test/compile-fail/E0389.rs b/src/test/compile-fail/E0389.rs
index 584dfd5fa440c..445831bf8d7f7 100644
--- a/src/test/compile-fail/E0389.rs
+++ b/src/test/compile-fail/E0389.rs
@@ -16,6 +16,5 @@ fn main() {
     let mut fancy = FancyNum{ num: 5 };
     let fancy_ref = &(&mut fancy);
     fancy_ref.num = 6; //~ ERROR E0389
-                       //~^ NOTE assignment into an immutable reference
     println!("{}", fancy_ref.num);
 }
diff --git a/src/test/compile-fail/E0392.rs b/src/test/compile-fail/E0392.rs
index a21e500e519bb..4c3efcf4e8d75 100644
--- a/src/test/compile-fail/E0392.rs
+++ b/src/test/compile-fail/E0392.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 enum Foo<T> { Bar } //~ ERROR E0392
-                    //~| NOTE unused type parameter
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0393.rs b/src/test/compile-fail/E0393.rs
index f045e873519cd..9165bc2837b51 100644
--- a/src/test/compile-fail/E0393.rs
+++ b/src/test/compile-fail/E0393.rs
@@ -12,8 +12,6 @@ trait A<T=Self> {}
 
 fn together_we_will_rule_the_galaxy(son: &A) {}
 //~^ ERROR E0393
-//~| NOTE missing reference to `T`
-//~| NOTE because of the default `Self` reference, type parameters must be specified on object types
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0394.rs b/src/test/compile-fail/E0394.rs
index c7d5665cd2c58..dae8e14c5ef18 100644
--- a/src/test/compile-fail/E0394.rs
+++ b/src/test/compile-fail/E0394.rs
@@ -13,8 +13,6 @@
 static A: u32 = 0;
 static B: u32 = A;
 //~^ ERROR E0394
-//~| NOTE referring to another static by value
-//~| NOTE use the address-of operator or a constant instead
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0395.rs b/src/test/compile-fail/E0395.rs
index 98f08cd68c22d..00008ea6b6f37 100644
--- a/src/test/compile-fail/E0395.rs
+++ b/src/test/compile-fail/E0395.rs
@@ -12,6 +12,5 @@ static FOO: i32 = 42;
 static BAR: i32 = 42;
 
 static BAZ: bool = { (&FOO as *const i32) == (&BAR as *const i32) }; //~ ERROR E0395
-                   //~| NOTE comparing raw pointers in static
 fn main() {
 }
diff --git a/src/test/compile-fail/E0396.rs b/src/test/compile-fail/E0396.rs
index 47080fb6e9ef7..7f34acdfb9007 100644
--- a/src/test/compile-fail/E0396.rs
+++ b/src/test/compile-fail/E0396.rs
@@ -11,7 +11,6 @@
 const REG_ADDR: *const u8 = 0x5f3759df as *const u8;
 
 const VALUE: u8 = unsafe { *REG_ADDR }; //~ ERROR E0396
-                  //~| NOTE dereference of raw pointer in constant
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0403.rs b/src/test/compile-fail/E0403.rs
index cd8532fc4c305..6a68013dc6ffe 100644
--- a/src/test/compile-fail/E0403.rs
+++ b/src/test/compile-fail/E0403.rs
@@ -9,8 +9,6 @@
 // except according to those terms.
 
 fn foo<T, T>(s: T, u: T) {} //~ ERROR E0403
-                            //~| NOTE already used
-                            //~| NOTE first use of `T`
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0407.rs b/src/test/compile-fail/E0407.rs
index c207dbfca5565..41d8b4513ce53 100644
--- a/src/test/compile-fail/E0407.rs
+++ b/src/test/compile-fail/E0407.rs
@@ -18,7 +18,6 @@ impl Foo for Bar {
     fn a() {}
     fn b() {}
     //~^ ERROR E0407
-    //~| NOTE not a member of trait `Foo`
 }
 
 fn main() {
diff --git a/src/test/compile-fail/E0408.rs b/src/test/compile-fail/E0408.rs
index ce77a537e263d..8ddeb20afdc1e 100644
--- a/src/test/compile-fail/E0408.rs
+++ b/src/test/compile-fail/E0408.rs
@@ -13,7 +13,6 @@ fn main() {
 
     match x {
         Some(y) | None => {} //~  ERROR variable `y` is not bound in all patterns
-        _ => ()              //~| NOTE pattern doesn't bind `y`
-                             //~| NOTE variable not in all patterns
+        _ => ()
     }
 }
diff --git a/src/test/compile-fail/E0426.rs b/src/test/compile-fail/E0426.rs
index be21421cb0781..d6261d3a74e15 100644
--- a/src/test/compile-fail/E0426.rs
+++ b/src/test/compile-fail/E0426.rs
@@ -12,6 +12,5 @@ fn main () {
     loop {
         break 'a;
         //~^ ERROR E0426
-        //~| NOTE undeclared label `'a`
     }
 }
diff --git a/src/test/compile-fail/E0428.rs b/src/test/compile-fail/E0428.rs
index 4042219b5cc1a..3c709f3a39922 100644
--- a/src/test/compile-fail/E0428.rs
+++ b/src/test/compile-fail/E0428.rs
@@ -10,8 +10,6 @@
 
 struct Bar; //~ previous definition of the type `Bar` here
 struct Bar; //~ ERROR E0428
-            //~| NOTE `Bar` redefined here
-            //~| NOTE `Bar` must be defined only once in the type namespace of this module
 
 fn main () {
 }
diff --git a/src/test/compile-fail/E0435.rs b/src/test/compile-fail/E0435.rs
index 50a6d174e222a..5246fda6aaf6f 100644
--- a/src/test/compile-fail/E0435.rs
+++ b/src/test/compile-fail/E0435.rs
@@ -11,5 +11,4 @@
 fn main () {
     let foo = 42u32;
     let _: [u8; foo]; //~ ERROR E0435
-    //~| NOTE non-constant value
 }
diff --git a/src/test/compile-fail/E0437.rs b/src/test/compile-fail/E0437.rs
index 62ee8dc346492..7440a82773e7a 100644
--- a/src/test/compile-fail/E0437.rs
+++ b/src/test/compile-fail/E0437.rs
@@ -12,7 +12,6 @@ trait Foo {}
 
 impl Foo for i32 {
     type Bar = bool; //~ ERROR E0437
-    //~| NOTE not a member of trait `Foo`
 }
 
 fn main () {
diff --git a/src/test/compile-fail/E0438.rs b/src/test/compile-fail/E0438.rs
index 99e0dbbcea804..61d25134993f0 100644
--- a/src/test/compile-fail/E0438.rs
+++ b/src/test/compile-fail/E0438.rs
@@ -13,7 +13,6 @@ trait Bar {}
 
 impl Bar for i32 {
     const BAR: bool = true; //~ ERROR E0438
-        //~| NOTE not a member of trait `Bar`
 }
 
 fn main () {
diff --git a/src/test/compile-fail/E0445.rs b/src/test/compile-fail/E0445.rs
index efef8305e5354..a1447e7ebcddc 100644
--- a/src/test/compile-fail/E0445.rs
+++ b/src/test/compile-fail/E0445.rs
@@ -14,12 +14,9 @@ trait Foo {
 
 pub trait Bar : Foo {}
 //~^ ERROR private trait `Foo` in public interface [E0445]
-//~| NOTE private trait can't be public
 pub struct Bar2<T: Foo>(pub T);
 //~^ ERROR private trait `Foo` in public interface [E0445]
-//~| NOTE private trait can't be public
 pub fn foo<T: Foo> (t: T) {}
 //~^ ERROR private trait `Foo` in public interface [E0445]
-//~| NOTE private trait can't be public
 
 fn main() {}
diff --git a/src/test/compile-fail/E0446.rs b/src/test/compile-fail/E0446.rs
index 493a272261776..c576661828471 100644
--- a/src/test/compile-fail/E0446.rs
+++ b/src/test/compile-fail/E0446.rs
@@ -12,7 +12,6 @@ mod Foo {
     struct Bar(u32);
 
     pub fn bar() -> Bar { //~ ERROR E0446
-                          //~| NOTE can't leak private type
         Bar(0)
     }
 }
diff --git a/src/test/compile-fail/E0449.rs b/src/test/compile-fail/E0449.rs
index 0b3fdb9e6abe6..ac365db33e5cd 100644
--- a/src/test/compile-fail/E0449.rs
+++ b/src/test/compile-fail/E0449.rs
@@ -15,13 +15,9 @@ trait Foo {
 }
 
 pub impl Bar {} //~ ERROR E0449
-                //~| NOTE `pub` not needed here
-                //~| NOTE place qualifiers on individual impl items instead
 
 pub impl Foo for Bar { //~ ERROR E0449
-                       //~| NOTE `pub` not needed here
     pub fn foo() {} //~ ERROR E0449
-                    //~| NOTE `pub` not needed here
 }
 
 fn main() {
diff --git a/src/test/compile-fail/E0451.rs b/src/test/compile-fail/E0451.rs
index ace96c9983e66..af4e7d628bb25 100644
--- a/src/test/compile-fail/E0451.rs
+++ b/src/test/compile-fail/E0451.rs
@@ -22,10 +22,8 @@ mod Bar {
 
 fn pat_match(foo: Bar::Foo) {
     let Bar::Foo{a:a, b:b} = foo; //~ ERROR E0451
-                                  //~^ NOTE field `b` is private
 }
 
 fn main() {
     let f = Bar::Foo{ a: 0, b: 0 }; //~ ERROR E0451
-                                    //~^ NOTE field `b` is private
 }
diff --git a/src/test/compile-fail/E0453.rs b/src/test/compile-fail/E0453.rs
index 6fed3dca94ef1..8e51b84bab8e6 100644
--- a/src/test/compile-fail/E0453.rs
+++ b/src/test/compile-fail/E0453.rs
@@ -9,10 +9,8 @@
 // except according to those terms.
 
 #![forbid(non_snake_case)]
-//~^ NOTE `forbid` level set here
 
 #[allow(non_snake_case)]
 //~^ ERROR allow(non_snake_case) overruled by outer forbid(non_snake_case)
-//~| NOTE overruled by previous forbid
 fn main() {
 }
diff --git a/src/test/compile-fail/E0454.rs b/src/test/compile-fail/E0454.rs
index 39887927c885f..afd0f5f5e461e 100644
--- a/src/test/compile-fail/E0454.rs
+++ b/src/test/compile-fail/E0454.rs
@@ -10,7 +10,6 @@
 
 #[link(name = "")] extern {}
 //~^ ERROR E0454
-//~| NOTE empty name given
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0458.rs b/src/test/compile-fail/E0458.rs
index e87158ae3b03f..fea27ef811586 100644
--- a/src/test/compile-fail/E0458.rs
+++ b/src/test/compile-fail/E0458.rs
@@ -9,9 +9,7 @@
 // except according to those terms.
 
 #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
-                                              //~| NOTE unknown kind
                                               //~| ERROR E0459
-                                              //~| NOTE missing `name` argument
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0459.rs b/src/test/compile-fail/E0459.rs
index 41376bd9ef5a2..dc7ac714f2239 100644
--- a/src/test/compile-fail/E0459.rs
+++ b/src/test/compile-fail/E0459.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #[link(kind = "dylib")] extern {} //~ ERROR E0459
-                                  //~| NOTE missing `name` argument
 
 fn main() {
 }
diff --git a/src/test/compile-fail/E0463.rs b/src/test/compile-fail/E0463.rs
index 3ce5b83e89fd4..aae83975b22f8 100644
--- a/src/test/compile-fail/E0463.rs
+++ b/src/test/compile-fail/E0463.rs
@@ -11,7 +11,6 @@
 #![feature(plugin)]
 #![plugin(cookie_monster)]
 //~^ ERROR E0463
-//~| NOTE can't find crate
 extern crate cake_is_a_lie;
 
 fn main() {
diff --git a/src/test/compile-fail/E0496.rs b/src/test/compile-fail/E0496.rs
index 8aeeeebcb5676..4ca3cd9c13da6 100644
--- a/src/test/compile-fail/E0496.rs
+++ b/src/test/compile-fail/E0496.rs
@@ -13,9 +13,7 @@ struct Foo<'a> {
 }
 
 impl<'a> Foo<'a> {
-   //~^  NOTE first declared here
     fn f<'a>(x: &'a i32) { //~ ERROR E0496
-       //~^ NOTE lifetime 'a already in scope
     }
 }
 
diff --git a/src/test/compile-fail/E0517.rs b/src/test/compile-fail/E0517.rs
index 7feda670f52a3..561223ccdf11e 100644
--- a/src/test/compile-fail/E0517.rs
+++ b/src/test/compile-fail/E0517.rs
@@ -9,16 +9,16 @@
 // except according to those terms.
 
 #[repr(C)] //~ ERROR: E0517
-type Foo = u8; //~ NOTE: not a struct, enum or union
+type Foo = u8;
 
 #[repr(packed)] //~ ERROR: E0517
-enum Foo2 {Bar, Baz} //~ NOTE: not a struct
+enum Foo2 {Bar, Baz}
 
 #[repr(u8)] //~ ERROR: E0517
-struct Foo3 {bar: bool, baz: bool} //~ NOTE: not an enum
+struct Foo3 {bar: bool, baz: bool}
 
 #[repr(C)] //~ ERROR: E0517
-impl Foo3 { //~ NOTE: not a struct, enum or union
+impl Foo3 {
 }
 
 fn main() {
diff --git a/src/test/compile-fail/E0518.rs b/src/test/compile-fail/E0518.rs
index 63d40db0049da..6d5b6e48e0dab 100644
--- a/src/test/compile-fail/E0518.rs
+++ b/src/test/compile-fail/E0518.rs
@@ -9,10 +9,10 @@
 // except according to those terms.
 
 #[inline(always)] //~ ERROR: E0518
-struct Foo;       //~ NOTE: not a function
+struct Foo;
 
 #[inline(never)] //~ ERROR: E0518
-impl Foo {       //~ NOTE: not a function
+impl Foo {
 }
 
 fn main() {
diff --git a/src/test/compile-fail/E0520.rs b/src/test/compile-fail/E0520.rs
index ff6152d377f67..eae5b11a81904 100644
--- a/src/test/compile-fail/E0520.rs
+++ b/src/test/compile-fail/E0520.rs
@@ -19,15 +19,12 @@ impl<T> SpaceLlama for T {
 }
 
 impl<T: Clone> SpaceLlama for T {
-//~^ NOTE parent `impl` is here
     fn fly(&self) {}
 }
 
 impl SpaceLlama for i32 {
     default fn fly(&self) {}
     //~^ ERROR E0520
-    //~| NOTE cannot specialize default item `fly`
-    //~| NOTE `fly` in the parent `impl` must be marked `default`
 }
 
 fn main() {
diff --git a/src/test/compile-fail/E0527.rs b/src/test/compile-fail/E0527.rs
index 0b664094a40d7..67d222e867e63 100644
--- a/src/test/compile-fail/E0527.rs
+++ b/src/test/compile-fail/E0527.rs
@@ -15,7 +15,6 @@ fn main() {
     match r {
         &[a, b] => {
             //~^ ERROR E0527
-            //~| NOTE expected 4 elements
             println!("a={}, b={}", a, b);
         }
     }
diff --git a/src/test/compile-fail/E0528.rs b/src/test/compile-fail/E0528.rs
index e912650f11292..e2aa2c067cbcd 100644
--- a/src/test/compile-fail/E0528.rs
+++ b/src/test/compile-fail/E0528.rs
@@ -15,7 +15,6 @@ fn main() {
     match r {
         &[a, b, c, rest..] => {
         //~^ ERROR E0528
-        //~| NOTE pattern cannot match array of 2 elements
         }
     }
 }
diff --git a/src/test/compile-fail/E0529.rs b/src/test/compile-fail/E0529.rs
index 18d3e68816aad..5262ad7b716f5 100644
--- a/src/test/compile-fail/E0529.rs
+++ b/src/test/compile-fail/E0529.rs
@@ -15,7 +15,6 @@ fn main() {
     match r {
         [a, b] => {
         //~^ ERROR E0529
-        //~| NOTE pattern cannot match with input type `f32`
         }
     }
 }
diff --git a/src/test/compile-fail/E0558.rs b/src/test/compile-fail/E0558.rs
index 0c2ca69849166..64a6ee4cf5872 100644
--- a/src/test/compile-fail/E0558.rs
+++ b/src/test/compile-fail/E0558.rs
@@ -10,7 +10,6 @@
 
 #[export_name]
 //~^ ERROR E0558
-//~| NOTE did you mean #[export_name="*"]?
 
 pub fn something() {}
 
diff --git a/src/test/compile-fail/E0559.rs b/src/test/compile-fail/E0559.rs
index e8b0915d2b533..da0f692cc2839 100644
--- a/src/test/compile-fail/E0559.rs
+++ b/src/test/compile-fail/E0559.rs
@@ -15,6 +15,4 @@ enum Field {
 fn main() {
     let s = Field::Fool { joke: 0 };
     //~^ ERROR E0559
-    //~| NOTE `Field::Fool` does not have this field
-    //~| NOTE available fields are: `x`
 }
diff --git a/src/test/compile-fail/E0560.rs b/src/test/compile-fail/E0560.rs
index 955ef7ca99ceb..bbb7f08d62e35 100644
--- a/src/test/compile-fail/E0560.rs
+++ b/src/test/compile-fail/E0560.rs
@@ -15,6 +15,4 @@ struct Simba {
 fn main() {
     let s = Simba { mother: 1, father: 0 };
     //~^ ERROR E0560
-    //~| NOTE `Simba` does not have this field
-    //~| NOTE available fields are: `mother`
 }
diff --git a/src/test/compile-fail/E0605.rs b/src/test/compile-fail/E0605.rs
index add3fd8fd8ac2..4b5b8beb36865 100644
--- a/src/test/compile-fail/E0605.rs
+++ b/src/test/compile-fail/E0605.rs
@@ -11,9 +11,7 @@
 fn main() {
     let x = 0u8;
     x as Vec<u8>; //~ ERROR E0605
-                  //~| NOTE an `as` expression can only be used to convert between primitive types
 
     let v = 0 as *const u8;
     v as &u8; //~ ERROR E0605
-              //~| NOTE an `as` expression can only be used to convert between primitive types
 }
diff --git a/src/test/compile-fail/E0618.rs b/src/test/compile-fail/E0618.rs
index 1ba2e8e2e5613..f28ac200dea5a 100644
--- a/src/test/compile-fail/E0618.rs
+++ b/src/test/compile-fail/E0618.rs
@@ -14,7 +14,6 @@ enum X {
 
 fn main() {
     X::Entry(); //~ ERROR expected function, found `X::Entry` [E0618]
-                //~| HELP did you mean to write `X::Entry`?
     let x = 0i32;
     x(); //~ ERROR expected function, found `i32` [E0618]
 }