diff --git a/src/test/compile-fail/rustc-diagnostics-1.rs b/src/test/compile-fail/rustc-diagnostics-1.rs
deleted file mode 100644
index 55d836092fa..00000000000
--- a/src/test/compile-fail/rustc-diagnostics-1.rs
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_diagnostic_macros)]
-
-__register_diagnostic!(E0001)
-__register_diagnostic!(E0003)
-
-fn main() {
-    __diagnostic_used!(E0002);
-    //~^ ERROR unknown diagnostic code E0002
-
-    __diagnostic_used!(E0001);
-    //~^ NOTE previous invocation
-
-    __diagnostic_used!(E0001);
-    //~^ WARNING diagnostic code E0001 already used
-}
-
-__build_diagnostic_array!(DIAGNOSTICS)
-//~^ WARN diagnostic code E0003 never used
diff --git a/src/test/compile-fail/rustc-diagnostics-2.rs b/src/test/compile-fail/rustc-diagnostics-2.rs
deleted file mode 100644
index c4e011bcea0..00000000000
--- a/src/test/compile-fail/rustc-diagnostics-2.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-#![feature(rustc_diagnostic_macros)]
-
-__register_diagnostic!(E0001)
-__register_diagnostic!(E0001)
-//~^ ERROR diagnostic code E0001 already registered
-
-fn main() {
-}
-
-__build_diagnostic_array!(DIAGNOSTICS)
diff --git a/src/test/compile-fail/rustc-diagnostics-3.rs b/src/test/compile-fail/rustc-diagnostics-3.rs
deleted file mode 100644
index d160664a48c..00000000000
--- a/src/test/compile-fail/rustc-diagnostics-3.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-__register_diagnostic!(E0001)
-//~^ ERROR macro undefined: '__register_diagnostic!'
-
-fn main() {
-    __diagnostic_used!(E0001);
-    //~^ ERROR macro undefined: '__diagnostic_used!'
-}
-
-__build_diagnostic_array!(DIAGNOSTICS)
-//~^ ERROR macro undefined: '__build_diagnostic_array!'