diff --git a/src/test/compile-fail/enum-in-scope.rs b/src/test/compile-fail/enum-in-scope.rs
index e1d86936d029..4f3d4424c039 100644
--- a/src/test/compile-fail/enum-in-scope.rs
+++ b/src/test/compile-fail/enum-in-scope.rs
@@ -1,5 +1,5 @@
 enum hello = int;
 
 fn main() {
-    let hello = 0; //~ERROR declaration of `hello` shadows an enum that's in
-}
\ No newline at end of file
+    let hello = 0; //~ERROR declaration of `hello` shadows
+}
diff --git a/src/test/compile-fail/issue-2370-2.rs b/src/test/compile-fail/issue-2370-2.rs
index 273483415fc1..98dc177dbc38 100644
--- a/src/test/compile-fail/issue-2370-2.rs
+++ b/src/test/compile-fail/issue-2370-2.rs
@@ -1,4 +1,4 @@
-// error-pattern: type cat cannot be dereferenced
+// error-pattern: can only dereference structs
 struct cat {
     x: ()
 }
@@ -6,4 +6,4 @@ struct cat {
 fn main() {
     let kitty : cat = cat { x: () };
     log (error, *kitty);
-}
\ No newline at end of file
+}
diff --git a/src/test/compile-fail/issue-2370.rs b/src/test/compile-fail/issue-2370.rs
index dd8de95fdaab..1a67b4e657b0 100644
--- a/src/test/compile-fail/issue-2370.rs
+++ b/src/test/compile-fail/issue-2370.rs
@@ -1,4 +1,4 @@
-// error-pattern: type cat cannot be dereferenced
+// error-pattern: can only dereference structs
 struct cat {
     foo: ()
 }
@@ -6,4 +6,4 @@ struct cat {
 fn main() {
     let nyan = cat { foo: () };
     log (error, *nyan);
-}
\ No newline at end of file
+}
diff --git a/src/test/compile-fail/issue-2509-a.rs b/src/test/compile-fail/issue-2509-a.rs
deleted file mode 100644
index a24e3bdee361..000000000000
--- a/src/test/compile-fail/issue-2509-a.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-struct c { //~ ERROR a struct must have at least one field
-}
-
-fn main() {
-}
diff --git a/src/test/compile-fail/pat-shadow-in-nested-binding.rs b/src/test/compile-fail/pat-shadow-in-nested-binding.rs
index c4ba51318791..df00e3b2655c 100644
--- a/src/test/compile-fail/pat-shadow-in-nested-binding.rs
+++ b/src/test/compile-fail/pat-shadow-in-nested-binding.rs
@@ -1,5 +1,5 @@
 enum foo = uint;
 
 fn main() {
-    let (foo, _) = (2, 3); //~ ERROR declaration of `foo` shadows an enum that's in scope
+    let (foo, _) = (2, 3); //~ ERROR declaration of `foo` shadows
 }