diff --git a/tests/compiletest.rs b/tests/compiletest.rs
index 008fc780645..4270c60c4c3 100644
--- a/tests/compiletest.rs
+++ b/tests/compiletest.rs
@@ -106,6 +106,8 @@ macro_rules! regexes {
     "[^ `]*/(rust[^/]*|checkout)/library/" => "RUSTLIB/",
     // erase platform file paths
     "sys/[a-z]+/"                    => "sys/PLATFORM/",
+    // erase error annotations
+    "//(\\[[a-z,]+\\])?~.*"                    => "",
 }
 
 fn ui(mode: Mode, path: &str) -> Result<()> {
diff --git a/tests/fail/function_calls/exported_symbol_bad_unwind2.both.stderr b/tests/fail/function_calls/exported_symbol_bad_unwind2.both.stderr
index 74f1d2b1131..9bc70225c56 100644
--- a/tests/fail/function_calls/exported_symbol_bad_unwind2.both.stderr
+++ b/tests/fail/function_calls/exported_symbol_bad_unwind2.both.stderr
@@ -4,8 +4,8 @@ error: abnormal termination: the program aborted execution
   --> $DIR/exported_symbol_bad_unwind2.rs:LL:CC
    |
 LL | / extern "C-unwind" fn nounwind() {
-LL | |     //[definition]~^ ERROR: abnormal termination: the program aborted execution
-LL | |     //[both]~^^ ERROR: abnormal termination: the program aborted execution
+LL | |     
+LL | |     
 LL | |     panic!();
 LL | | }
    | |_^ the program aborted execution
diff --git a/tests/fail/function_calls/exported_symbol_bad_unwind2.definition.stderr b/tests/fail/function_calls/exported_symbol_bad_unwind2.definition.stderr
index 74f1d2b1131..9bc70225c56 100644
--- a/tests/fail/function_calls/exported_symbol_bad_unwind2.definition.stderr
+++ b/tests/fail/function_calls/exported_symbol_bad_unwind2.definition.stderr
@@ -4,8 +4,8 @@ error: abnormal termination: the program aborted execution
   --> $DIR/exported_symbol_bad_unwind2.rs:LL:CC
    |
 LL | / extern "C-unwind" fn nounwind() {
-LL | |     //[definition]~^ ERROR: abnormal termination: the program aborted execution
-LL | |     //[both]~^^ ERROR: abnormal termination: the program aborted execution
+LL | |     
+LL | |     
 LL | |     panic!();
 LL | | }
    | |_^ the program aborted execution