diff --git a/src/lib.rs b/src/lib.rs
index 1ba763349aa7..e8bbe164611d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -249,6 +249,7 @@ pub fn eval_main<'a, 'tcx: 'a>(
         Ok(()) => {
             let leaks = ecx.memory().leak_report();
             if leaks != 0 {
+                // TODO: Prevent leaks which aren't supposed to be there
                 //tcx.sess.err("the evaluated program leaked memory");
             }
         }
diff --git a/tests/compile-fail/match_char.rs b/tests/compile-fail/match_char.rs
index 4fee6e692bad..15ce2f2f7952 100644
--- a/tests/compile-fail/match_char.rs
+++ b/tests/compile-fail/match_char.rs
@@ -1,6 +1,7 @@
 fn main() {
     assert!(std::char::from_u32(-1_i32 as u32).is_none());
-    match unsafe { std::mem::transmute::<i32, char>(-1) } { //~ERROR tried to interpret an invalid 32-bit value as a char: 4294967295
+    match unsafe { std::mem::transmute::<i32, char>(-1) } { //~ ERROR constant evaluation error [E0080]
+        //~^ NOTE tried to interpret an invalid 32-bit value as a char: 4294967295
         'a' => {},
         'b' => {},
         _ => {},
diff --git a/tests/compile-fail/overflowing-rsh-2.rs b/tests/compile-fail/overflowing-rsh-2.rs
index ac09a1740c43..4447b9d7579a 100644
--- a/tests/compile-fail/overflowing-rsh-2.rs
+++ b/tests/compile-fail/overflowing-rsh-2.rs
@@ -12,5 +12,6 @@
 
 fn main() {
     // Make sure we catch overflows that would be hidden by first casting the RHS to u32
-    let _n = 1i64 >> (u32::max_value() as i64 + 1); //~ Overflow(Shr)
+    let _n = 1i64 >> (u32::max_value() as i64 + 1); //~ ERROR constant evaluation error [E0080]
+    //~^ NOTE suiriuruihrihue
 }
diff --git a/tests/compile-fail/repeat.rs b/tests/compile-fail/repeat.rs
deleted file mode 100644
index 0367580f4ce9..000000000000
--- a/tests/compile-fail/repeat.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// error-pattern the type `[u8;
-
-fn main() {
-    let data: [u8; std::usize::MAX] = [42; std::usize::MAX];
-    assert_eq!(data.len(), 1024);
-}
diff --git a/tests/compile-fail/static_memory_modification.rs b/tests/compile-fail/static_memory_modification.rs
index 11961becb246..7182f40d994d 100644
--- a/tests/compile-fail/static_memory_modification.rs
+++ b/tests/compile-fail/static_memory_modification.rs
@@ -3,7 +3,8 @@ static X: usize = 5;
 #[allow(mutable_transmutes)]
 fn main() {
     unsafe {
-        *std::mem::transmute::<&usize, &mut usize>(&X) = 6; //~ ERROR: tried to modify constant memory
+        *std::mem::transmute::<&usize, &mut usize>(&X) = 6; //~ ERROR constant evaluation error [E0080]
+        //~^ NOTE tried to modify constant memory
         assert_eq!(X, 6);
     }
 }