diff --git a/src/test/compile-fail/const-eval-overflow2.rs b/src/test/compile-fail/const-eval-overflow2.rs
index aa735cc0453..ef1cdb2814f 100644
--- a/src/test/compile-fail/const-eval-overflow2.rs
+++ b/src/test/compile-fail/const-eval-overflow2.rs
@@ -26,6 +26,7 @@ const VALS_I8: (i8,) =
      //~| attempt to subtract with overflow
     (
      i8::MIN - 1,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_I16: (i16,) =
@@ -33,6 +34,7 @@ const VALS_I16: (i16,) =
      //~| attempt to subtract with overflow
     (
      i16::MIN - 1,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_I32: (i32,) =
@@ -40,6 +42,7 @@ const VALS_I32: (i32,) =
      //~| attempt to subtract with overflow
     (
      i32::MIN - 1,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_I64: (i64,) =
@@ -47,6 +50,7 @@ const VALS_I64: (i64,) =
      //~| attempt to subtract with overflow
     (
      i64::MIN - 1,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_U8: (u8,) =
@@ -54,18 +58,21 @@ const VALS_U8: (u8,) =
      //~| attempt to subtract with overflow
     (
      u8::MIN - 1,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_U16: (u16,) = (
      //~^ ERROR constant evaluation error
      //~| attempt to subtract with overflow
      u16::MIN - 1,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_U32: (u32,) = (
      //~^ ERROR constant evaluation error
      //~| attempt to subtract with overflow
      u32::MIN - 1,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_U64: (u64,) =
@@ -73,6 +80,7 @@ const VALS_U64: (u64,) =
      //~| attempt to subtract with overflow
     (
      u64::MIN - 1,
+     //~^ ERROR constant evaluation error
      );
 
 fn main() {
diff --git a/src/test/compile-fail/const-eval-overflow2b.rs b/src/test/compile-fail/const-eval-overflow2b.rs
index 01c3ea1ff42..347ba7603e2 100644
--- a/src/test/compile-fail/const-eval-overflow2b.rs
+++ b/src/test/compile-fail/const-eval-overflow2b.rs
@@ -26,6 +26,7 @@ const VALS_I8: (i8,) =
      //~| attempt to add with overflow
     (
      i8::MAX + 1,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_I16: (i16,) =
@@ -33,6 +34,7 @@ const VALS_I16: (i16,) =
      //~| attempt to add with overflow
     (
      i16::MAX + 1,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_I32: (i32,) =
@@ -40,6 +42,7 @@ const VALS_I32: (i32,) =
      //~| attempt to add with overflow
     (
      i32::MAX + 1,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_I64: (i64,) =
@@ -47,6 +50,7 @@ const VALS_I64: (i64,) =
      //~| attempt to add with overflow
     (
      i64::MAX + 1,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_U8: (u8,) =
@@ -54,18 +58,21 @@ const VALS_U8: (u8,) =
      //~| attempt to add with overflow
     (
      u8::MAX + 1,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_U16: (u16,) = (
      //~^ ERROR constant evaluation error
      //~| attempt to add with overflow
      u16::MAX + 1,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_U32: (u32,) = (
      //~^ ERROR constant evaluation error
      //~| attempt to add with overflow
      u32::MAX + 1,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_U64: (u64,) =
@@ -73,6 +80,7 @@ const VALS_U64: (u64,) =
      //~| attempt to add with overflow
     (
      u64::MAX + 1,
+     //~^ ERROR constant evaluation error
      );
 
 fn main() {
diff --git a/src/test/compile-fail/const-eval-overflow2c.rs b/src/test/compile-fail/const-eval-overflow2c.rs
index dd7c151d85f..5ebbab1b649 100644
--- a/src/test/compile-fail/const-eval-overflow2c.rs
+++ b/src/test/compile-fail/const-eval-overflow2c.rs
@@ -26,6 +26,7 @@ const VALS_I8: (i8,) =
      //~| attempt to multiply with overflow
     (
      i8::MIN * 2,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_I16: (i16,) =
@@ -33,6 +34,7 @@ const VALS_I16: (i16,) =
      //~| attempt to multiply with overflow
     (
      i16::MIN * 2,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_I32: (i32,) =
@@ -40,6 +42,7 @@ const VALS_I32: (i32,) =
      //~| attempt to multiply with overflow
     (
      i32::MIN * 2,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_I64: (i64,) =
@@ -47,6 +50,7 @@ const VALS_I64: (i64,) =
      //~| attempt to multiply with overflow
     (
      i64::MIN * 2,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_U8: (u8,) =
@@ -54,18 +58,21 @@ const VALS_U8: (u8,) =
      //~| attempt to multiply with overflow
     (
      u8::MAX * 2,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_U16: (u16,) = (
      //~^ ERROR constant evaluation error
      //~| attempt to multiply with overflow
      u16::MAX * 2,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_U32: (u32,) = (
      //~^ ERROR constant evaluation error
      //~| attempt to multiply with overflow
      u32::MAX * 2,
+     //~^ ERROR constant evaluation error
      );
 
 const VALS_U64: (u64,) =
@@ -73,6 +80,7 @@ const VALS_U64: (u64,) =
      //~| attempt to multiply with overflow
     (
      u64::MAX * 2,
+     //~^ ERROR constant evaluation error
      );
 
 fn main() {