diff --git a/src/test/compile-fail/issue-16939.rs b/src/test/compile-fail/issue-16939.rs
index 8e7a2a9db3d3333e8f117ceebd962d57a72a3ecc..e7d3d15e5a938893b2d5d32f06b66d656a94c830 100644
--- a/src/test/compile-fail/issue-16939.rs
+++ b/src/test/compile-fail/issue-16939.rs
@@ -14,7 +14,7 @@
 // wrong arity.
 
 fn _foo<F: Fn()> (f: F) {
-    |t| f(t); //~ ERROR E0058
+    |t| f(t); //~ ERROR E0057
 }
 
 fn main() {}
diff --git a/src/test/compile-fail/non-constant-enum-for-vec-repeat.rs b/src/test/compile-fail/non-constant-enum-for-vec-repeat.rs
index c4d5d734a71953383f066325d5913dac2df45fc7..87fe50c86665c1735cfcd160711b746a14f747e4 100644
--- a/src/test/compile-fail/non-constant-enum-for-vec-repeat.rs
+++ b/src/test/compile-fail/non-constant-enum-for-vec-repeat.rs
@@ -12,5 +12,5 @@ enum State { ST_NULL, ST_WHITESPACE }
 
 fn main() {
     [ST_NULL, ..(ST_WHITESPACE as uint)];
-    //~^ ERROR expected constant integer for repeat count, found variable
+    //~^ ERROR expected constant integer for repeat count, found non-constant expression
 }
diff --git a/src/test/compile-fail/repeat_count.rs b/src/test/compile-fail/repeat_count.rs
index be79a7a915b881b346e9091b804d4dc0ac6dcb1e..38fbb426fb19885259fc9f90e69d4af3e1b8d30f 100644
--- a/src/test/compile-fail/repeat_count.rs
+++ b/src/test/compile-fail/repeat_count.rs
@@ -13,8 +13,9 @@
 fn main() {
     let n = 1;
     let a = [0, ..n]; //~ ERROR expected constant integer for repeat count, found variable
-    let b = [0, ..()]; //~ ERROR expected positive integer for repeat count, found ()
-    //~^ ERROR: expected `uint`, found `()`
+    let b = [0, ..()];
+//~^ ERROR expected constant integer for repeat count, found non-constant expression
+//~^^ ERROR: expected `uint`, found `()`
     let c = [0, ..true]; //~ ERROR expected positive integer for repeat count, found boolean
     //~^ ERROR: expected `uint`, found `bool`
     let d = [0, ..0.5]; //~ ERROR expected positive integer for repeat count, found float
diff --git a/src/test/run-pass/concat.rs b/src/test/run-pass/concat.rs
index 21c247cc69e44c4a966b8fa2c59f8cc2be910414..d78f948edc5c7d75367e63c7c102e792e3465f82 100644
--- a/src/test/run-pass/concat.rs
+++ b/src/test/run-pass/concat.rs
@@ -15,12 +15,12 @@ pub fn main() {
     assert_eq!(concat!("qux", "quux",).to_string(), "quxquux".to_string());
 
     assert_eq!(
-        concat!(1, 2i, 3u, 4f32, 4.0, 'a', true, ()),
+        concat!(1, 2i, 3u, 4f32, 4.0, 'a', true),
         "12344.0atrue"
     );
 
     assert!(match "12344.0atrue" {
-        concat!(1, 2i, 3u, 4f32, 4.0, 'a', true, ()) => true,
+        concat!(1, 2i, 3u, 4f32, 4.0, 'a', true) => true,
         _ => false
     })
 }