diff --git a/src/test/run-pass/.gitattributes b/src/test/run-pass/.gitattributes
index 46db548a8c497..4517a4a2f1eec 100644
--- a/src/test/run-pass/.gitattributes
+++ b/src/test/run-pass/.gitattributes
@@ -1,2 +1 @@
-lexer-crlf-line-endings-string-literal-doc-comment.rs -text
 issue-16278.rs -text
diff --git a/src/test/run-pass/lib-defaults.rs b/src/test/run-pass/lib-defaults.rs
index fcaeda9a5495b..cc9ee2f374699 100644
--- a/src/test/run-pass/lib-defaults.rs
+++ b/src/test/run-pass/lib-defaults.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-wasm32-bare no libc to test ffi with
 
 // compile-flags: -lrust_test_helpers
diff --git a/src/test/run-pass/rustc-rust-log.rs b/src/test/run-pass/rustc-rust-log.rs
index 629387d4cb11d..ec27b10626e4e 100644
--- a/src/test/run-pass/rustc-rust-log.rs
+++ b/src/test/run-pass/rustc-rust-log.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // rustc-env:RUST_LOG=debug
 
 fn main() {}
diff --git a/src/test/ui/run-pass/.gitattributes b/src/test/ui/run-pass/.gitattributes
new file mode 100644
index 0000000000000..c6a6f23074de0
--- /dev/null
+++ b/src/test/ui/run-pass/.gitattributes
@@ -0,0 +1 @@
+lexer-crlf-line-endings-string-literal-doc-comment.rs -text
diff --git a/src/test/run-pass/alias-uninit-value.rs b/src/test/ui/run-pass/alias-uninit-value.rs
similarity index 94%
rename from src/test/run-pass/alias-uninit-value.rs
rename to src/test/ui/run-pass/alias-uninit-value.rs
index 77b9efb0012f0..62af5ca189eb3 100644
--- a/src/test/run-pass/alias-uninit-value.rs
+++ b/src/test/ui/run-pass/alias-uninit-value.rs
@@ -8,7 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
+// run-pass
+#![allow(non_camel_case_types)]
 
 // Regression test for issue #374
 
diff --git a/src/test/run-pass/alignment-gep-tup-like-1.rs b/src/test/ui/run-pass/alignment-gep-tup-like-1.rs
similarity index 95%
rename from src/test/run-pass/alignment-gep-tup-like-1.rs
rename to src/test/ui/run-pass/alignment-gep-tup-like-1.rs
index c1f75d5ee74ea..543af5e72f172 100644
--- a/src/test/run-pass/alignment-gep-tup-like-1.rs
+++ b/src/test/ui/run-pass/alignment-gep-tup-like-1.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 #![feature(box_syntax)]
 
 struct pair<A,B> {
diff --git a/src/test/run-pass/alloca-from-derived-tydesc.rs b/src/test/ui/run-pass/alloca-from-derived-tydesc.rs
similarity index 93%
rename from src/test/run-pass/alloca-from-derived-tydesc.rs
rename to src/test/ui/run-pass/alloca-from-derived-tydesc.rs
index 23a1e7998012c..aac3ced9ce743 100644
--- a/src/test/run-pass/alloca-from-derived-tydesc.rs
+++ b/src/test/ui/run-pass/alloca-from-derived-tydesc.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/allocator-alloc-one.rs b/src/test/ui/run-pass/allocator/allocator-alloc-one.rs
similarity index 95%
rename from src/test/run-pass/allocator-alloc-one.rs
rename to src/test/ui/run-pass/allocator/allocator-alloc-one.rs
index f15b013c07ba4..2118b34325e78 100644
--- a/src/test/run-pass/allocator-alloc-one.rs
+++ b/src/test/ui/run-pass/allocator/allocator-alloc-one.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+
 #![feature(allocator_api, nonnull)]
 
 use std::alloc::{Alloc, Global, Layout, handle_alloc_error};
diff --git a/src/test/run-pass/box-new.rs b/src/test/ui/run-pass/allocator/box-new.rs
similarity index 97%
rename from src/test/run-pass/box-new.rs
rename to src/test/ui/run-pass/allocator/box-new.rs
index a2d76d33993ba..0657d6476a856 100644
--- a/src/test/run-pass/box-new.rs
+++ b/src/test/ui/run-pass/allocator/box-new.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 fn main() {
diff --git a/src/test/run-pass/empty-allocation-non-null.rs b/src/test/ui/run-pass/allocator/empty-allocation-non-null.rs
similarity index 98%
rename from src/test/run-pass/empty-allocation-non-null.rs
rename to src/test/ui/run-pass/allocator/empty-allocation-non-null.rs
index 3dbe7da6ac704..4ec1c0309839e 100644
--- a/src/test/run-pass/empty-allocation-non-null.rs
+++ b/src/test/ui/run-pass/allocator/empty-allocation-non-null.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() {
     assert!(Some(Box::new(())).is_some());
 
diff --git a/src/test/run-pass/empty-allocation-rvalue-non-null.rs b/src/test/ui/run-pass/allocator/empty-allocation-rvalue-non-null.rs
similarity index 97%
rename from src/test/run-pass/empty-allocation-rvalue-non-null.rs
rename to src/test/ui/run-pass/allocator/empty-allocation-rvalue-non-null.rs
index f52a21a997d78..ebce608fcfb23 100644
--- a/src/test/run-pass/empty-allocation-rvalue-non-null.rs
+++ b/src/test/ui/run-pass/allocator/empty-allocation-rvalue-non-null.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 pub fn main() {
diff --git a/src/test/run-pass/realloc-16687.rs b/src/test/ui/run-pass/allocator/realloc-16687.rs
similarity index 99%
rename from src/test/run-pass/realloc-16687.rs
rename to src/test/ui/run-pass/allocator/realloc-16687.rs
index c4cae1e1d611d..5ce391673f8d3 100644
--- a/src/test/run-pass/realloc-16687.rs
+++ b/src/test/ui/run-pass/allocator/realloc-16687.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // alloc::heap::reallocate test.
 //
 // Ideally this would be revised to use no_std, but for now it serves
diff --git a/src/test/run-pass/artificial-block.rs b/src/test/ui/run-pass/artificial-block.rs
similarity index 97%
rename from src/test/run-pass/artificial-block.rs
rename to src/test/ui/run-pass/artificial-block.rs
index de946d94d07b9..33edc4379ef47 100644
--- a/src/test/run-pass/artificial-block.rs
+++ b/src/test/ui/run-pass/artificial-block.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 fn f() -> isize { { return 3; } }
 
diff --git a/src/test/run-pass/as-precedence.rs b/src/test/ui/run-pass/as-precedence.rs
similarity index 98%
rename from src/test/run-pass/as-precedence.rs
rename to src/test/ui/run-pass/as-precedence.rs
index d89607077dcbe..8e89323debf32 100644
--- a/src/test/run-pass/as-precedence.rs
+++ b/src/test/ui/run-pass/as-precedence.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 fn main() {
     assert_eq!(3 as usize * 3, 9);
diff --git a/src/test/run-pass/asm-concat-src.rs b/src/test/ui/run-pass/asm-concat-src.rs
similarity index 97%
rename from src/test/run-pass/asm-concat-src.rs
rename to src/test/ui/run-pass/asm-concat-src.rs
index 0380ccbdea47b..d80880440ae96 100644
--- a/src/test/run-pass/asm-concat-src.rs
+++ b/src/test/ui/run-pass/asm-concat-src.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 // ignore-emscripten no asm
 
diff --git a/src/test/run-pass/asm-in-moved.rs b/src/test/ui/run-pass/asm-in-moved.rs
similarity index 98%
rename from src/test/run-pass/asm-in-moved.rs
rename to src/test/ui/run-pass/asm-in-moved.rs
index 246dd83fbef29..509b3968f41f0 100644
--- a/src/test/run-pass/asm-in-moved.rs
+++ b/src/test/ui/run-pass/asm-in-moved.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // revisions: ast mir
 //[mir]compile-flags: -Z borrowck=mir
 
diff --git a/src/test/run-pass/asm-in-out-operand.rs b/src/test/ui/run-pass/asm-in-out-operand.rs
similarity index 99%
rename from src/test/run-pass/asm-in-out-operand.rs
rename to src/test/ui/run-pass/asm-in-out-operand.rs
index 243ecf86e9c46..21bc47a74b7cf 100644
--- a/src/test/run-pass/asm-in-out-operand.rs
+++ b/src/test/ui/run-pass/asm-in-out-operand.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(asm)]
 
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
diff --git a/src/test/run-pass/asm-indirect-memory.rs b/src/test/ui/run-pass/asm-indirect-memory.rs
similarity index 99%
rename from src/test/run-pass/asm-indirect-memory.rs
rename to src/test/ui/run-pass/asm-indirect-memory.rs
index d1873afb3a9b7..aed142deeef23 100644
--- a/src/test/run-pass/asm-indirect-memory.rs
+++ b/src/test/ui/run-pass/asm-indirect-memory.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(asm)]
 
 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))]
diff --git a/src/test/run-pass/asm-out-assign.rs b/src/test/ui/run-pass/asm-out-assign.rs
similarity index 98%
rename from src/test/run-pass/asm-out-assign.rs
rename to src/test/ui/run-pass/asm-out-assign.rs
index 6acb9054af5cc..c3e46d95b9166 100644
--- a/src/test/run-pass/asm-out-assign.rs
+++ b/src/test/ui/run-pass/asm-out-assign.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // revisions ast mir
 //[mir]compile-flags: -Z borrowck=mir
 
diff --git a/src/test/run-pass/assert-eq-trailing-comma.rs b/src/test/ui/run-pass/assert-eq-trailing-comma.rs
similarity index 97%
rename from src/test/run-pass/assert-eq-trailing-comma.rs
rename to src/test/ui/run-pass/assert-eq-trailing-comma.rs
index d98baf640a8c9..32e6cfbd073e1 100644
--- a/src/test/run-pass/assert-eq-trailing-comma.rs
+++ b/src/test/ui/run-pass/assert-eq-trailing-comma.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 fn main() {
     assert_eq!(1, 1,);
 }
diff --git a/src/test/run-pass/assert-escape.rs b/src/test/ui/run-pass/assert-escape.rs
similarity index 97%
rename from src/test/run-pass/assert-escape.rs
rename to src/test/ui/run-pass/assert-escape.rs
index d340806c3577d..1bb79dba92e9f 100644
--- a/src/test/run-pass/assert-escape.rs
+++ b/src/test/ui/run-pass/assert-escape.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 fn main() {
     assert!(r#"☃\backslash"#.contains("\\"));
 }
diff --git a/src/test/run-pass/assert-ne-trailing-comma.rs b/src/test/ui/run-pass/assert-ne-trailing-comma.rs
similarity index 97%
rename from src/test/run-pass/assert-ne-trailing-comma.rs
rename to src/test/ui/run-pass/assert-ne-trailing-comma.rs
index 4d3c29da8b22b..b259c997f8927 100644
--- a/src/test/run-pass/assert-ne-trailing-comma.rs
+++ b/src/test/ui/run-pass/assert-ne-trailing-comma.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 fn main() {
     assert_ne!(1, 2,);
 }
diff --git a/src/test/run-pass/assign-assign.rs b/src/test/ui/run-pass/assign-assign.rs
similarity index 98%
rename from src/test/run-pass/assign-assign.rs
rename to src/test/ui/run-pass/assign-assign.rs
index 186f91da07ccb..90db5d7ac55b7 100644
--- a/src/test/run-pass/assign-assign.rs
+++ b/src/test/ui/run-pass/assign-assign.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Issue 483 - Assignment expressions result in nil
 
 fn test_assign() {
diff --git a/src/test/run-pass/assoc-oddities-3.rs b/src/test/ui/run-pass/assoc-oddities-3.rs
similarity index 98%
rename from src/test/run-pass/assoc-oddities-3.rs
rename to src/test/ui/run-pass/assoc-oddities-3.rs
index 4913816ffe679..e5ec2e39bfb37 100644
--- a/src/test/run-pass/assoc-oddities-3.rs
+++ b/src/test/ui/run-pass/assoc-oddities-3.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 fn that_odd_parse(c: bool, n: usize) -> u32 {
     let x = 2;
     let a = [1, 2, 3, 4];
diff --git a/src/test/run-pass/associated-item-long-paths.rs b/src/test/ui/run-pass/associated-types/associated-item-long-paths.rs
similarity index 99%
rename from src/test/run-pass/associated-item-long-paths.rs
rename to src/test/ui/run-pass/associated-types/associated-item-long-paths.rs
index 4ad0187df7a8f..220650659e3d7 100644
--- a/src/test/run-pass/associated-item-long-paths.rs
+++ b/src/test/ui/run-pass/associated-types/associated-item-long-paths.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::mem::size_of;
 
 // The main point of this test is to ensure that we can parse and resolve
diff --git a/src/test/run-pass/async-await.rs b/src/test/ui/run-pass/async-await.rs
similarity index 99%
rename from src/test/run-pass/async-await.rs
rename to src/test/ui/run-pass/async-await.rs
index f692f57abb9c3..b337bb8361fec 100644
--- a/src/test/run-pass/async-await.rs
+++ b/src/test/ui/run-pass/async-await.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // edition:2018
 
 #![feature(arbitrary_self_types, async_await, await_macro, futures_api, pin)]
diff --git a/src/test/run-pass/atomic-access-bool.rs b/src/test/ui/run-pass/atomic-access-bool.rs
similarity index 96%
rename from src/test/run-pass/atomic-access-bool.rs
rename to src/test/ui/run-pass/atomic-access-bool.rs
index 286c92ce50ee3..4d15102a914be 100644
--- a/src/test/run-pass/atomic-access-bool.rs
+++ b/src/test/ui/run-pass/atomic-access-bool.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+
 #![feature(atomic_access)]
 use std::sync::atomic::{AtomicBool, ATOMIC_BOOL_INIT};
 use std::sync::atomic::Ordering::*;
diff --git a/src/test/run-pass/atomic-compare_exchange.rs b/src/test/ui/run-pass/atomic-compare_exchange.rs
similarity index 97%
rename from src/test/run-pass/atomic-compare_exchange.rs
rename to src/test/ui/run-pass/atomic-compare_exchange.rs
index 2f33eb9ca4093..fd372f00d7821 100644
--- a/src/test/run-pass/atomic-compare_exchange.rs
+++ b/src/test/ui/run-pass/atomic-compare_exchange.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
 #![feature(extended_compare_and_swap)]
 use std::sync::atomic::{AtomicIsize, ATOMIC_ISIZE_INIT};
 use std::sync::atomic::Ordering::*;
diff --git a/src/test/run-pass/atomic-print.rs b/src/test/ui/run-pass/atomic-print.rs
similarity index 97%
rename from src/test/run-pass/atomic-print.rs
rename to src/test/ui/run-pass/atomic-print.rs
index 2d478e954e7cb..938098e3874a8 100644
--- a/src/test/run-pass/atomic-print.rs
+++ b/src/test/ui/run-pass/atomic-print.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(deprecated)]
+
 // ignore-cloudabi no process support
 // ignore-emscripten no threads support
 
diff --git a/src/test/run-pass/attr-before-view-item.rs b/src/test/ui/run-pass/attr-before-view-item.rs
similarity index 97%
rename from src/test/run-pass/attr-before-view-item.rs
rename to src/test/ui/run-pass/attr-before-view-item.rs
index 2a86489c69aa5..8c1a7a186900a 100644
--- a/src/test/run-pass/attr-before-view-item.rs
+++ b/src/test/ui/run-pass/attr-before-view-item.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![feature(custom_attribute, test)]
diff --git a/src/test/run-pass/attr-before-view-item2.rs b/src/test/ui/run-pass/attr-before-view-item2.rs
similarity index 97%
rename from src/test/run-pass/attr-before-view-item2.rs
rename to src/test/ui/run-pass/attr-before-view-item2.rs
index c8683f2d14751..e87c290e5f521 100644
--- a/src/test/run-pass/attr-before-view-item2.rs
+++ b/src/test/ui/run-pass/attr-before-view-item2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![feature(custom_attribute, test)]
diff --git a/src/test/run-pass/attr-main-2.rs b/src/test/ui/run-pass/attr-main-2.rs
similarity index 97%
rename from src/test/run-pass/attr-main-2.rs
rename to src/test/ui/run-pass/attr-main-2.rs
index b3c9ea541b712..f3c2442befb37 100644
--- a/src/test/run-pass/attr-main-2.rs
+++ b/src/test/ui/run-pass/attr-main-2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 #![feature(main)]
 
diff --git a/src/test/run-pass/attr-main.rs b/src/test/ui/run-pass/attr-main.rs
similarity index 97%
rename from src/test/run-pass/attr-main.rs
rename to src/test/ui/run-pass/attr-main.rs
index e8a12ee3ac791..a61278004869a 100644
--- a/src/test/run-pass/attr-main.rs
+++ b/src/test/ui/run-pass/attr-main.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![feature(main)]
diff --git a/src/test/run-pass/attr-mix-new.rs b/src/test/ui/run-pass/attr-mix-new.rs
similarity index 94%
rename from src/test/run-pass/attr-mix-new.rs
rename to src/test/ui/run-pass/attr-mix-new.rs
index bcfb4b330f5ed..262a10e3ce23e 100644
--- a/src/test/run-pass/attr-mix-new.rs
+++ b/src/test/ui/run-pass/attr-mix-new.rs
@@ -7,6 +7,9 @@
 // <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.
+
+// run-pass
+#![allow(unknown_lints)]
 // pretty-expanded FIXME #23616
 
 #![allow(unused_attribute)]
diff --git a/src/test/run-pass/attr-on-generic-formals.rs b/src/test/ui/run-pass/attr-on-generic-formals.rs
similarity index 99%
rename from src/test/run-pass/attr-on-generic-formals.rs
rename to src/test/ui/run-pass/attr-on-generic-formals.rs
index e87b9e3d82a24..6aa787319a125 100644
--- a/src/test/run-pass/attr-on-generic-formals.rs
+++ b/src/test/ui/run-pass/attr-on-generic-formals.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // This test ensures we can attach attributes to the formals in all
 // places where generic parameter lists occur, assuming appropriate
 // feature gates are enabled.
diff --git a/src/test/run-pass/attr-shebang.rs b/src/test/ui/run-pass/attr-shebang.rs
similarity index 87%
rename from src/test/run-pass/attr-shebang.rs
rename to src/test/ui/run-pass/attr-shebang.rs
index 73f1041082825..0ee655ee992d5 100644
--- a/src/test/run-pass/attr-shebang.rs
+++ b/src/test/ui/run-pass/attr-shebang.rs
@@ -2,3 +2,4 @@
 #![feature(rust1)]
 pub fn main() { }
 // ignore-license
+// run-pass
diff --git a/src/test/run-pass/attr-start.rs b/src/test/ui/run-pass/attr-start.rs
similarity index 97%
rename from src/test/run-pass/attr-start.rs
rename to src/test/ui/run-pass/attr-start.rs
index bfafe04d6006c..0027810e7f97b 100644
--- a/src/test/run-pass/attr-start.rs
+++ b/src/test/ui/run-pass/attr-start.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![feature(start)]
diff --git a/src/test/run-pass/attr.rs b/src/test/ui/run-pass/attr.rs
similarity index 97%
rename from src/test/run-pass/attr.rs
rename to src/test/ui/run-pass/attr.rs
index 57e1b38c9c166..6e14168d0580c 100644
--- a/src/test/run-pass/attr.rs
+++ b/src/test/ui/run-pass/attr.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![feature(main)]
diff --git a/src/test/run-pass/augmented-assignments-feature-gate-cross.rs b/src/test/ui/run-pass/augmented-assignments-feature-gate-cross.rs
similarity index 97%
rename from src/test/run-pass/augmented-assignments-feature-gate-cross.rs
rename to src/test/ui/run-pass/augmented-assignments-feature-gate-cross.rs
index b68e011af15f2..25055a3f72ab4 100644
--- a/src/test/run-pass/augmented-assignments-feature-gate-cross.rs
+++ b/src/test/ui/run-pass/augmented-assignments-feature-gate-cross.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:augmented_assignments.rs
 
 extern crate augmented_assignments;
diff --git a/src/test/run-pass/augmented-assignments-feature-gate.rs b/src/test/ui/run-pass/augmented-assignments-feature-gate.rs
similarity index 98%
rename from src/test/run-pass/augmented-assignments-feature-gate.rs
rename to src/test/ui/run-pass/augmented-assignments-feature-gate.rs
index f7e20ee94458f..b24b5f79226cb 100644
--- a/src/test/run-pass/augmented-assignments-feature-gate.rs
+++ b/src/test/ui/run-pass/augmented-assignments-feature-gate.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::ops::AddAssign;
 
 struct Int(i32);
diff --git a/src/test/run-pass/augmented-assignments.rs b/src/test/ui/run-pass/augmented-assignments.rs
similarity index 99%
rename from src/test/run-pass/augmented-assignments.rs
rename to src/test/ui/run-pass/augmented-assignments.rs
index 3ed9e8548dcbc..ca449caf9d303 100644
--- a/src/test/run-pass/augmented-assignments.rs
+++ b/src/test/ui/run-pass/augmented-assignments.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![deny(unused_assignments)]
 
 use std::mem;
diff --git a/src/test/run-pass/auto-instantiate.rs b/src/test/ui/run-pass/auto-instantiate.rs
similarity index 98%
rename from src/test/run-pass/auto-instantiate.rs
rename to src/test/ui/run-pass/auto-instantiate.rs
index 4a1bfa3eb4266..8ff6a5e0ca47b 100644
--- a/src/test/run-pass/auto-instantiate.rs
+++ b/src/test/ui/run-pass/auto-instantiate.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #[derive(Debug)]
 struct Pair<T, U> { a: T, b: U }
 struct Triple { x: isize, y: isize, z: isize }
diff --git a/src/test/run-pass/auto-is-contextual.rs b/src/test/ui/run-pass/auto-is-contextual.rs
similarity index 97%
rename from src/test/run-pass/auto-is-contextual.rs
rename to src/test/ui/run-pass/auto-is-contextual.rs
index ad433cc26a790..285c1154e52de 100644
--- a/src/test/run-pass/auto-is-contextual.rs
+++ b/src/test/ui/run-pass/auto-is-contextual.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 macro_rules! auto {
     () => (struct S;)
 }
diff --git a/src/test/run-pass/autobind.rs b/src/test/ui/run-pass/autobind.rs
similarity index 98%
rename from src/test/run-pass/autobind.rs
rename to src/test/ui/run-pass/autobind.rs
index ed0b9eca0e058..a4606a30fb0ca 100644
--- a/src/test/run-pass/autobind.rs
+++ b/src/test/ui/run-pass/autobind.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 fn f<T>(x: Vec<T>) -> T { return x.into_iter().next().unwrap(); }
diff --git a/src/test/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/ui/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs
rename to src/test/ui/run-pass/auxiliary/anon-extern-mod-cross-crate-1.rs
diff --git a/src/test/run-pass/auxiliary/augmented_assignments.rs b/src/test/ui/run-pass/auxiliary/augmented_assignments.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/augmented_assignments.rs
rename to src/test/ui/run-pass/auxiliary/augmented_assignments.rs
diff --git a/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo.rs b/src/test/ui/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo.rs
rename to src/test/ui/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo.rs
diff --git a/src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo2.rs b/src/test/ui/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
rename to src/test/ui/run-pass/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
diff --git a/src/test/run-pass/auxiliary/check_static_recursion_foreign_helper.rs b/src/test/ui/run-pass/auxiliary/check_static_recursion_foreign_helper.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/check_static_recursion_foreign_helper.rs
rename to src/test/ui/run-pass/auxiliary/check_static_recursion_foreign_helper.rs
diff --git a/src/test/run-pass/auxiliary/crate-method-reexport-grrrrrrr2.rs b/src/test/ui/run-pass/auxiliary/crate-method-reexport-grrrrrrr2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/crate-method-reexport-grrrrrrr2.rs
rename to src/test/ui/run-pass/auxiliary/crate-method-reexport-grrrrrrr2.rs
diff --git a/src/test/run-pass/auxiliary/debuginfo-lto-aux.rs b/src/test/ui/run-pass/auxiliary/debuginfo-lto-aux.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/debuginfo-lto-aux.rs
rename to src/test/ui/run-pass/auxiliary/debuginfo-lto-aux.rs
diff --git a/src/test/run-pass/auxiliary/edition-kw-macro-2015.rs b/src/test/ui/run-pass/auxiliary/edition-kw-macro-2015.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/edition-kw-macro-2015.rs
rename to src/test/ui/run-pass/auxiliary/edition-kw-macro-2015.rs
diff --git a/src/test/run-pass/auxiliary/edition-kw-macro-2018.rs b/src/test/ui/run-pass/auxiliary/edition-kw-macro-2018.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/edition-kw-macro-2018.rs
rename to src/test/ui/run-pass/auxiliary/edition-kw-macro-2018.rs
diff --git a/src/test/run-pass/auxiliary/impl_privacy_xc_1.rs b/src/test/ui/run-pass/auxiliary/impl_privacy_xc_1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/impl_privacy_xc_1.rs
rename to src/test/ui/run-pass/auxiliary/impl_privacy_xc_1.rs
diff --git a/src/test/run-pass/auxiliary/impl_privacy_xc_2.rs b/src/test/ui/run-pass/auxiliary/impl_privacy_xc_2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/impl_privacy_xc_2.rs
rename to src/test/ui/run-pass/auxiliary/impl_privacy_xc_2.rs
diff --git a/src/test/run-pass/auxiliary/inner_static.rs b/src/test/ui/run-pass/auxiliary/inner_static.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/inner_static.rs
rename to src/test/ui/run-pass/auxiliary/inner_static.rs
diff --git a/src/test/run-pass/auxiliary/kinds_in_metadata.rs b/src/test/ui/run-pass/auxiliary/kinds_in_metadata.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/kinds_in_metadata.rs
rename to src/test/ui/run-pass/auxiliary/kinds_in_metadata.rs
diff --git a/src/test/run-pass/auxiliary/link-cfg-works-transitive-dylib.rs b/src/test/ui/run-pass/auxiliary/link-cfg-works-transitive-dylib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/link-cfg-works-transitive-dylib.rs
rename to src/test/ui/run-pass/auxiliary/link-cfg-works-transitive-dylib.rs
diff --git a/src/test/run-pass/auxiliary/link-cfg-works-transitive-rlib.rs b/src/test/ui/run-pass/auxiliary/link-cfg-works-transitive-rlib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/link-cfg-works-transitive-rlib.rs
rename to src/test/ui/run-pass/auxiliary/link-cfg-works-transitive-rlib.rs
diff --git a/src/test/run-pass/auxiliary/linkage1.rs b/src/test/ui/run-pass/auxiliary/linkage1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/linkage1.rs
rename to src/test/ui/run-pass/auxiliary/linkage1.rs
diff --git a/src/test/run-pass/auxiliary/llvm_pr32379.rs b/src/test/ui/run-pass/auxiliary/llvm_pr32379.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/llvm_pr32379.rs
rename to src/test/ui/run-pass/auxiliary/llvm_pr32379.rs
diff --git a/src/test/run-pass/auxiliary/msvc-data-only-lib.rs b/src/test/ui/run-pass/auxiliary/msvc-data-only-lib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/msvc-data-only-lib.rs
rename to src/test/ui/run-pass/auxiliary/msvc-data-only-lib.rs
diff --git a/src/test/run-pass/auxiliary/nested_item.rs b/src/test/ui/run-pass/auxiliary/nested_item.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/nested_item.rs
rename to src/test/ui/run-pass/auxiliary/nested_item.rs
diff --git a/src/test/run-pass/auxiliary/reachable-unnameable-items.rs b/src/test/ui/run-pass/auxiliary/reachable-unnameable-items.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/reachable-unnameable-items.rs
rename to src/test/ui/run-pass/auxiliary/reachable-unnameable-items.rs
diff --git a/src/test/run-pass/auxiliary/reexport-should-still-link.rs b/src/test/ui/run-pass/auxiliary/reexport-should-still-link.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/reexport-should-still-link.rs
rename to src/test/ui/run-pass/auxiliary/reexport-should-still-link.rs
diff --git a/src/test/run-pass/auxiliary/rmeta_rlib.rs b/src/test/ui/run-pass/auxiliary/rmeta_rlib.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/rmeta_rlib.rs
rename to src/test/ui/run-pass/auxiliary/rmeta_rlib.rs
diff --git a/src/test/run-pass/auxiliary/rmeta_rmeta.rs b/src/test/ui/run-pass/auxiliary/rmeta_rmeta.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/rmeta_rmeta.rs
rename to src/test/ui/run-pass/auxiliary/rmeta_rmeta.rs
diff --git a/src/test/run-pass/auxiliary/svh-a-base.rs b/src/test/ui/run-pass/auxiliary/svh-a-base.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/svh-a-base.rs
rename to src/test/ui/run-pass/auxiliary/svh-a-base.rs
diff --git a/src/test/run-pass/auxiliary/svh-b.rs b/src/test/ui/run-pass/auxiliary/svh-b.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/svh-b.rs
rename to src/test/ui/run-pass/auxiliary/svh-b.rs
diff --git a/src/test/run-pass/auxiliary/trait_superkinds_in_metadata.rs b/src/test/ui/run-pass/auxiliary/trait_superkinds_in_metadata.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/trait_superkinds_in_metadata.rs
rename to src/test/ui/run-pass/auxiliary/trait_superkinds_in_metadata.rs
diff --git a/src/test/run-pass/auxiliary/using-target-feature-unstable.rs b/src/test/ui/run-pass/auxiliary/using-target-feature-unstable.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/using-target-feature-unstable.rs
rename to src/test/ui/run-pass/auxiliary/using-target-feature-unstable.rs
diff --git a/src/test/run-pass/backtrace-debuginfo-aux.rs b/src/test/ui/run-pass/backtrace-debuginfo-aux.rs
similarity index 100%
rename from src/test/run-pass/backtrace-debuginfo-aux.rs
rename to src/test/ui/run-pass/backtrace-debuginfo-aux.rs
diff --git a/src/test/run-pass/backtrace-debuginfo.rs b/src/test/ui/run-pass/backtrace-debuginfo.rs
similarity index 99%
rename from src/test/run-pass/backtrace-debuginfo.rs
rename to src/test/ui/run-pass/backtrace-debuginfo.rs
index 7bcb4e5ec2d2e..9f707833a59af 100644
--- a/src/test/run-pass/backtrace-debuginfo.rs
+++ b/src/test/ui/run-pass/backtrace-debuginfo.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // We disable tail merging here because it can't preserve debuginfo and thus
 // potentially breaks the backtraces. Also, subtle changes can decide whether
 // tail merging succeeds, so the test might work today but fail tomorrow due to a
diff --git a/src/test/run-pass/backtrace.rs b/src/test/ui/run-pass/backtrace.rs
similarity index 99%
rename from src/test/run-pass/backtrace.rs
rename to src/test/ui/run-pass/backtrace.rs
index 3e1ae730e4af3..db561631ebb64 100644
--- a/src/test/run-pass/backtrace.rs
+++ b/src/test/ui/run-pass/backtrace.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-android FIXME #17520
 // ignore-cloudabi spawning processes is not supported
 // ignore-emscripten spawning processes is not supported
diff --git a/src/test/run-pass/bare-static-string.rs b/src/test/ui/run-pass/bare-static-string.rs
similarity index 97%
rename from src/test/run-pass/bare-static-string.rs
rename to src/test/ui/run-pass/bare-static-string.rs
index fefb303fc70fe..5a14317bac27d 100644
--- a/src/test/run-pass/bare-static-string.rs
+++ b/src/test/ui/run-pass/bare-static-string.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() {
     let x: &'static str = "foo";
     println!("{}", x);
diff --git a/src/test/run-pass/binary-minus-without-space.rs b/src/test/ui/run-pass/binary-minus-without-space.rs
similarity index 97%
rename from src/test/run-pass/binary-minus-without-space.rs
rename to src/test/ui/run-pass/binary-minus-without-space.rs
index 01a9ec8093973..bbe2cbe11854a 100644
--- a/src/test/run-pass/binary-minus-without-space.rs
+++ b/src/test/ui/run-pass/binary-minus-without-space.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Check that issue #954 stays fixed
 
 
diff --git a/src/test/run-pass/bind-by-move.rs b/src/test/ui/run-pass/binding/bind-by-move.rs
similarity index 98%
rename from src/test/run-pass/bind-by-move.rs
rename to src/test/ui/run-pass/binding/bind-by-move.rs
index 9be7d63ab951d..f359a702778fd 100644
--- a/src/test/run-pass/bind-by-move.rs
+++ b/src/test/ui/run-pass/binding/bind-by-move.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 use std::sync::Arc;
 fn dispose(_x: Arc<bool>) { }
diff --git a/src/test/run-pass/resolve-issue-2428.rs b/src/test/ui/run-pass/binding/resolve-issue-2428.rs
similarity index 89%
rename from src/test/run-pass/resolve-issue-2428.rs
rename to src/test/ui/run-pass/binding/resolve-issue-2428.rs
index 6159b24165e44..aed3d8d9406b9 100644
--- a/src/test/run-pass/resolve-issue-2428.rs
+++ b/src/test/ui/run-pass/binding/resolve-issue-2428.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_upper_case_globals, non_camel_case_types)]
 
 const foo: isize = 4 >> 1;
 enum bs { thing = foo }
diff --git a/src/test/run-pass/resolve-pseudo-shadowing.rs b/src/test/ui/run-pass/binding/resolve-pseudo-shadowing.rs
similarity index 98%
rename from src/test/run-pass/resolve-pseudo-shadowing.rs
rename to src/test/ui/run-pass/binding/resolve-pseudo-shadowing.rs
index 071279ae7d818..7a640a0ee9565 100644
--- a/src/test/run-pass/resolve-pseudo-shadowing.rs
+++ b/src/test/ui/run-pass/binding/resolve-pseudo-shadowing.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // check that type parameters can't "shadow" qualified paths.
 
 fn check<Clone>(_c: Clone) {
diff --git a/src/test/run-pass/binops-issue-22743.rs b/src/test/ui/run-pass/binops-issue-22743.rs
similarity index 98%
rename from src/test/run-pass/binops-issue-22743.rs
rename to src/test/ui/run-pass/binops-issue-22743.rs
index da7a3ae684c57..c17fff83d62c0 100644
--- a/src/test/run-pass/binops-issue-22743.rs
+++ b/src/test/ui/run-pass/binops-issue-22743.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::ops::Mul;
 
 #[derive(Copy, Clone)]
diff --git a/src/test/run-pass/binops.rs b/src/test/ui/run-pass/binops.rs
similarity index 98%
rename from src/test/run-pass/binops.rs
rename to src/test/ui/run-pass/binops.rs
index 2b8fcd303b66e..858860d3f3193 100644
--- a/src/test/run-pass/binops.rs
+++ b/src/test/ui/run-pass/binops.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 // Binop corner cases
 
 fn test_nil() {
diff --git a/src/test/run-pass/blind-item-local-shadow.rs b/src/test/ui/run-pass/blind-item-local-shadow.rs
similarity index 97%
rename from src/test/run-pass/blind-item-local-shadow.rs
rename to src/test/ui/run-pass/blind-item-local-shadow.rs
index bb654b1a20b91..64a8bb65e09ff 100644
--- a/src/test/run-pass/blind-item-local-shadow.rs
+++ b/src/test/ui/run-pass/blind-item-local-shadow.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 mod bar {
     pub fn foo() -> bool { true }
 }
diff --git a/src/test/run-pass/blind-item-mixed-crate-use-item.rs b/src/test/ui/run-pass/blind-item-mixed-crate-use-item.rs
similarity index 98%
rename from src/test/run-pass/blind-item-mixed-crate-use-item.rs
rename to src/test/ui/run-pass/blind-item-mixed-crate-use-item.rs
index 3b6614c18faa8..a37fc7acc5552 100644
--- a/src/test/run-pass/blind-item-mixed-crate-use-item.rs
+++ b/src/test/ui/run-pass/blind-item-mixed-crate-use-item.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:blind-item-mixed-crate-use-item-foo.rs
 // aux-build:blind-item-mixed-crate-use-item-foo2.rs
 
diff --git a/src/test/run-pass/blind-item-mixed-use-item.rs b/src/test/ui/run-pass/blind-item-mixed-use-item.rs
similarity index 98%
rename from src/test/run-pass/blind-item-mixed-use-item.rs
rename to src/test/ui/run-pass/blind-item-mixed-use-item.rs
index 6244ba6fccf0b..e337e7c8b7c13 100644
--- a/src/test/run-pass/blind-item-mixed-use-item.rs
+++ b/src/test/ui/run-pass/blind-item-mixed-use-item.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 mod m {
diff --git a/src/test/run-pass/block-expr-precedence.rs b/src/test/ui/run-pass/block-expr-precedence.rs
similarity index 99%
rename from src/test/run-pass/block-expr-precedence.rs
rename to src/test/ui/run-pass/block-expr-precedence.rs
index ac8f501257361..3ad5f8ef6c891 100644
--- a/src/test/run-pass/block-expr-precedence.rs
+++ b/src/test/ui/run-pass/block-expr-precedence.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // This test has some extra semis in it that the pretty-printer won't
 // reproduce so we don't want to automatically reformat it
 
diff --git a/src/test/run-pass/bool-not.rs b/src/test/ui/run-pass/bool-not.rs
similarity index 97%
rename from src/test/run-pass/bool-not.rs
rename to src/test/ui/run-pass/bool-not.rs
index fa0b86d0a0246..ea818b66fb1dc 100644
--- a/src/test/run-pass/bool-not.rs
+++ b/src/test/ui/run-pass/bool-not.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/bool.rs b/src/test/ui/run-pass/bool.rs
similarity index 99%
rename from src/test/run-pass/bool.rs
rename to src/test/ui/run-pass/bool.rs
index 1152574d06942..d326194f8caca 100644
--- a/src/test/run-pass/bool.rs
+++ b/src/test/ui/run-pass/bool.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Basic boolean tests
 
 
diff --git a/src/test/run-pass/borrow-by-val-method-receiver.rs b/src/test/ui/run-pass/borrow-by-val-method-receiver.rs
similarity index 97%
rename from src/test/run-pass/borrow-by-val-method-receiver.rs
rename to src/test/ui/run-pass/borrow-by-val-method-receiver.rs
index 44f4a54610a9b..c37c0b7cc042e 100644
--- a/src/test/run-pass/borrow-by-val-method-receiver.rs
+++ b/src/test/ui/run-pass/borrow-by-val-method-receiver.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 trait Foo {
     fn foo(self);
 }
diff --git a/src/test/run-pass/builtin-clone-unwind.rs b/src/test/ui/run-pass/builtin-clone-unwind.rs
similarity index 99%
rename from src/test/run-pass/builtin-clone-unwind.rs
rename to src/test/ui/run-pass/builtin-clone-unwind.rs
index 7e7c5ee412556..798d1090a0150 100644
--- a/src/test/run-pass/builtin-clone-unwind.rs
+++ b/src/test/ui/run-pass/builtin-clone-unwind.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-wasm32-bare compiled with panic=abort by default
 
 // Test that builtin implementations of `Clone` cleanup everything
diff --git a/src/test/run-pass/builtin-clone.rs b/src/test/ui/run-pass/builtin-clone.rs
similarity index 99%
rename from src/test/run-pass/builtin-clone.rs
rename to src/test/ui/run-pass/builtin-clone.rs
index 95903610931b2..1131d7cabdcc2 100644
--- a/src/test/run-pass/builtin-clone.rs
+++ b/src/test/ui/run-pass/builtin-clone.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that `Clone` is correctly implemented for builtin types.
 // Also test that cloning an array or a tuple is done right, i.e.
 // each component is cloned.
diff --git a/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs b/src/test/ui/run-pass/builtin-superkinds-capabilities-transitive.rs
similarity index 98%
rename from src/test/run-pass/builtin-superkinds-capabilities-transitive.rs
rename to src/test/ui/run-pass/builtin-superkinds-capabilities-transitive.rs
index e028c3b9d4b30..f5e48a264328e 100644
--- a/src/test/run-pass/builtin-superkinds-capabilities-transitive.rs
+++ b/src/test/ui/run-pass/builtin-superkinds-capabilities-transitive.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Tests "transitivity" of super-builtin-kinds on traits. Here, if
 // we have a Foo, we know we have a Bar, and if we have a Bar, we
 // know we have a Send. So if we have a Foo we should know we have
diff --git a/src/test/run-pass/builtin-superkinds-capabilities-xc.rs b/src/test/ui/run-pass/builtin-superkinds-capabilities-xc.rs
similarity index 98%
rename from src/test/run-pass/builtin-superkinds-capabilities-xc.rs
rename to src/test/ui/run-pass/builtin-superkinds-capabilities-xc.rs
index 1a27eae194328..6251cc4f8b0cb 100644
--- a/src/test/run-pass/builtin-superkinds-capabilities-xc.rs
+++ b/src/test/ui/run-pass/builtin-superkinds-capabilities-xc.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 // aux-build:trait_superkinds_in_metadata.rs
 
diff --git a/src/test/run-pass/builtin-superkinds-capabilities.rs b/src/test/ui/run-pass/builtin-superkinds-capabilities.rs
similarity index 98%
rename from src/test/run-pass/builtin-superkinds-capabilities.rs
rename to src/test/ui/run-pass/builtin-superkinds-capabilities.rs
index 99a68790e76e9..538777274d268 100644
--- a/src/test/run-pass/builtin-superkinds-capabilities.rs
+++ b/src/test/ui/run-pass/builtin-superkinds-capabilities.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Tests "capabilities" granted by traits that inherit from super-
 // builtin-kinds, e.g., if a trait requires Send to implement, then
 // at usage site of that trait, we know we have the Send capability.
diff --git a/src/test/run-pass/builtin-superkinds-in-metadata.rs b/src/test/ui/run-pass/builtin-superkinds-in-metadata.rs
similarity index 98%
rename from src/test/run-pass/builtin-superkinds-in-metadata.rs
rename to src/test/ui/run-pass/builtin-superkinds-in-metadata.rs
index 3259b1cc0679e..030861895cae8 100644
--- a/src/test/run-pass/builtin-superkinds-in-metadata.rs
+++ b/src/test/ui/run-pass/builtin-superkinds-in-metadata.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 // aux-build:trait_superkinds_in_metadata.rs
 
diff --git a/src/test/run-pass/builtin-superkinds-phantom-typaram.rs b/src/test/ui/run-pass/builtin-superkinds-phantom-typaram.rs
similarity index 98%
rename from src/test/run-pass/builtin-superkinds-phantom-typaram.rs
rename to src/test/ui/run-pass/builtin-superkinds-phantom-typaram.rs
index 6bc81f4a36bcd..8fed8dcc8f191 100644
--- a/src/test/run-pass/builtin-superkinds-phantom-typaram.rs
+++ b/src/test/ui/run-pass/builtin-superkinds-phantom-typaram.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Tests that even when a type parameter doesn't implement a required
 // super-builtin-kind of a trait, if the type parameter is never used,
 // the type can implement the trait anyway.
diff --git a/src/test/run-pass/builtin-superkinds-simple.rs b/src/test/ui/run-pass/builtin-superkinds-simple.rs
similarity index 97%
rename from src/test/run-pass/builtin-superkinds-simple.rs
rename to src/test/ui/run-pass/builtin-superkinds-simple.rs
index 8a954de9d0a45..23f76456743d5 100644
--- a/src/test/run-pass/builtin-superkinds-simple.rs
+++ b/src/test/ui/run-pass/builtin-superkinds-simple.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Simple test case of implementing a trait with super-builtin-kinds.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/builtin-superkinds-typaram.rs b/src/test/ui/run-pass/builtin-superkinds-typaram.rs
similarity index 98%
rename from src/test/run-pass/builtin-superkinds-typaram.rs
rename to src/test/ui/run-pass/builtin-superkinds-typaram.rs
index 6d41774c05bf1..e5b8221b62f1d 100644
--- a/src/test/run-pass/builtin-superkinds-typaram.rs
+++ b/src/test/ui/run-pass/builtin-superkinds-typaram.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Tests correct implementation of traits with super-builtin-kinds
 // using a bounded type parameter.
 
diff --git a/src/test/run-pass/byte-literals.rs b/src/test/ui/run-pass/byte-literals.rs
similarity index 99%
rename from src/test/run-pass/byte-literals.rs
rename to src/test/ui/run-pass/byte-literals.rs
index f5acb72429ae0..10dc11cda5fcd 100644
--- a/src/test/run-pass/byte-literals.rs
+++ b/src/test/ui/run-pass/byte-literals.rs
@@ -7,6 +7,8 @@
 // <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.
+
+// run-pass
 //
 
 
diff --git a/src/test/run-pass/can-copy-pod.rs b/src/test/ui/run-pass/can-copy-pod.rs
similarity index 98%
rename from src/test/run-pass/can-copy-pod.rs
rename to src/test/ui/run-pass/can-copy-pod.rs
index 31b279335225f..093d2ebe7cef1 100644
--- a/src/test/run-pass/can-copy-pod.rs
+++ b/src/test/ui/run-pass/can-copy-pod.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 /* Any copyright is dedicated to the Public Domain.
diff --git a/src/test/run-pass/cancel-clean-via-immediate-rvalue-ref.rs b/src/test/ui/run-pass/cancel-clean-via-immediate-rvalue-ref.rs
similarity index 97%
rename from src/test/run-pass/cancel-clean-via-immediate-rvalue-ref.rs
rename to src/test/ui/run-pass/cancel-clean-via-immediate-rvalue-ref.rs
index ac30921625055..3464168639c99 100644
--- a/src/test/run-pass/cancel-clean-via-immediate-rvalue-ref.rs
+++ b/src/test/ui/run-pass/cancel-clean-via-immediate-rvalue-ref.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/cast-does-fallback.rs b/src/test/ui/run-pass/cast-does-fallback.rs
similarity index 98%
rename from src/test/run-pass/cast-does-fallback.rs
rename to src/test/ui/run-pass/cast-does-fallback.rs
index aa6752ffc35b0..0ff0f8d62ea34 100644
--- a/src/test/run-pass/cast-does-fallback.rs
+++ b/src/test/ui/run-pass/cast-does-fallback.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() {
     // Test that these type check correctly.
     (&42u8 >> 4) as usize;
diff --git a/src/test/run-pass/cast-region-to-uint.rs b/src/test/ui/run-pass/cast-region-to-uint.rs
similarity index 97%
rename from src/test/run-pass/cast-region-to-uint.rs
rename to src/test/ui/run-pass/cast-region-to-uint.rs
index f5180ea260f8d..0134433c3ae18 100644
--- a/src/test/run-pass/cast-region-to-uint.rs
+++ b/src/test/ui/run-pass/cast-region-to-uint.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() {
     let x: isize = 3;
     println!("&x={:x}", (&x as *const isize as usize));
diff --git a/src/test/run-pass/cast-rfc0401-vtable-kinds.rs b/src/test/ui/run-pass/cast-rfc0401-vtable-kinds.rs
similarity index 99%
rename from src/test/run-pass/cast-rfc0401-vtable-kinds.rs
rename to src/test/ui/run-pass/cast-rfc0401-vtable-kinds.rs
index 32a155c13e64a..7ff8762e9307b 100644
--- a/src/test/run-pass/cast-rfc0401-vtable-kinds.rs
+++ b/src/test/ui/run-pass/cast-rfc0401-vtable-kinds.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Check that you can cast between different pointers to trait objects
 // whose vtable have the same kind (both lengths, or both trait pointers).
 
diff --git a/src/test/run-pass/cast-rfc0401.rs b/src/test/ui/run-pass/cast-rfc0401.rs
similarity index 99%
rename from src/test/run-pass/cast-rfc0401.rs
rename to src/test/ui/run-pass/cast-rfc0401.rs
index 022ed6c28c3bd..22f6a2896549c 100644
--- a/src/test/run-pass/cast-rfc0401.rs
+++ b/src/test/ui/run-pass/cast-rfc0401.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![allow(dead_code)]
 
 use std::vec;
diff --git a/src/test/run-pass/cast-to-infer-ty.rs b/src/test/ui/run-pass/cast-to-infer-ty.rs
similarity index 98%
rename from src/test/run-pass/cast-to-infer-ty.rs
rename to src/test/ui/run-pass/cast-to-infer-ty.rs
index 2aa0d9c62fb41..c2aedfd0113fd 100644
--- a/src/test/run-pass/cast-to-infer-ty.rs
+++ b/src/test/ui/run-pass/cast-to-infer-ty.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Check that we allow a cast to `_` so long as the target type can be
 // inferred elsewhere.
 
diff --git a/src/test/run-pass/cast.rs b/src/test/ui/run-pass/cast.rs
similarity index 98%
rename from src/test/run-pass/cast.rs
rename to src/test/ui/run-pass/cast.rs
index 80fa5362a8be9..b258ba2023855 100644
--- a/src/test/run-pass/cast.rs
+++ b/src/test/ui/run-pass/cast.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 pub fn main() {
     let i: isize = 'Q' as isize;
diff --git a/src/test/run-pass/catch-unwind-bang.rs b/src/test/ui/run-pass/catch-unwind-bang.rs
similarity index 97%
rename from src/test/run-pass/catch-unwind-bang.rs
rename to src/test/ui/run-pass/catch-unwind-bang.rs
index 849132b8ebfab..6ad6266cba38c 100644
--- a/src/test/run-pass/catch-unwind-bang.rs
+++ b/src/test/ui/run-pass/catch-unwind-bang.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-wasm32-bare compiled with panic=abort by default
 
 fn worker() -> ! {
diff --git a/src/test/run-pass/cell-does-not-clone.rs b/src/test/ui/run-pass/cell-does-not-clone.rs
similarity index 98%
rename from src/test/run-pass/cell-does-not-clone.rs
rename to src/test/ui/run-pass/cell-does-not-clone.rs
index c1fcf49654626..ae89b6428a9fc 100644
--- a/src/test/run-pass/cell-does-not-clone.rs
+++ b/src/test/ui/run-pass/cell-does-not-clone.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 use std::cell::Cell;
 
diff --git a/src/test/run-pass/char.rs b/src/test/ui/run-pass/char.rs
similarity index 98%
rename from src/test/run-pass/char.rs
rename to src/test/ui/run-pass/char.rs
index d63512f8066cb..5e87e7125a7fa 100644
--- a/src/test/run-pass/char.rs
+++ b/src/test/ui/run-pass/char.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/char_unicode.rs b/src/test/ui/run-pass/char_unicode.rs
similarity index 98%
rename from src/test/run-pass/char_unicode.rs
rename to src/test/ui/run-pass/char_unicode.rs
index bfc7faac06ebe..4553079713526 100644
--- a/src/test/run-pass/char_unicode.rs
+++ b/src/test/ui/run-pass/char_unicode.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(unicode_version)]
 
 /// Tests access to the internal Unicode Version type and value.
diff --git a/src/test/run-pass/check-static-recursion-foreign.rs b/src/test/ui/run-pass/check-static-recursion-foreign.rs
similarity index 98%
rename from src/test/run-pass/check-static-recursion-foreign.rs
rename to src/test/ui/run-pass/check-static-recursion-foreign.rs
index 9c87f2ca68203..9c56836f67853 100644
--- a/src/test/run-pass/check-static-recursion-foreign.rs
+++ b/src/test/ui/run-pass/check-static-recursion-foreign.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Static recursion check shouldn't fail when given a foreign item (#18279)
 
 // aux-build:check_static_recursion_foreign_helper.rs
diff --git a/src/test/run-pass/check_const-feature-gated.rs b/src/test/ui/run-pass/check_const-feature-gated.rs
similarity index 97%
rename from src/test/run-pass/check_const-feature-gated.rs
rename to src/test/ui/run-pass/check_const-feature-gated.rs
index ae27b76c747e6..645ad7e570463 100644
--- a/src/test/run-pass/check_const-feature-gated.rs
+++ b/src/test/ui/run-pass/check_const-feature-gated.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 const ARR: [usize; 1] = [2];
 
 fn main() {
diff --git a/src/test/run-pass/child-outlives-parent.rs b/src/test/ui/run-pass/child-outlives-parent.rs
similarity index 98%
rename from src/test/run-pass/child-outlives-parent.rs
rename to src/test/ui/run-pass/child-outlives-parent.rs
index 03c80e497410e..27960c6eef410 100644
--- a/src/test/run-pass/child-outlives-parent.rs
+++ b/src/test/ui/run-pass/child-outlives-parent.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Reported as issue #126, child leaks the string.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/clone-with-exterior.rs b/src/test/ui/run-pass/clone-with-exterior.rs
similarity index 98%
rename from src/test/run-pass/clone-with-exterior.rs
rename to src/test/ui/run-pass/clone-with-exterior.rs
index 6ac7acd2a6b68..27e3d8cb6cd39 100644
--- a/src/test/run-pass/clone-with-exterior.rs
+++ b/src/test/ui/run-pass/clone-with-exterior.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-emscripten no threads support
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/close-over-big-then-small-data.rs b/src/test/ui/run-pass/close-over-big-then-small-data.rs
similarity index 98%
rename from src/test/run-pass/close-over-big-then-small-data.rs
rename to src/test/ui/run-pass/close-over-big-then-small-data.rs
index ba700e4e32651..148d26d21c00a 100644
--- a/src/test/run-pass/close-over-big-then-small-data.rs
+++ b/src/test/ui/run-pass/close-over-big-then-small-data.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // If we use GEPi rather than GEP_tup_like when
 // storing closure data (as we used to do), the u64 would
 // overwrite the u16.
diff --git a/src/test/run-pass/cmp-default.rs b/src/test/ui/run-pass/cmp-default.rs
similarity index 99%
rename from src/test/run-pass/cmp-default.rs
rename to src/test/ui/run-pass/cmp-default.rs
index d4b570a4db654..7b184a1415f7d 100644
--- a/src/test/run-pass/cmp-default.rs
+++ b/src/test/ui/run-pass/cmp-default.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 use std::cmp::Ordering;
 
diff --git a/src/test/run-pass/codegen-object-shim.rs b/src/test/ui/run-pass/codegen-object-shim.rs
similarity index 97%
rename from src/test/run-pass/codegen-object-shim.rs
rename to src/test/ui/run-pass/codegen-object-shim.rs
index 5fbfef05e10d4..0cdfd1ee97a09 100644
--- a/src/test/run-pass/codegen-object-shim.rs
+++ b/src/test/ui/run-pass/codegen-object-shim.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 fn main() {
     assert_eq!((ToString::to_string as fn(&(ToString+'static)) -> String)(&"foo"),
         String::from("foo"));
diff --git a/src/test/run-pass/collections-const-new.rs b/src/test/ui/run-pass/collections-const-new.rs
similarity index 98%
rename from src/test/run-pass/collections-const-new.rs
rename to src/test/ui/run-pass/collections-const-new.rs
index 4003c2ec4f7e4..9e763258dcca7 100644
--- a/src/test/run-pass/collections-const-new.rs
+++ b/src/test/ui/run-pass/collections-const-new.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test several functions can be used for constants
 // 1. Vec::new()
 // 2. String::new()
diff --git a/src/test/run-pass/command-before-exec.rs b/src/test/ui/run-pass/command-before-exec.rs
similarity index 98%
rename from src/test/run-pass/command-before-exec.rs
rename to src/test/ui/run-pass/command-before-exec.rs
index c4fc9ee53fd7f..83a2ead8dcbe2 100644
--- a/src/test/run-pass/command-before-exec.rs
+++ b/src/test/ui/run-pass/command-before-exec.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+
 // ignore-windows - this is a unix-specific test
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
diff --git a/src/test/run-pass/command-exec.rs b/src/test/ui/run-pass/command-exec.rs
similarity index 98%
rename from src/test/run-pass/command-exec.rs
rename to src/test/ui/run-pass/command-exec.rs
index d6d0c2b36f647..cd598030247f8 100644
--- a/src/test/run-pass/command-exec.rs
+++ b/src/test/ui/run-pass/command-exec.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+
 // ignore-windows - this is a unix-specific test
 // ignore-pretty issue #37199
 // ignore-cloudabi no processes
diff --git a/src/test/run-pass/complex.rs b/src/test/ui/run-pass/complex.rs
similarity index 92%
rename from src/test/run-pass/complex.rs
rename to src/test/ui/run-pass/complex.rs
index 6bb9503c2b0e4..16d663215cc4d 100644
--- a/src/test/run-pass/complex.rs
+++ b/src/test/ui/run-pass/complex.rs
@@ -8,6 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(unconditional_recursion)]
+#![allow(non_camel_case_types)]
+
 
 
 
diff --git a/src/test/run-pass/concat.rs b/src/test/ui/run-pass/concat.rs
similarity index 98%
rename from src/test/run-pass/concat.rs
rename to src/test/ui/run-pass/concat.rs
index 9a2390a9e68d3..fe4b65a9175c0 100644
--- a/src/test/run-pass/concat.rs
+++ b/src/test/ui/run-pass/concat.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 pub fn main() {
     assert_eq!(format!(concat!("foo", "bar", "{}"), "baz"), "foobarbaz".to_string());
diff --git a/src/test/run-pass/const-int-conversion.rs b/src/test/ui/run-pass/consts/const-int-conversion.rs
similarity index 99%
rename from src/test/run-pass/const-int-conversion.rs
rename to src/test/ui/run-pass/consts/const-int-conversion.rs
index 790c62288d38b..e8706c57eaa51 100644
--- a/src/test/run-pass/const-int-conversion.rs
+++ b/src/test/ui/run-pass/consts/const-int-conversion.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(const_int_conversion, const_int_ops, reverse_bits, int_to_from_bytes)]
 
 const REVERSE: u32 = 0x12345678_u32.reverse_bits();
diff --git a/src/test/run-pass/const-int-overflowing.rs b/src/test/ui/run-pass/consts/const-int-overflowing.rs
similarity index 99%
rename from src/test/run-pass/const-int-overflowing.rs
rename to src/test/ui/run-pass/consts/const-int-overflowing.rs
index 0f8f230f456bd..dff31869ad3a8 100644
--- a/src/test/run-pass/const-int-overflowing.rs
+++ b/src/test/ui/run-pass/consts/const-int-overflowing.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(const_int_overflowing)]
 
 const ADD_A: (u32, bool) = 5u32.overflowing_add(2);
diff --git a/src/test/run-pass/const-int-rotate.rs b/src/test/ui/run-pass/consts/const-int-rotate.rs
similarity index 98%
rename from src/test/run-pass/const-int-rotate.rs
rename to src/test/ui/run-pass/consts/const-int-rotate.rs
index ee8e0b0b9dd7f..3bea4a0af38e1 100644
--- a/src/test/run-pass/const-int-rotate.rs
+++ b/src/test/ui/run-pass/consts/const-int-rotate.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(const_int_rotate)]
 
 const LEFT: u32 = 0x10000b3u32.rotate_left(8);
diff --git a/src/test/run-pass/const-int-sign.rs b/src/test/ui/run-pass/consts/const-int-sign.rs
similarity index 98%
rename from src/test/run-pass/const-int-sign.rs
rename to src/test/ui/run-pass/consts/const-int-sign.rs
index e095cfb000c5f..8c4ce0671b8cf 100644
--- a/src/test/run-pass/const-int-sign.rs
+++ b/src/test/ui/run-pass/consts/const-int-sign.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(const_int_sign)]
 
 const NEGATIVE_A: bool = (-10i32).is_negative();
diff --git a/src/test/run-pass/const-int-wrapping.rs b/src/test/ui/run-pass/consts/const-int-wrapping.rs
similarity index 99%
rename from src/test/run-pass/const-int-wrapping.rs
rename to src/test/ui/run-pass/consts/const-int-wrapping.rs
index ab7c98f9824ec..98610196b44b6 100644
--- a/src/test/run-pass/const-int-wrapping.rs
+++ b/src/test/ui/run-pass/consts/const-int-wrapping.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(const_int_wrapping)]
 
 const ADD_A: u32 = 200u32.wrapping_add(55);
diff --git a/src/test/run-pass/core-run-destroy.rs b/src/test/ui/run-pass/core-run-destroy.rs
similarity index 97%
rename from src/test/run-pass/core-run-destroy.rs
rename to src/test/ui/run-pass/core-run-destroy.rs
index eaec9b1926a20..d1ba36eee61de 100644
--- a/src/test/run-pass/core-run-destroy.rs
+++ b/src/test/ui/run-pass/core-run-destroy.rs
@@ -8,6 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+#![allow(deprecated)]
+
 // compile-flags:--test
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
diff --git a/src/test/run-pass/crate-leading-sep.rs b/src/test/ui/run-pass/crate-leading-sep.rs
similarity index 97%
rename from src/test/run-pass/crate-leading-sep.rs
rename to src/test/ui/run-pass/crate-leading-sep.rs
index ede78ff803d00..f24e9ce9f7133 100644
--- a/src/test/run-pass/crate-leading-sep.rs
+++ b/src/test/ui/run-pass/crate-leading-sep.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 fn main() {
diff --git a/src/test/run-pass/crate-method-reexport-grrrrrrr.rs b/src/test/ui/run-pass/crate-method-reexport-grrrrrrr.rs
similarity index 98%
rename from src/test/run-pass/crate-method-reexport-grrrrrrr.rs
rename to src/test/ui/run-pass/crate-method-reexport-grrrrrrr.rs
index c0bc97b1f659d..28bbecc351bff 100644
--- a/src/test/run-pass/crate-method-reexport-grrrrrrr.rs
+++ b/src/test/ui/run-pass/crate-method-reexport-grrrrrrr.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/crate-name-attr-used.rs b/src/test/ui/run-pass/crate-name-attr-used.rs
similarity index 97%
rename from src/test/run-pass/crate-name-attr-used.rs
rename to src/test/ui/run-pass/crate-name-attr-used.rs
index a108f4dc56874..1a20cd0f235ef 100644
--- a/src/test/run-pass/crate-name-attr-used.rs
+++ b/src/test/ui/run-pass/crate-name-attr-used.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags:--crate-name crate_name_attr_used -F unused-attributes
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/dead-code-alias-in-pat.rs b/src/test/ui/run-pass/dead-code-alias-in-pat.rs
similarity index 97%
rename from src/test/run-pass/dead-code-alias-in-pat.rs
rename to src/test/ui/run-pass/dead-code-alias-in-pat.rs
index a37d671e5c171..a1ef4e7c96802 100644
--- a/src/test/run-pass/dead-code-alias-in-pat.rs
+++ b/src/test/ui/run-pass/dead-code-alias-in-pat.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![deny(dead_code)]
 
 fn main() {
diff --git a/src/test/run-pass/dead-code-leading-underscore.rs b/src/test/ui/run-pass/dead-code-leading-underscore.rs
similarity index 98%
rename from src/test/run-pass/dead-code-leading-underscore.rs
rename to src/test/ui/run-pass/dead-code-leading-underscore.rs
index 6e3f8a288129c..93c61966bc4a6 100644
--- a/src/test/run-pass/dead-code-leading-underscore.rs
+++ b/src/test/ui/run-pass/dead-code-leading-underscore.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![deny(dead_code)]
diff --git a/src/test/run-pass/debuginfo-lto.rs b/src/test/ui/run-pass/debuginfo-lto.rs
similarity index 98%
rename from src/test/run-pass/debuginfo-lto.rs
rename to src/test/ui/run-pass/debuginfo-lto.rs
index c29cfafe438ca..4fd61ec7f1cad 100644
--- a/src/test/run-pass/debuginfo-lto.rs
+++ b/src/test/ui/run-pass/debuginfo-lto.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // This test case makes sure that we don't run into LLVM's dreaded
 // "possible ODR violation" assertion when compiling with LTO + Debuginfo.
 // It covers cases that have traditionally been prone to cause this error.
diff --git a/src/test/run-pass/deep.rs b/src/test/ui/run-pass/deep.rs
similarity index 98%
rename from src/test/run-pass/deep.rs
rename to src/test/ui/run-pass/deep.rs
index d59fe8d813d24..c460a42543569 100644
--- a/src/test/run-pass/deep.rs
+++ b/src/test/ui/run-pass/deep.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-emscripten apparently blows the stack
 
 fn f(x: isize) -> isize {
diff --git a/src/test/run-pass/default-alloc-error-hook.rs b/src/test/ui/run-pass/default-alloc-error-hook.rs
similarity index 98%
rename from src/test/run-pass/default-alloc-error-hook.rs
rename to src/test/ui/run-pass/default-alloc-error-hook.rs
index 5f6b60a5a8d99..9f012aeab2849 100644
--- a/src/test/run-pass/default-alloc-error-hook.rs
+++ b/src/test/ui/run-pass/default-alloc-error-hook.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 
diff --git a/src/test/run-pass/default-associated-types.rs b/src/test/ui/run-pass/default-associated-types.rs
similarity index 98%
rename from src/test/run-pass/default-associated-types.rs
rename to src/test/ui/run-pass/default-associated-types.rs
index ed55d5c8b171e..6a18605965f07 100644
--- a/src/test/run-pass/default-associated-types.rs
+++ b/src/test/ui/run-pass/default-associated-types.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(associated_type_defaults)]
 
 trait Foo<T: Default + ToString> {
diff --git a/src/test/run-pass/default-method-parsing.rs b/src/test/ui/run-pass/default-method-parsing.rs
similarity index 97%
rename from src/test/run-pass/default-method-parsing.rs
rename to src/test/ui/run-pass/default-method-parsing.rs
index 5ccb66a76bf76..2765465991608 100644
--- a/src/test/run-pass/default-method-parsing.rs
+++ b/src/test/ui/run-pass/default-method-parsing.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 trait Foo {
diff --git a/src/test/run-pass/default-method-simple.rs b/src/test/ui/run-pass/default-method-simple.rs
similarity index 98%
rename from src/test/run-pass/default-method-simple.rs
rename to src/test/ui/run-pass/default-method-simple.rs
index 61de804a80a81..57e5d0d91d7af 100644
--- a/src/test/run-pass/default-method-simple.rs
+++ b/src/test/ui/run-pass/default-method-simple.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 trait Foo {
     fn f(&self) {
diff --git a/src/test/run-pass/defaults-well-formedness.rs b/src/test/ui/run-pass/defaults-well-formedness.rs
similarity index 99%
rename from src/test/run-pass/defaults-well-formedness.rs
rename to src/test/ui/run-pass/defaults-well-formedness.rs
index 9b06bf837ae0c..05590ba3bd8c5 100644
--- a/src/test/run-pass/defaults-well-formedness.rs
+++ b/src/test/ui/run-pass/defaults-well-formedness.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 trait Trait<T> {}
 struct Foo<U, V=i32>(U, V) where U: Trait<V>;
 
diff --git a/src/test/run-pass/deprecation-in-force-unstable.rs b/src/test/ui/run-pass/deprecation-in-force-unstable.rs
similarity index 97%
rename from src/test/run-pass/deprecation-in-force-unstable.rs
rename to src/test/ui/run-pass/deprecation-in-force-unstable.rs
index 542117eca1209..cee2fda2d2a09 100644
--- a/src/test/run-pass/deprecation-in-force-unstable.rs
+++ b/src/test/ui/run-pass/deprecation-in-force-unstable.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags:-Zforce-unstable-if-unmarked
 
 #[deprecated] // should work even with -Zforce-unstable-if-unmarked
diff --git a/src/test/run-pass/deref-lval.rs b/src/test/ui/run-pass/deref-lval.rs
similarity index 97%
rename from src/test/run-pass/deref-lval.rs
rename to src/test/ui/run-pass/deref-lval.rs
index 0e65e5b43b732..c9c6ead4de116 100644
--- a/src/test/run-pass/deref-lval.rs
+++ b/src/test/ui/run-pass/deref-lval.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(box_syntax)]
 
 use std::cell::Cell;
diff --git a/src/test/run-pass/deref-mut-on-ref.rs b/src/test/ui/run-pass/deref-mut-on-ref.rs
similarity index 98%
rename from src/test/run-pass/deref-mut-on-ref.rs
rename to src/test/ui/run-pass/deref-mut-on-ref.rs
index 98441d7daaad7..06c8b3fb73c35 100644
--- a/src/test/run-pass/deref-mut-on-ref.rs
+++ b/src/test/ui/run-pass/deref-mut-on-ref.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that `&mut T` implements `DerefMut<T>`
 
 
diff --git a/src/test/run-pass/deref-on-ref.rs b/src/test/ui/run-pass/deref-on-ref.rs
similarity index 98%
rename from src/test/run-pass/deref-on-ref.rs
rename to src/test/ui/run-pass/deref-on-ref.rs
index 383c8197f9473..db23944fb1a71 100644
--- a/src/test/run-pass/deref-on-ref.rs
+++ b/src/test/ui/run-pass/deref-on-ref.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that `&T` and `&mut T` implement `Deref<T>`
 
 
diff --git a/src/test/run-pass/deref-rc.rs b/src/test/ui/run-pass/deref-rc.rs
similarity index 97%
rename from src/test/run-pass/deref-rc.rs
rename to src/test/ui/run-pass/deref-rc.rs
index fa50e3144ed84..b17cf4ef85074 100644
--- a/src/test/run-pass/deref-rc.rs
+++ b/src/test/ui/run-pass/deref-rc.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 use std::rc::Rc;
 
diff --git a/src/test/run-pass/deref.rs b/src/test/ui/run-pass/deref.rs
similarity index 97%
rename from src/test/run-pass/deref.rs
rename to src/test/ui/run-pass/deref.rs
index 0e6b3d87d345b..241058b6fcab1 100644
--- a/src/test/run-pass/deref.rs
+++ b/src/test/ui/run-pass/deref.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/discriminant_value-wrapper.rs b/src/test/ui/run-pass/discriminant_value-wrapper.rs
similarity index 98%
rename from src/test/run-pass/discriminant_value-wrapper.rs
rename to src/test/ui/run-pass/discriminant_value-wrapper.rs
index d7a32423710fd..b3adcd2458f50 100644
--- a/src/test/run-pass/discriminant_value-wrapper.rs
+++ b/src/test/ui/run-pass/discriminant_value-wrapper.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::mem;
 
 enum ADT {
diff --git a/src/test/run-pass/discriminant_value.rs b/src/test/ui/run-pass/discriminant_value.rs
similarity index 98%
rename from src/test/run-pass/discriminant_value.rs
rename to src/test/ui/run-pass/discriminant_value.rs
index 13257529ed9f8..60eb6b4272de9 100644
--- a/src/test/run-pass/discriminant_value.rs
+++ b/src/test/ui/run-pass/discriminant_value.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+
 #![feature(core, core_intrinsics)]
 
 extern crate core;
diff --git a/src/test/run-pass/diverging-fallback-control-flow.rs b/src/test/ui/run-pass/diverging-fallback-control-flow.rs
similarity index 99%
rename from src/test/run-pass/diverging-fallback-control-flow.rs
rename to src/test/ui/run-pass/diverging-fallback-control-flow.rs
index 723a98bcdfa0d..ced9535b0cb4b 100644
--- a/src/test/run-pass/diverging-fallback-control-flow.rs
+++ b/src/test/ui/run-pass/diverging-fallback-control-flow.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test various cases where we permit an unconstrained variable
 // to fallback based on control-flow.
 //
diff --git a/src/test/run-pass/diverging-fallback-method-chain.rs b/src/test/ui/run-pass/diverging-fallback-method-chain.rs
similarity index 98%
rename from src/test/run-pass/diverging-fallback-method-chain.rs
rename to src/test/ui/run-pass/diverging-fallback-method-chain.rs
index 664a329c228ae..173c4c69af4f3 100644
--- a/src/test/run-pass/diverging-fallback-method-chain.rs
+++ b/src/test/ui/run-pass/diverging-fallback-method-chain.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test a regression found when building compiler. The `produce()`
 // error type `T` winds up getting unified with result of `x.parse()`;
 // the type of the closure given to `unwrap_or_else` needs to be
diff --git a/src/test/run-pass/diverging-fallback-option.rs b/src/test/ui/run-pass/diverging-fallback-option.rs
similarity index 98%
rename from src/test/run-pass/diverging-fallback-option.rs
rename to src/test/ui/run-pass/diverging-fallback-option.rs
index 49f90e7c91f34..a96873d65a7bd 100644
--- a/src/test/run-pass/diverging-fallback-option.rs
+++ b/src/test/ui/run-pass/diverging-fallback-option.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![allow(warnings)]
 
 // Here the type of `c` is `Option<?T>`, where `?T` is unconstrained.
diff --git a/src/test/run-pass/double-ref.rs b/src/test/ui/run-pass/double-ref.rs
similarity index 99%
rename from src/test/run-pass/double-ref.rs
rename to src/test/ui/run-pass/double-ref.rs
index 13ce6a07e3641..b05a95296ed4c 100644
--- a/src/test/run-pass/double-ref.rs
+++ b/src/test/ui/run-pass/double-ref.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 fn check_expr() {
diff --git a/src/test/run-pass/auxiliary/inline_dtor.rs b/src/test/ui/run-pass/drop/auxiliary/inline_dtor.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/inline_dtor.rs
rename to src/test/ui/run-pass/drop/auxiliary/inline_dtor.rs
diff --git a/src/test/run-pass/cleanup-arm-conditional.rs b/src/test/ui/run-pass/drop/cleanup-arm-conditional.rs
similarity index 96%
rename from src/test/run-pass/cleanup-arm-conditional.rs
rename to src/test/ui/run-pass/drop/cleanup-arm-conditional.rs
index dd900c56b40b1..79c1799b037be 100644
--- a/src/test/run-pass/cleanup-arm-conditional.rs
+++ b/src/test/ui/run-pass/drop/cleanup-arm-conditional.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+
 // Test that cleanup scope for temporaries created in a match
 // arm is confined to the match arm itself.
 
diff --git a/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs b/src/test/ui/run-pass/drop/cleanup-rvalue-during-if-and-while.rs
similarity index 98%
rename from src/test/run-pass/cleanup-rvalue-during-if-and-while.rs
rename to src/test/ui/run-pass/drop/cleanup-rvalue-during-if-and-while.rs
index b117f4abd9572..6aeed4b06f4c4 100644
--- a/src/test/run-pass/cleanup-rvalue-during-if-and-while.rs
+++ b/src/test/ui/run-pass/drop/cleanup-rvalue-during-if-and-while.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // This test verifies that temporaries created for `while`'s and `if`
 // conditions are dropped after the condition is evaluated.
 
diff --git a/src/test/run-pass/cleanup-rvalue-for-scope.rs b/src/test/ui/run-pass/drop/cleanup-rvalue-for-scope.rs
similarity index 97%
rename from src/test/run-pass/cleanup-rvalue-for-scope.rs
rename to src/test/ui/run-pass/drop/cleanup-rvalue-for-scope.rs
index f69a0332cc4f4..cc56728e06b56 100644
--- a/src/test/run-pass/cleanup-rvalue-for-scope.rs
+++ b/src/test/ui/run-pass/drop/cleanup-rvalue-for-scope.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_snake_case)]
+
 // Test that the lifetime of rvalues in for loops is extended
 // to the for loop itself.
 
diff --git a/src/test/run-pass/cleanup-rvalue-scopes.rs b/src/test/ui/run-pass/drop/cleanup-rvalue-scopes.rs
similarity index 98%
rename from src/test/run-pass/cleanup-rvalue-scopes.rs
rename to src/test/ui/run-pass/drop/cleanup-rvalue-scopes.rs
index b5bf35a7006a3..8c51f5bd9419e 100644
--- a/src/test/run-pass/cleanup-rvalue-scopes.rs
+++ b/src/test/ui/run-pass/drop/cleanup-rvalue-scopes.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_snake_case)]
+
 // Test that destructors for rvalue temporaries run either at end of
 // statement or end of block, as appropriate given the temporary
 // lifetime rules.
diff --git a/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs b/src/test/ui/run-pass/drop/cleanup-rvalue-temp-during-incomplete-alloc.rs
similarity index 99%
rename from src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs
rename to src/test/ui/run-pass/drop/cleanup-rvalue-temp-during-incomplete-alloc.rs
index ae455d916b6f9..6d45d9bfdc11e 100644
--- a/src/test/run-pass/cleanup-rvalue-temp-during-incomplete-alloc.rs
+++ b/src/test/ui/run-pass/drop/cleanup-rvalue-temp-during-incomplete-alloc.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test cleanup of rvalue temporary that occurs while `box` construction
 // is in progress. This scenario revealed a rather terrible bug.  The
 // ingredients are:
diff --git a/src/test/run-pass/cleanup-shortcircuit.rs b/src/test/ui/run-pass/drop/cleanup-shortcircuit.rs
similarity index 98%
rename from src/test/run-pass/cleanup-shortcircuit.rs
rename to src/test/ui/run-pass/drop/cleanup-shortcircuit.rs
index 2460fa92925e4..87230059beb5a 100644
--- a/src/test/run-pass/cleanup-shortcircuit.rs
+++ b/src/test/ui/run-pass/drop/cleanup-shortcircuit.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that cleanups for the RHS of shortcircuiting operators work.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/resource-assign-is-not-copy.rs b/src/test/ui/run-pass/drop/resource-assign-is-not-copy.rs
similarity index 95%
rename from src/test/run-pass/resource-assign-is-not-copy.rs
rename to src/test/ui/run-pass/drop/resource-assign-is-not-copy.rs
index 4d0c2900a0fad..b69396c13812a 100644
--- a/src/test/run-pass/resource-assign-is-not-copy.rs
+++ b/src/test/ui/run-pass/drop/resource-assign-is-not-copy.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 use std::cell::Cell;
 
 #[derive(Debug)]
diff --git a/src/test/run-pass/resource-destruct.rs b/src/test/ui/run-pass/drop/resource-destruct.rs
similarity index 95%
rename from src/test/run-pass/resource-destruct.rs
rename to src/test/ui/run-pass/drop/resource-destruct.rs
index c92a9ca8480ca..f9d4c225d173f 100644
--- a/src/test/run-pass/resource-destruct.rs
+++ b/src/test/ui/run-pass/drop/resource-destruct.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 use std::cell::Cell;
 
 struct shrinky_pointer<'a> {
diff --git a/src/test/run-pass/use_inline_dtor.rs b/src/test/ui/run-pass/drop/use_inline_dtor.rs
similarity index 97%
rename from src/test/run-pass/use_inline_dtor.rs
rename to src/test/ui/run-pass/drop/use_inline_dtor.rs
index 0f55a357a00f4..f49c42b722961 100644
--- a/src/test/run-pass/use_inline_dtor.rs
+++ b/src/test/ui/run-pass/drop/use_inline_dtor.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:inline_dtor.rs
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/duplicated-external-mods.rs b/src/test/ui/run-pass/duplicated-external-mods.rs
similarity index 98%
rename from src/test/run-pass/duplicated-external-mods.rs
rename to src/test/ui/run-pass/duplicated-external-mods.rs
index 4cb3dbe027a16..d039ea2eb66a4 100644
--- a/src/test/run-pass/duplicated-external-mods.rs
+++ b/src/test/ui/run-pass/duplicated-external-mods.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:anon-extern-mod-cross-crate-1.rs
 // aux-build:anon-extern-mod-cross-crate-1.rs
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/early-ret-binop-add.rs b/src/test/ui/run-pass/early-ret-binop-add.rs
similarity index 97%
rename from src/test/run-pass/early-ret-binop-add.rs
rename to src/test/ui/run-pass/early-ret-binop-add.rs
index 0a490466ef73b..f766384f3d04d 100644
--- a/src/test/run-pass/early-ret-binop-add.rs
+++ b/src/test/ui/run-pass/early-ret-binop-add.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 use std::ops::Add;
diff --git a/src/test/run-pass/early-vtbl-resolution.rs b/src/test/ui/run-pass/early-vtbl-resolution.rs
similarity index 94%
rename from src/test/run-pass/early-vtbl-resolution.rs
rename to src/test/ui/run-pass/early-vtbl-resolution.rs
index 2d2cf6fbf0a7f..662c480833166 100644
--- a/src/test/run-pass/early-vtbl-resolution.rs
+++ b/src/test/ui/run-pass/early-vtbl-resolution.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 // pretty-expanded FIXME #23616
 
 trait thing<A> {
diff --git a/src/test/run-pass/edition-keywords-2015-2015.rs b/src/test/ui/run-pass/edition-keywords-2015-2015.rs
similarity index 98%
rename from src/test/run-pass/edition-keywords-2015-2015.rs
rename to src/test/ui/run-pass/edition-keywords-2015-2015.rs
index 1751eacc6b7ce..9396168868b7d 100644
--- a/src/test/run-pass/edition-keywords-2015-2015.rs
+++ b/src/test/ui/run-pass/edition-keywords-2015-2015.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // edition:2015
 // aux-build:edition-kw-macro-2015.rs
 
diff --git a/src/test/run-pass/edition-keywords-2015-2018.rs b/src/test/ui/run-pass/edition-keywords-2015-2018.rs
similarity index 98%
rename from src/test/run-pass/edition-keywords-2015-2018.rs
rename to src/test/ui/run-pass/edition-keywords-2015-2018.rs
index f2794a4b8d81a..7814fe8aa2a06 100644
--- a/src/test/run-pass/edition-keywords-2015-2018.rs
+++ b/src/test/ui/run-pass/edition-keywords-2015-2018.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // edition:2015
 // aux-build:edition-kw-macro-2018.rs
 
diff --git a/src/test/run-pass/edition-keywords-2018-2015.rs b/src/test/ui/run-pass/edition-keywords-2018-2015.rs
similarity index 98%
rename from src/test/run-pass/edition-keywords-2018-2015.rs
rename to src/test/ui/run-pass/edition-keywords-2018-2015.rs
index 7d5de00cdb8c2..6e26623a1fda4 100644
--- a/src/test/run-pass/edition-keywords-2018-2015.rs
+++ b/src/test/ui/run-pass/edition-keywords-2018-2015.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // edition:2018
 // aux-build:edition-kw-macro-2015.rs
 
diff --git a/src/test/run-pass/edition-keywords-2018-2018.rs b/src/test/ui/run-pass/edition-keywords-2018-2018.rs
similarity index 99%
rename from src/test/run-pass/edition-keywords-2018-2018.rs
rename to src/test/ui/run-pass/edition-keywords-2018-2018.rs
index 6462fc4da60a0..5490d5d1750dc 100644
--- a/src/test/run-pass/edition-keywords-2018-2018.rs
+++ b/src/test/ui/run-pass/edition-keywords-2018-2018.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // edition:2018
 // aux-build:edition-kw-macro-2018.rs
 
diff --git a/src/test/run-pass/else-if.rs b/src/test/ui/run-pass/else-if.rs
similarity index 98%
rename from src/test/run-pass/else-if.rs
rename to src/test/ui/run-pass/else-if.rs
index afc1d200b274b..fff970e3ff843 100644
--- a/src/test/run-pass/else-if.rs
+++ b/src/test/ui/run-pass/else-if.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/empty-type-parameter-list.rs b/src/test/ui/run-pass/empty-type-parameter-list.rs
similarity index 98%
rename from src/test/run-pass/empty-type-parameter-list.rs
rename to src/test/ui/run-pass/empty-type-parameter-list.rs
index 7af2844d5646e..1289d8e87e7f3 100644
--- a/src/test/run-pass/empty-type-parameter-list.rs
+++ b/src/test/ui/run-pass/empty-type-parameter-list.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that empty type parameter list (<>) is synonymous with
 // no type parameters at all
 
diff --git a/src/test/run-pass/empty_global_asm.rs b/src/test/ui/run-pass/empty_global_asm.rs
similarity index 98%
rename from src/test/run-pass/empty_global_asm.rs
rename to src/test/ui/run-pass/empty_global_asm.rs
index db73da2747f9c..acda812f4878c 100644
--- a/src/test/run-pass/empty_global_asm.rs
+++ b/src/test/ui/run-pass/empty_global_asm.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(global_asm)]
 
 #[cfg(target_arch = "x86")]
diff --git a/src/test/run-pass/env-args-reverse-iterator.rs b/src/test/ui/run-pass/env-args-reverse-iterator.rs
similarity index 99%
rename from src/test/run-pass/env-args-reverse-iterator.rs
rename to src/test/ui/run-pass/env-args-reverse-iterator.rs
index 0645c65d0d666..2be543038a5cb 100644
--- a/src/test/run-pass/env-args-reverse-iterator.rs
+++ b/src/test/ui/run-pass/env-args-reverse-iterator.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 
diff --git a/src/test/run-pass/env-funky-keys.rs b/src/test/ui/run-pass/env-funky-keys.rs
similarity index 99%
rename from src/test/run-pass/env-funky-keys.rs
rename to src/test/ui/run-pass/env-funky-keys.rs
index 12e1cbe97d83c..5c5ddc3bc0304 100644
--- a/src/test/run-pass/env-funky-keys.rs
+++ b/src/test/ui/run-pass/env-funky-keys.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Ignore this test on Android, because it segfaults there.
 
 // ignore-android
diff --git a/src/test/run-pass/env-home-dir.rs b/src/test/ui/run-pass/env-home-dir.rs
similarity index 98%
rename from src/test/run-pass/env-home-dir.rs
rename to src/test/ui/run-pass/env-home-dir.rs
index e92f24a27519e..635c2e0870302 100644
--- a/src/test/run-pass/env-home-dir.rs
+++ b/src/test/ui/run-pass/env-home-dir.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(deprecated)]
+
 // ignore-cloudabi no environment variables present
 // ignore-emscripten env vars don't work?
 
diff --git a/src/test/run-pass/env-null-vars.rs b/src/test/ui/run-pass/env-null-vars.rs
similarity index 98%
rename from src/test/run-pass/env-null-vars.rs
rename to src/test/ui/run-pass/env-null-vars.rs
index 296764269dec0..6e67eb2227db0 100644
--- a/src/test/run-pass/env-null-vars.rs
+++ b/src/test/ui/run-pass/env-null-vars.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-windows
 // ignore-wasm32-bare no libc to test ffi with
 
diff --git a/src/test/run-pass/env-vars.rs b/src/test/ui/run-pass/env-vars.rs
similarity index 98%
rename from src/test/run-pass/env-vars.rs
rename to src/test/ui/run-pass/env-vars.rs
index d7b4c81fc7f2b..670db2aca4161 100644
--- a/src/test/run-pass/env-vars.rs
+++ b/src/test/ui/run-pass/env-vars.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-cloudabi no env vars
 // ignore-wasm32-bare no env vars
 
diff --git a/src/test/run-pass/epoch-gate-feature.rs b/src/test/ui/run-pass/epoch-gate-feature.rs
similarity index 98%
rename from src/test/run-pass/epoch-gate-feature.rs
rename to src/test/ui/run-pass/epoch-gate-feature.rs
index e3cd1edd20987..240c388bacce1 100644
--- a/src/test/run-pass/epoch-gate-feature.rs
+++ b/src/test/ui/run-pass/epoch-gate-feature.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Checks if the correct registers are being used to pass arguments
 // when the sysv64 ABI is specified.
 
diff --git a/src/test/run-pass/eq-multidispatch.rs b/src/test/ui/run-pass/eq-multidispatch.rs
similarity index 98%
rename from src/test/run-pass/eq-multidispatch.rs
rename to src/test/ui/run-pass/eq-multidispatch.rs
index ca37ee28bcbc2..dea094a7ec04a 100644
--- a/src/test/run-pass/eq-multidispatch.rs
+++ b/src/test/ui/run-pass/eq-multidispatch.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 #[derive(PartialEq, Debug)]
 struct Bar;
diff --git a/src/test/run-pass/estr-uniq.rs b/src/test/ui/run-pass/estr-uniq.rs
similarity index 95%
rename from src/test/run-pass/estr-uniq.rs
rename to src/test/ui/run-pass/estr-uniq.rs
index 4dfb15418405d..541eb66a324af 100644
--- a/src/test/run-pass/estr-uniq.rs
+++ b/src/test/ui/run-pass/estr-uniq.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(unknown_lints)]
+
 
 #![allow(dead_assignment)]
 
diff --git a/src/test/run-pass/exec-env.rs b/src/test/ui/run-pass/exec-env.rs
similarity index 98%
rename from src/test/run-pass/exec-env.rs
rename to src/test/ui/run-pass/exec-env.rs
index b2d2e70f83ba5..e69a9963c712c 100644
--- a/src/test/run-pass/exec-env.rs
+++ b/src/test/ui/run-pass/exec-env.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // exec-env:TEST_EXEC_ENV=22
 // ignore-cloudabi no env vars
 // ignore-emscripten FIXME: issue #31622
diff --git a/src/test/run-pass/existential_type.rs b/src/test/ui/run-pass/existential_type.rs
similarity index 99%
rename from src/test/run-pass/existential_type.rs
rename to src/test/ui/run-pass/existential_type.rs
index e63d5c2293a81..622a8d165ba15 100644
--- a/src/test/run-pass/existential_type.rs
+++ b/src/test/ui/run-pass/existential_type.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(existential_type)]
 
 fn main() {
diff --git a/src/test/run-pass/explicit-i-suffix.rs b/src/test/ui/run-pass/explicit-i-suffix.rs
similarity index 97%
rename from src/test/run-pass/explicit-i-suffix.rs
rename to src/test/ui/run-pass/explicit-i-suffix.rs
index fa3970b62805b..7f1a9ced9949b 100644
--- a/src/test/run-pass/explicit-i-suffix.rs
+++ b/src/test/ui/run-pass/explicit-i-suffix.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 pub fn main() {
diff --git a/src/test/run-pass/export-glob-imports-target.rs b/src/test/ui/run-pass/export-glob-imports-target.rs
similarity index 94%
rename from src/test/run-pass/export-glob-imports-target.rs
rename to src/test/ui/run-pass/export-glob-imports-target.rs
index 4f821ebcc185a..37a183a119c92 100644
--- a/src/test/run-pass/export-glob-imports-target.rs
+++ b/src/test/ui/run-pass/export-glob-imports-target.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_upper_case_globals)]
+
 // Test that a glob-export functions as an import
 // when referenced within its own local scope.
 
diff --git a/src/test/run-pass/export-multi.rs b/src/test/ui/run-pass/export-multi.rs
similarity index 97%
rename from src/test/run-pass/export-multi.rs
rename to src/test/ui/run-pass/export-multi.rs
index e7c35fcd7562c..407d4be7adaf4 100644
--- a/src/test/run-pass/export-multi.rs
+++ b/src/test/ui/run-pass/export-multi.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 use m::f;
diff --git a/src/test/run-pass/export-non-interference2.rs b/src/test/ui/run-pass/export-non-interference2.rs
similarity index 97%
rename from src/test/run-pass/export-non-interference2.rs
rename to src/test/ui/run-pass/export-non-interference2.rs
index 0b9b8fbcfd33a..588ad6f027168 100644
--- a/src/test/run-pass/export-non-interference2.rs
+++ b/src/test/ui/run-pass/export-non-interference2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 mod foo {
     pub mod bar {
         pub fn y() { super::super::foo::x(); }
diff --git a/src/test/run-pass/export-non-interference3.rs b/src/test/ui/run-pass/export-non-interference3.rs
similarity index 97%
rename from src/test/run-pass/export-non-interference3.rs
rename to src/test/ui/run-pass/export-non-interference3.rs
index b7ef4df7ed6c0..3b642f0ae54b7 100644
--- a/src/test/run-pass/export-non-interference3.rs
+++ b/src/test/ui/run-pass/export-non-interference3.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub mod foo {
     pub fn x() { ::bar::x(); }
 }
diff --git a/src/test/run-pass/expr-block-fn.rs b/src/test/ui/run-pass/expr-block-fn.rs
similarity index 97%
rename from src/test/run-pass/expr-block-fn.rs
rename to src/test/ui/run-pass/expr-block-fn.rs
index 32641c4a3f2c9..79aabee1a6e67 100644
--- a/src/test/run-pass/expr-block-fn.rs
+++ b/src/test/ui/run-pass/expr-block-fn.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/expr-block-generic-unique1.rs b/src/test/ui/run-pass/expr-block-generic-unique1.rs
similarity index 98%
rename from src/test/run-pass/expr-block-generic-unique1.rs
rename to src/test/ui/run-pass/expr-block-generic-unique1.rs
index 304f1c7a2eacd..1885e1de99ad4 100644
--- a/src/test/run-pass/expr-block-generic-unique1.rs
+++ b/src/test/ui/run-pass/expr-block-generic-unique1.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(box_syntax)]
 
 fn test_generic<T, F>(expected: Box<T>, eq: F) where T: Clone, F: FnOnce(Box<T>, Box<T>) -> bool {
diff --git a/src/test/run-pass/expr-block-generic-unique2.rs b/src/test/ui/run-pass/expr-block-generic-unique2.rs
similarity index 98%
rename from src/test/run-pass/expr-block-generic-unique2.rs
rename to src/test/ui/run-pass/expr-block-generic-unique2.rs
index af3f5547867a1..f38f08e4d6c53 100644
--- a/src/test/run-pass/expr-block-generic-unique2.rs
+++ b/src/test/ui/run-pass/expr-block-generic-unique2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(box_syntax)]
 
 fn test_generic<T, F>(expected: T, eq: F) where T: Clone, F: FnOnce(T, T) -> bool {
diff --git a/src/test/run-pass/expr-block-generic.rs b/src/test/ui/run-pass/expr-block-generic.rs
similarity index 98%
rename from src/test/run-pass/expr-block-generic.rs
rename to src/test/ui/run-pass/expr-block-generic.rs
index 8795962bebdd8..cd08ec947a83a 100644
--- a/src/test/run-pass/expr-block-generic.rs
+++ b/src/test/ui/run-pass/expr-block-generic.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 fn test_generic<T: Clone, F>(expected: T, eq: F) where F: FnOnce(T, T) -> bool {
     let actual: T = { expected.clone() };
diff --git a/src/test/run-pass/expr-block-slot.rs b/src/test/ui/run-pass/expr-block-slot.rs
similarity index 98%
rename from src/test/run-pass/expr-block-slot.rs
rename to src/test/ui/run-pass/expr-block-slot.rs
index d9b4c95bc24d1..12d8ab290f304 100644
--- a/src/test/run-pass/expr-block-slot.rs
+++ b/src/test/ui/run-pass/expr-block-slot.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Regression test for issue #377
 
 
diff --git a/src/test/run-pass/expr-block-unique.rs b/src/test/ui/run-pass/expr-block-unique.rs
similarity index 97%
rename from src/test/run-pass/expr-block-unique.rs
rename to src/test/ui/run-pass/expr-block-unique.rs
index 2426ee5966c9f..8c40f3d896e72 100644
--- a/src/test/run-pass/expr-block-unique.rs
+++ b/src/test/ui/run-pass/expr-block-unique.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(box_syntax)]
 
 pub fn main() { let x: Box<_> = { box 100 }; assert_eq!(*x, 100); }
diff --git a/src/test/run-pass/expr-block.rs b/src/test/ui/run-pass/expr-block.rs
similarity index 98%
rename from src/test/run-pass/expr-block.rs
rename to src/test/ui/run-pass/expr-block.rs
index 664555caf26bb..1c2f882f05e75 100644
--- a/src/test/run-pass/expr-block.rs
+++ b/src/test/ui/run-pass/expr-block.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/expr-copy.rs b/src/test/ui/run-pass/expr-copy.rs
similarity index 98%
rename from src/test/run-pass/expr-copy.rs
rename to src/test/ui/run-pass/expr-copy.rs
index 99e74a6b8564d..f3256e172638c 100644
--- a/src/test/run-pass/expr-copy.rs
+++ b/src/test/ui/run-pass/expr-copy.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 fn f(arg: &mut A) {
diff --git a/src/test/run-pass/expr-empty-ret.rs b/src/test/ui/run-pass/expr-empty-ret.rs
similarity index 97%
rename from src/test/run-pass/expr-empty-ret.rs
rename to src/test/ui/run-pass/expr-empty-ret.rs
index 02ac2a0b67b14..f49c3fe7812d6 100644
--- a/src/test/run-pass/expr-empty-ret.rs
+++ b/src/test/ui/run-pass/expr-empty-ret.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Issue #521
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/expr-fn.rs b/src/test/ui/run-pass/expr-fn.rs
similarity index 99%
rename from src/test/run-pass/expr-fn.rs
rename to src/test/ui/run-pass/expr-fn.rs
index cc9a2e60decee..46f61f87e1d5d 100644
--- a/src/test/run-pass/expr-fn.rs
+++ b/src/test/ui/run-pass/expr-fn.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 fn test_int() {
diff --git a/src/test/run-pass/expr-if-generic.rs b/src/test/ui/run-pass/expr-if-generic.rs
similarity index 98%
rename from src/test/run-pass/expr-if-generic.rs
rename to src/test/ui/run-pass/expr-if-generic.rs
index 94c6b70bb62f3..4b0df21f448de 100644
--- a/src/test/run-pass/expr-if-generic.rs
+++ b/src/test/ui/run-pass/expr-if-generic.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 fn test_generic<T, F>(expected: T, not_expected: T, eq: F) where
     T: Clone,
diff --git a/src/test/run-pass/expr-if-panic-all.rs b/src/test/ui/run-pass/expr-if-panic-all.rs
similarity index 98%
rename from src/test/run-pass/expr-if-panic-all.rs
rename to src/test/ui/run-pass/expr-if-panic-all.rs
index 43110533b6dc6..4ddce1fd84e08 100644
--- a/src/test/run-pass/expr-if-panic-all.rs
+++ b/src/test/ui/run-pass/expr-if-panic-all.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // When all branches of an if expression result in panic, the entire if
 // expression results in panic.
 
diff --git a/src/test/run-pass/expr-if-panic.rs b/src/test/ui/run-pass/expr-if-panic.rs
similarity index 98%
rename from src/test/run-pass/expr-if-panic.rs
rename to src/test/ui/run-pass/expr-if-panic.rs
index 1bedc2a5a1707..2b14fe5eb9266 100644
--- a/src/test/run-pass/expr-if-panic.rs
+++ b/src/test/ui/run-pass/expr-if-panic.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 fn test_if_panic() {
     let x = if false { panic!() } else { 10 };
diff --git a/src/test/run-pass/expr-if-unique.rs b/src/test/ui/run-pass/expr-if-unique.rs
similarity index 98%
rename from src/test/run-pass/expr-if-unique.rs
rename to src/test/ui/run-pass/expr-if-unique.rs
index a8547536603ad..e60758b71adad 100644
--- a/src/test/run-pass/expr-if-unique.rs
+++ b/src/test/ui/run-pass/expr-if-unique.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(box_syntax)]
 
 // Tests for if as expressions returning boxed types
diff --git a/src/test/run-pass/expr-if.rs b/src/test/ui/run-pass/expr-if.rs
similarity index 99%
rename from src/test/run-pass/expr-if.rs
rename to src/test/ui/run-pass/expr-if.rs
index e8458e320113b..9e1cd86d013de 100644
--- a/src/test/run-pass/expr-if.rs
+++ b/src/test/ui/run-pass/expr-if.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/expr-scope.rs b/src/test/ui/run-pass/expr-scope.rs
similarity index 97%
rename from src/test/run-pass/expr-scope.rs
rename to src/test/ui/run-pass/expr-scope.rs
index a1d86218846d6..f096c289ed24c 100644
--- a/src/test/run-pass/expr-scope.rs
+++ b/src/test/ui/run-pass/expr-scope.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Regression test for issue #762
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/ext-expand-inner-exprs.rs b/src/test/ui/run-pass/ext-expand-inner-exprs.rs
similarity index 97%
rename from src/test/run-pass/ext-expand-inner-exprs.rs
rename to src/test/ui/run-pass/ext-expand-inner-exprs.rs
index 90ca31e80be3a..54ad582cd84fc 100644
--- a/src/test/run-pass/ext-expand-inner-exprs.rs
+++ b/src/test/ui/run-pass/ext-expand-inner-exprs.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 static FOO : &'static str = concat!(concat!("hel", "lo"), "world");
 
diff --git a/src/test/run-pass/extend-for-unit.rs b/src/test/ui/run-pass/extend-for-unit.rs
similarity index 97%
rename from src/test/run-pass/extend-for-unit.rs
rename to src/test/ui/run-pass/extend-for-unit.rs
index d1a0614bd8a19..897332766d9aa 100644
--- a/src/test/run-pass/extend-for-unit.rs
+++ b/src/test/ui/run-pass/extend-for-unit.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() {
     let mut x = 0;
     {
diff --git a/src/test/run-pass/exterior.rs b/src/test/ui/run-pass/exterior.rs
similarity index 98%
rename from src/test/run-pass/exterior.rs
rename to src/test/ui/run-pass/exterior.rs
index 5ab6c7774d55c..8ac8d303ace02 100644
--- a/src/test/run-pass/exterior.rs
+++ b/src/test/ui/run-pass/exterior.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 use std::cell::Cell;
diff --git a/src/test/run-pass/extoption_env-not-defined.rs b/src/test/ui/run-pass/extoption_env-not-defined.rs
similarity index 97%
rename from src/test/run-pass/extoption_env-not-defined.rs
rename to src/test/ui/run-pass/extoption_env-not-defined.rs
index 352f68da9854f..cd9eff123edf5 100644
--- a/src/test/run-pass/extoption_env-not-defined.rs
+++ b/src/test/ui/run-pass/extoption_env-not-defined.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 pub fn main() {
     assert!(option_env!("__HOPEFULLY_DOESNT_EXIST__").is_none());
diff --git a/src/test/run-pass/fact.rs b/src/test/ui/run-pass/fact.rs
similarity index 98%
rename from src/test/run-pass/fact.rs
rename to src/test/ui/run-pass/fact.rs
index 5cb2abbfb0a68..011ee68071eaf 100644
--- a/src/test/run-pass/fact.rs
+++ b/src/test/ui/run-pass/fact.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/fat-lto.rs b/src/test/ui/run-pass/fat-lto.rs
similarity index 97%
rename from src/test/run-pass/fat-lto.rs
rename to src/test/ui/run-pass/fat-lto.rs
index 453eede261cc0..ed5bda48e634b 100644
--- a/src/test/run-pass/fat-lto.rs
+++ b/src/test/ui/run-pass/fat-lto.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags: -Clto=fat
 // no-prefer-dynamic
 
diff --git a/src/test/run-pass/fat-ptr-cast.rs b/src/test/ui/run-pass/fat-ptr-cast.rs
similarity index 98%
rename from src/test/run-pass/fat-ptr-cast.rs
rename to src/test/ui/run-pass/fat-ptr-cast.rs
index 58296c3f95ef9..13e8088e758ba 100644
--- a/src/test/run-pass/fat-ptr-cast.rs
+++ b/src/test/ui/run-pass/fat-ptr-cast.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(raw)]
 
 use std::mem;
diff --git a/src/test/run-pass/fds-are-cloexec.rs b/src/test/ui/run-pass/fds-are-cloexec.rs
similarity index 99%
rename from src/test/run-pass/fds-are-cloexec.rs
rename to src/test/ui/run-pass/fds-are-cloexec.rs
index a5ae0ae9f3155..3f8a33bb1cfb9 100644
--- a/src/test/run-pass/fds-are-cloexec.rs
+++ b/src/test/ui/run-pass/fds-are-cloexec.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-windows
 // ignore-android
 // ignore-cloudabi no processes
diff --git a/src/test/run-pass/filter-block-view-items.rs b/src/test/ui/run-pass/filter-block-view-items.rs
similarity index 98%
rename from src/test/run-pass/filter-block-view-items.rs
rename to src/test/ui/run-pass/filter-block-view-items.rs
index fbdf817e9abb8..f17b7ca415bad 100644
--- a/src/test/run-pass/filter-block-view-items.rs
+++ b/src/test/ui/run-pass/filter-block-view-items.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 pub fn main() {
diff --git a/src/test/run-pass/fixup-deref-mut.rs b/src/test/ui/run-pass/fixup-deref-mut.rs
similarity index 98%
rename from src/test/run-pass/fixup-deref-mut.rs
rename to src/test/ui/run-pass/fixup-deref-mut.rs
index 900da3c2d6ab2..1efe0f44350dc 100644
--- a/src/test/run-pass/fixup-deref-mut.rs
+++ b/src/test/ui/run-pass/fixup-deref-mut.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 use std::ops::{Deref, DerefMut};
diff --git a/src/test/run-pass/abi-sysv64-arg-passing.rs b/src/test/ui/run-pass/foreign/abi-sysv64-arg-passing.rs
similarity index 99%
rename from src/test/run-pass/abi-sysv64-arg-passing.rs
rename to src/test/ui/run-pass/foreign/abi-sysv64-arg-passing.rs
index 4ec3f16f7af6d..7435637241b7c 100644
--- a/src/test/run-pass/abi-sysv64-arg-passing.rs
+++ b/src/test/ui/run-pass/foreign/abi-sysv64-arg-passing.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Checks if the "sysv64" calling convention behaves the same as the
 // "C" calling convention on platforms where both should be the same
 
diff --git a/src/test/run-pass/abi-sysv64-register-usage.rs b/src/test/ui/run-pass/foreign/abi-sysv64-register-usage.rs
similarity index 99%
rename from src/test/run-pass/abi-sysv64-register-usage.rs
rename to src/test/ui/run-pass/foreign/abi-sysv64-register-usage.rs
index e701329127502..1b2c321ed29ff 100644
--- a/src/test/run-pass/abi-sysv64-register-usage.rs
+++ b/src/test/ui/run-pass/foreign/abi-sysv64-register-usage.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Checks if the correct registers are being used to pass arguments
 // when the sysv64 ABI is specified.
 
diff --git a/src/test/run-pass/abort-on-c-abi.rs b/src/test/ui/run-pass/foreign/abort-on-c-abi.rs
similarity index 99%
rename from src/test/run-pass/abort-on-c-abi.rs
rename to src/test/ui/run-pass/foreign/abort-on-c-abi.rs
index ef368ed604bea..e0f314cd81614 100644
--- a/src/test/run-pass/abort-on-c-abi.rs
+++ b/src/test/ui/run-pass/foreign/abort-on-c-abi.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Since we mark some ABIs as "nounwind" to LLVM, we must make sure that
 // we never unwind through them.
 
diff --git a/src/test/run-pass/align-with-extern-c-fn.rs b/src/test/ui/run-pass/foreign/align-with-extern-c-fn.rs
similarity index 93%
rename from src/test/run-pass/align-with-extern-c-fn.rs
rename to src/test/ui/run-pass/foreign/align-with-extern-c-fn.rs
index 6f89c5d377f54..42af6c38daaa8 100644
--- a/src/test/run-pass/align-with-extern-c-fn.rs
+++ b/src/test/ui/run-pass/foreign/align-with-extern-c-fn.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+
 // #45662
 
 #![feature(repr_align)]
diff --git a/src/test/run-pass/anon-extern-mod.rs b/src/test/ui/run-pass/foreign/anon-extern-mod.rs
similarity index 98%
rename from src/test/run-pass/anon-extern-mod.rs
rename to src/test/ui/run-pass/foreign/anon-extern-mod.rs
index 16ca7bce95b59..3b8b6ada13bd7 100644
--- a/src/test/run-pass/anon-extern-mod.rs
+++ b/src/test/ui/run-pass/foreign/anon-extern-mod.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 // ignore-wasm32-bare no libc to test ffi with
 
diff --git a/src/test/run-pass/auxiliary/weak-lang-items.rs b/src/test/ui/run-pass/foreign/auxiliary/weak-lang-items.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/weak-lang-items.rs
rename to src/test/ui/run-pass/foreign/auxiliary/weak-lang-items.rs
diff --git a/src/test/run-pass/c-stack-as-value.rs b/src/test/ui/run-pass/foreign/c-stack-as-value.rs
similarity index 98%
rename from src/test/run-pass/c-stack-as-value.rs
rename to src/test/ui/run-pass/foreign/c-stack-as-value.rs
index df4989d89ab5e..985505c395286 100644
--- a/src/test/run-pass/c-stack-as-value.rs
+++ b/src/test/ui/run-pass/foreign/c-stack-as-value.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 // ignore-wasm32-bare no libc to test ffi with
 
diff --git a/src/test/run-pass/c-stack-returning-int64.rs b/src/test/ui/run-pass/foreign/c-stack-returning-int64.rs
similarity index 98%
rename from src/test/run-pass/c-stack-returning-int64.rs
rename to src/test/ui/run-pass/foreign/c-stack-returning-int64.rs
index 56a0437146b9e..d7d8aa18aa77c 100644
--- a/src/test/run-pass/c-stack-returning-int64.rs
+++ b/src/test/ui/run-pass/foreign/c-stack-returning-int64.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-wasm32-bare no libc to test with
 
 #![feature(libc)]
diff --git a/src/test/run-pass/cabi-int-widening.rs b/src/test/ui/run-pass/foreign/cabi-int-widening.rs
similarity index 98%
rename from src/test/run-pass/cabi-int-widening.rs
rename to src/test/ui/run-pass/foreign/cabi-int-widening.rs
index 5b1677c184c74..64dbcbe65a142 100644
--- a/src/test/run-pass/cabi-int-widening.rs
+++ b/src/test/ui/run-pass/foreign/cabi-int-widening.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-wasm32-bare no libc to test ffi with
 
 #[link(name = "rust_test_helpers", kind = "static")]
diff --git a/src/test/run-pass/crt-static-off-works.rs b/src/test/ui/run-pass/foreign/crt-static-off-works.rs
similarity index 94%
rename from src/test/run-pass/crt-static-off-works.rs
rename to src/test/ui/run-pass/foreign/crt-static-off-works.rs
index c94c877c12c6d..e74a3a2e1e768 100644
--- a/src/test/run-pass/crt-static-off-works.rs
+++ b/src/test/ui/run-pass/foreign/crt-static-off-works.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+
 // compile-flags:-C target-feature=-crt-static -Z unstable-options
 // ignore-musl - requires changing the linker which is hard
 
diff --git a/src/test/run-pass/crt-static-on-works.rs b/src/test/ui/run-pass/foreign/crt-static-on-works.rs
similarity index 93%
rename from src/test/run-pass/crt-static-on-works.rs
rename to src/test/ui/run-pass/foreign/crt-static-on-works.rs
index ae8e5f6297048..48c3935efdebe 100644
--- a/src/test/run-pass/crt-static-on-works.rs
+++ b/src/test/ui/run-pass/foreign/crt-static-on-works.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+
 // compile-flags:-C target-feature=+crt-static -Z unstable-options
 
 #![feature(cfg_target_feature)]
diff --git a/src/test/run-pass/invoke-external-foreign.rs b/src/test/ui/run-pass/foreign/invoke-external-foreign.rs
similarity index 98%
rename from src/test/run-pass/invoke-external-foreign.rs
rename to src/test/ui/run-pass/foreign/invoke-external-foreign.rs
index d01c3b67895e6..8d427b358d879 100644
--- a/src/test/run-pass/invoke-external-foreign.rs
+++ b/src/test/ui/run-pass/foreign/invoke-external-foreign.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:foreign_lib.rs
 // ignore-wasm32-bare no libc to test ffi with
 
diff --git a/src/test/run-pass/repr_c_int_align.rs b/src/test/ui/run-pass/foreign/repr_c_int_align.rs
similarity index 99%
rename from src/test/run-pass/repr_c_int_align.rs
rename to src/test/ui/run-pass/foreign/repr_c_int_align.rs
index af4eb61530290..a3f4465ee4adb 100644
--- a/src/test/run-pass/repr_c_int_align.rs
+++ b/src/test/ui/run-pass/foreign/repr_c_int_align.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags: -O
 
 #![allow(dead_code)]
diff --git a/src/test/run-pass/variadic-ffi.rs b/src/test/ui/run-pass/foreign/variadic-ffi.rs
similarity index 99%
rename from src/test/run-pass/variadic-ffi.rs
rename to src/test/ui/run-pass/foreign/variadic-ffi.rs
index 2198ead106bb7..703285611e5ff 100644
--- a/src/test/run-pass/variadic-ffi.rs
+++ b/src/test/ui/run-pass/foreign/variadic-ffi.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-wasm32-bare no libc to test ffi with
 
 #[link(name = "rust_test_helpers", kind = "static")]
diff --git a/src/test/run-pass/warn-ctypes-inhibit.rs b/src/test/ui/run-pass/foreign/warn-ctypes-inhibit.rs
similarity index 98%
rename from src/test/run-pass/warn-ctypes-inhibit.rs
rename to src/test/ui/run-pass/foreign/warn-ctypes-inhibit.rs
index 81a3c94eec313..61fe2ac3ca96e 100644
--- a/src/test/run-pass/warn-ctypes-inhibit.rs
+++ b/src/test/ui/run-pass/foreign/warn-ctypes-inhibit.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags:-D improper-ctypes
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/weak-lang-item.rs b/src/test/ui/run-pass/foreign/weak-lang-item.rs
similarity index 98%
rename from src/test/run-pass/weak-lang-item.rs
rename to src/test/ui/run-pass/foreign/weak-lang-item.rs
index d9f4ec2892035..45c1543a42c9e 100644
--- a/src/test/run-pass/weak-lang-item.rs
+++ b/src/test/ui/run-pass/foreign/weak-lang-item.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:weak-lang-items.rs
 
 // ignore-emscripten no threads support
diff --git a/src/test/run-pass/format-hygiene.rs b/src/test/ui/run-pass/format-hygiene.rs
similarity index 91%
rename from src/test/run-pass/format-hygiene.rs
rename to src/test/ui/run-pass/format-hygiene.rs
index 6971f775231d5..185de85a6e48e 100644
--- a/src/test/run-pass/format-hygiene.rs
+++ b/src/test/ui/run-pass/format-hygiene.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_upper_case_globals)]
+
 pub const arg0: u8 = 1;
 
 pub fn main() {
diff --git a/src/test/run-pass/format-nan.rs b/src/test/ui/run-pass/format-nan.rs
similarity index 98%
rename from src/test/run-pass/format-nan.rs
rename to src/test/ui/run-pass/format-nan.rs
index 9bbd8cdb11d88..33bb6df9ea3de 100644
--- a/src/test/run-pass/format-nan.rs
+++ b/src/test/ui/run-pass/format-nan.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 pub fn main() {
     use std::f64;
diff --git a/src/test/run-pass/format-no-std.rs b/src/test/ui/run-pass/format-no-std.rs
similarity index 98%
rename from src/test/run-pass/format-no-std.rs
rename to src/test/ui/run-pass/format-no-std.rs
index e23accfcc235d..bf2f853d6d397 100644
--- a/src/test/run-pass/format-no-std.rs
+++ b/src/test/ui/run-pass/format-no-std.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-emscripten no no_std executables
 
 #![feature(lang_items, start, alloc)]
diff --git a/src/test/run-pass/format-ref-cell.rs b/src/test/ui/run-pass/format-ref-cell.rs
similarity index 98%
rename from src/test/run-pass/format-ref-cell.rs
rename to src/test/ui/run-pass/format-ref-cell.rs
index 0f16dfa1e8f15..dc84ec5c2c383 100644
--- a/src/test/run-pass/format-ref-cell.rs
+++ b/src/test/ui/run-pass/format-ref-cell.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 use std::cell::RefCell;
 
diff --git a/src/test/run-pass/fsu-moves-and-copies.rs b/src/test/ui/run-pass/fsu-moves-and-copies.rs
similarity index 97%
rename from src/test/run-pass/fsu-moves-and-copies.rs
rename to src/test/ui/run-pass/fsu-moves-and-copies.rs
index efd7f66e93b83..99bcded851b21 100644
--- a/src/test/run-pass/fsu-moves-and-copies.rs
+++ b/src/test/ui/run-pass/fsu-moves-and-copies.rs
@@ -8,6 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+#![allow(stable_features)]
+
 // Issue 4691: Ensure that functional-struct-updates operates
 // correctly and moves rather than copy when appropriate.
 
diff --git a/src/test/run-pass/fun-call-variants.rs b/src/test/ui/run-pass/fun-call-variants.rs
similarity index 98%
rename from src/test/run-pass/fun-call-variants.rs
rename to src/test/ui/run-pass/fun-call-variants.rs
index 3bb6df33f70a0..60304d6934951 100644
--- a/src/test/run-pass/fun-call-variants.rs
+++ b/src/test/ui/run-pass/fun-call-variants.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 fn ho<F>(f: F) -> isize where F: FnOnce(isize) -> isize { let n: isize = f(3); return n; }
 
diff --git a/src/test/run-pass/fun-indirect-call.rs b/src/test/ui/run-pass/fun-indirect-call.rs
similarity index 97%
rename from src/test/run-pass/fun-indirect-call.rs
rename to src/test/ui/run-pass/fun-indirect-call.rs
index b28c64d06be2f..c915841d7a1b0 100644
--- a/src/test/run-pass/fun-indirect-call.rs
+++ b/src/test/ui/run-pass/fun-indirect-call.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/argument-passing.rs b/src/test/ui/run-pass/functions-closures/argument-passing.rs
similarity index 98%
rename from src/test/run-pass/argument-passing.rs
rename to src/test/ui/run-pass/functions-closures/argument-passing.rs
index d2a595804a4b2..370177b92102a 100644
--- a/src/test/run-pass/argument-passing.rs
+++ b/src/test/ui/run-pass/functions-closures/argument-passing.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 struct X {
diff --git a/src/test/run-pass/bare-fn-implements-fn-mut.rs b/src/test/ui/run-pass/functions-closures/bare-fn-implements-fn-mut.rs
similarity index 98%
rename from src/test/run-pass/bare-fn-implements-fn-mut.rs
rename to src/test/ui/run-pass/functions-closures/bare-fn-implements-fn-mut.rs
index 30a11ca2536d3..2b8d790d7ae5e 100644
--- a/src/test/run-pass/bare-fn-implements-fn-mut.rs
+++ b/src/test/ui/run-pass/functions-closures/bare-fn-implements-fn-mut.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::ops::FnMut;
 
 fn call_f<F:FnMut()>(mut f: F) {
diff --git a/src/test/run-pass/block-arg-call-as.rs b/src/test/ui/run-pass/functions-closures/block-arg-call-as.rs
similarity index 94%
rename from src/test/run-pass/block-arg-call-as.rs
rename to src/test/ui/run-pass/functions-closures/block-arg-call-as.rs
index 73cba2e4e0a7c..87fd1df097b7f 100644
--- a/src/test/run-pass/block-arg-call-as.rs
+++ b/src/test/ui/run-pass/functions-closures/block-arg-call-as.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_snake_case)]
 
 fn asBlock<F>(f: F) -> usize where F: FnOnce() -> usize {
    return f();
diff --git a/src/test/run-pass/block-arg.rs b/src/test/ui/run-pass/functions-closures/block-arg.rs
similarity index 98%
rename from src/test/run-pass/block-arg.rs
rename to src/test/ui/run-pass/functions-closures/block-arg.rs
index 7fca4bccab3ff..2d7cb091c5356 100644
--- a/src/test/run-pass/block-arg.rs
+++ b/src/test/ui/run-pass/functions-closures/block-arg.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Check usage and precedence of block arguments in expressions:
 pub fn main() {
     let v = vec![-1.0f64, 0.0, 1.0, 2.0, 3.0];
diff --git a/src/test/run-pass/block-explicit-types.rs b/src/test/ui/run-pass/functions-closures/block-explicit-types.rs
similarity index 98%
rename from src/test/run-pass/block-explicit-types.rs
rename to src/test/ui/run-pass/functions-closures/block-explicit-types.rs
index 835d356d8aaa1..f03f58176fe51 100644
--- a/src/test/run-pass/block-explicit-types.rs
+++ b/src/test/ui/run-pass/functions-closures/block-explicit-types.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() {
     fn as_buf<T, F>(s: String, f: F) -> T where F: FnOnce(String) -> T { f(s) }
     as_buf("foo".to_string(), |foo: String| -> () { println!("{}", foo) });
diff --git a/src/test/run-pass/block-fn-coerce.rs b/src/test/ui/run-pass/functions-closures/block-fn-coerce.rs
similarity index 98%
rename from src/test/run-pass/block-fn-coerce.rs
rename to src/test/ui/run-pass/functions-closures/block-fn-coerce.rs
index 3e6109da39a26..5489ee4c330c1 100644
--- a/src/test/run-pass/block-fn-coerce.rs
+++ b/src/test/ui/run-pass/functions-closures/block-fn-coerce.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 fn force<F>(f: F) -> isize where F: FnOnce() -> isize { return f(); }
 
diff --git a/src/test/run-pass/block-iter-1.rs b/src/test/ui/run-pass/functions-closures/block-iter-1.rs
similarity index 98%
rename from src/test/run-pass/block-iter-1.rs
rename to src/test/ui/run-pass/functions-closures/block-iter-1.rs
index 7cbe8104deb5d..e1d4f92dfd2fa 100644
--- a/src/test/run-pass/block-iter-1.rs
+++ b/src/test/ui/run-pass/functions-closures/block-iter-1.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 fn iter_vec<T, F>(v: Vec<T> , mut f: F) where F: FnMut(&T) { for x in &v { f(x); } }
 
 pub fn main() {
diff --git a/src/test/run-pass/block-iter-2.rs b/src/test/ui/run-pass/functions-closures/block-iter-2.rs
similarity index 98%
rename from src/test/run-pass/block-iter-2.rs
rename to src/test/ui/run-pass/functions-closures/block-iter-2.rs
index 7701f6114ca62..3cb5f7594e49b 100644
--- a/src/test/run-pass/block-iter-2.rs
+++ b/src/test/ui/run-pass/functions-closures/block-iter-2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 fn iter_vec<T, F>(v: Vec<T>, mut f: F) where F: FnMut(&T) { for x in &v { f(x); } }
 
 pub fn main() {
diff --git a/src/test/run-pass/lambda-infer-unresolved.rs b/src/test/ui/run-pass/functions-closures/lambda-infer-unresolved.rs
similarity index 98%
rename from src/test/run-pass/lambda-infer-unresolved.rs
rename to src/test/ui/run-pass/functions-closures/lambda-infer-unresolved.rs
index 5109c6fc77726..64c96feb3a0aa 100644
--- a/src/test/run-pass/lambda-infer-unresolved.rs
+++ b/src/test/ui/run-pass/functions-closures/lambda-infer-unresolved.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // This should typecheck even though the type of e is not fully
 // resolved when we finish typechecking the ||.
 
diff --git a/src/test/run-pass/lambda-var-hygiene.rs b/src/test/ui/run-pass/functions-closures/lambda-var-hygiene.rs
similarity index 98%
rename from src/test/run-pass/lambda-var-hygiene.rs
rename to src/test/ui/run-pass/functions-closures/lambda-var-hygiene.rs
index ae5bf71d15fe4..e7bd16c42eac0 100644
--- a/src/test/run-pass/lambda-var-hygiene.rs
+++ b/src/test/ui/run-pass/functions-closures/lambda-var-hygiene.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // shouldn't affect evaluation of $ex:
 macro_rules! bad_macro {
     ($ex:expr) => ({(|_x| { $ex }) (9) })
diff --git a/src/test/run-pass/last-use-in-block.rs b/src/test/ui/run-pass/functions-closures/last-use-in-block.rs
similarity index 98%
rename from src/test/run-pass/last-use-in-block.rs
rename to src/test/ui/run-pass/functions-closures/last-use-in-block.rs
index a2b01f29ae127..9d85dc6a47f31 100644
--- a/src/test/run-pass/last-use-in-block.rs
+++ b/src/test/ui/run-pass/functions-closures/last-use-in-block.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Issue #1818
 
 
diff --git a/src/test/run-pass/last-use-in-cap-clause.rs b/src/test/ui/run-pass/functions-closures/last-use-in-cap-clause.rs
similarity index 98%
rename from src/test/run-pass/last-use-in-cap-clause.rs
rename to src/test/ui/run-pass/functions-closures/last-use-in-cap-clause.rs
index 5fbcfadf870e1..e3ab69ce9298a 100644
--- a/src/test/run-pass/last-use-in-cap-clause.rs
+++ b/src/test/ui/run-pass/functions-closures/last-use-in-cap-clause.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Make sure #1399 stays fixed
 
 struct A { a: Box<isize> }
diff --git a/src/test/run-pass/last-use-is-capture.rs b/src/test/ui/run-pass/functions-closures/last-use-is-capture.rs
similarity index 98%
rename from src/test/run-pass/last-use-is-capture.rs
rename to src/test/ui/run-pass/functions-closures/last-use-is-capture.rs
index cb2a2061406a2..98bec37b7ba85 100644
--- a/src/test/run-pass/last-use-is-capture.rs
+++ b/src/test/ui/run-pass/functions-closures/last-use-is-capture.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Make sure #1399 stays fixed
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/newlambdas-ret-infer.rs b/src/test/ui/run-pass/functions-closures/newlambdas-ret-infer.rs
similarity index 98%
rename from src/test/run-pass/newlambdas-ret-infer.rs
rename to src/test/ui/run-pass/functions-closures/newlambdas-ret-infer.rs
index 428eed0787a83..180858b67510a 100644
--- a/src/test/run-pass/newlambdas-ret-infer.rs
+++ b/src/test/ui/run-pass/functions-closures/newlambdas-ret-infer.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that the lambda kind is inferred correctly as a return
 // expression
 
diff --git a/src/test/run-pass/newlambdas-ret-infer2.rs b/src/test/ui/run-pass/functions-closures/newlambdas-ret-infer2.rs
similarity index 98%
rename from src/test/run-pass/newlambdas-ret-infer2.rs
rename to src/test/ui/run-pass/functions-closures/newlambdas-ret-infer2.rs
index 439ea3f2b579c..c1b199255f058 100644
--- a/src/test/run-pass/newlambdas-ret-infer2.rs
+++ b/src/test/ui/run-pass/functions-closures/newlambdas-ret-infer2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that the lambda kind is inferred correctly as a return
 // expression
 
diff --git a/src/test/run-pass/newlambdas.rs b/src/test/ui/run-pass/functions-closures/newlambdas.rs
similarity index 98%
rename from src/test/run-pass/newlambdas.rs
rename to src/test/ui/run-pass/functions-closures/newlambdas.rs
index a6f39958632c2..636f13d925bd6 100644
--- a/src/test/run-pass/newlambdas.rs
+++ b/src/test/ui/run-pass/functions-closures/newlambdas.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Tests for the new |args| expr lambda syntax
 
 
diff --git a/src/test/run-pass/semistatement-in-lambda.rs b/src/test/ui/run-pass/functions-closures/semistatement-in-lambda.rs
similarity index 98%
rename from src/test/run-pass/semistatement-in-lambda.rs
rename to src/test/ui/run-pass/functions-closures/semistatement-in-lambda.rs
index 0fc5fe498a62d..e38dba446a147 100644
--- a/src/test/run-pass/semistatement-in-lambda.rs
+++ b/src/test/ui/run-pass/functions-closures/semistatement-in-lambda.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 pub fn main() {
     // Test that lambdas behave as unary expressions with block-like expressions
diff --git a/src/test/run-pass/futures-api.rs b/src/test/ui/run-pass/futures-api.rs
similarity index 99%
rename from src/test/run-pass/futures-api.rs
rename to src/test/ui/run-pass/futures-api.rs
index 69a04437691dd..d0a8b9056f32c 100644
--- a/src/test/run-pass/futures-api.rs
+++ b/src/test/ui/run-pass/futures-api.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(arbitrary_self_types, futures_api, pin)]
 #![allow(unused)]
 
diff --git a/src/test/run-pass/cycle-generic-bound.rs b/src/test/ui/run-pass/generics/cycle-generic-bound.rs
similarity index 98%
rename from src/test/run-pass/cycle-generic-bound.rs
rename to src/test/ui/run-pass/generics/cycle-generic-bound.rs
index b6d84f9d5a240..6751d26f7c2e3 100644
--- a/src/test/run-pass/cycle-generic-bound.rs
+++ b/src/test/ui/run-pass/generics/cycle-generic-bound.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Regression test for #15477. This test just needs to compile.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs b/src/test/ui/run-pass/generics/variance-intersection-of-ref-and-opt-ref.rs
similarity index 98%
rename from src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs
rename to src/test/ui/run-pass/generics/variance-intersection-of-ref-and-opt-ref.rs
index 948d68e0ccd7d..083d75abea460 100644
--- a/src/test/run-pass/variance-intersection-of-ref-and-opt-ref.rs
+++ b/src/test/ui/run-pass/generics/variance-intersection-of-ref-and-opt-ref.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Elaborated version of the opening example from RFC 738. This failed
 // to compile before variance because invariance of `Option` prevented
 // us from approximating the lifetimes of `field1` and `field2` to a
diff --git a/src/test/run-pass/variance-iterators-in-libcore.rs b/src/test/ui/run-pass/generics/variance-iterators-in-libcore.rs
similarity index 97%
rename from src/test/run-pass/variance-iterators-in-libcore.rs
rename to src/test/ui/run-pass/generics/variance-iterators-in-libcore.rs
index b9677d5ba8598..604bad1d5f08b 100644
--- a/src/test/run-pass/variance-iterators-in-libcore.rs
+++ b/src/test/ui/run-pass/generics/variance-iterators-in-libcore.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![allow(warnings)]
 
 use std::iter::Zip;
diff --git a/src/test/run-pass/global-scope.rs b/src/test/ui/run-pass/global-scope.rs
similarity index 98%
rename from src/test/run-pass/global-scope.rs
rename to src/test/ui/run-pass/global-scope.rs
index 8e155c459965d..b777c57bd8190 100644
--- a/src/test/run-pass/global-scope.rs
+++ b/src/test/ui/run-pass/global-scope.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 pub fn f() -> isize { return 1; }
diff --git a/src/test/run-pass/guards-not-exhaustive.rs b/src/test/ui/run-pass/guards-not-exhaustive.rs
similarity index 94%
rename from src/test/run-pass/guards-not-exhaustive.rs
rename to src/test/ui/run-pass/guards-not-exhaustive.rs
index 53c3eff5b81ee..9c04531b5762e 100644
--- a/src/test/run-pass/guards-not-exhaustive.rs
+++ b/src/test/ui/run-pass/guards-not-exhaustive.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_snake_case)]
+
 
 #[derive(Copy, Clone)]
 enum Q { R(Option<usize>) }
diff --git a/src/test/run-pass/guards.rs b/src/test/ui/run-pass/guards.rs
similarity index 94%
rename from src/test/run-pass/guards.rs
rename to src/test/ui/run-pass/guards.rs
index d79dbabac2d42..0dce2a00e4301 100644
--- a/src/test/run-pass/guards.rs
+++ b/src/test/ui/run-pass/guards.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_shorthand_field_patterns)]
+
 
 #[derive(Copy, Clone)]
 struct Pair { x: isize, y: isize }
diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/ui/run-pass/hashmap-memory.rs
similarity index 98%
rename from src/test/run-pass/hashmap-memory.rs
rename to src/test/ui/run-pass/hashmap-memory.rs
index 2e98e0fe5ca3d..60b06ed89fc4c 100644
--- a/src/test/run-pass/hashmap-memory.rs
+++ b/src/test/ui/run-pass/hashmap-memory.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 // ignore-emscripten No support for threads
 
 /**
diff --git a/src/test/run-pass/hello.rs b/src/test/ui/run-pass/hello.rs
similarity index 97%
rename from src/test/run-pass/hello.rs
rename to src/test/ui/run-pass/hello.rs
index 61dcbb75b9ef9..fa18cd5d5bd21 100644
--- a/src/test/run-pass/hello.rs
+++ b/src/test/ui/run-pass/hello.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() {
     println!("hello, world");
 }
diff --git a/src/test/run-pass/html-literals.rs b/src/test/ui/run-pass/html-literals.rs
similarity index 98%
rename from src/test/run-pass/html-literals.rs
rename to src/test/ui/run-pass/html-literals.rs
index 1e1fde4d1e2be..491b350adad7d 100644
--- a/src/test/run-pass/html-literals.rs
+++ b/src/test/ui/run-pass/html-literals.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 // A test of the macro system. Can we do HTML literals?
 
 /*
diff --git a/src/test/run-pass/if-bot.rs b/src/test/ui/run-pass/if-bot.rs
similarity index 97%
rename from src/test/run-pass/if-bot.rs
rename to src/test/ui/run-pass/if-bot.rs
index e66a8c85723a0..98e30c5d4306f 100644
--- a/src/test/run-pass/if-bot.rs
+++ b/src/test/ui/run-pass/if-bot.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() {
     let i: isize = if false { panic!() } else { 5 };
     println!("{}", i);
diff --git a/src/test/run-pass/if-check.rs b/src/test/ui/run-pass/if-check.rs
similarity index 98%
rename from src/test/run-pass/if-check.rs
rename to src/test/ui/run-pass/if-check.rs
index c72cd10a082e9..f4765be3dc924 100644
--- a/src/test/run-pass/if-check.rs
+++ b/src/test/ui/run-pass/if-check.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 fn even(x: usize) -> bool {
     if x < 2 {
         return false;
diff --git a/src/test/run-pass/if-ret.rs b/src/test/ui/run-pass/if-ret.rs
similarity index 97%
rename from src/test/run-pass/if-ret.rs
rename to src/test/ui/run-pass/if-ret.rs
index 8d475a99b8188..8c09af46b20c0 100644
--- a/src/test/run-pass/if-ret.rs
+++ b/src/test/ui/run-pass/if-ret.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 fn foo() { if (return) { } }
diff --git a/src/test/run-pass/ifmt.rs b/src/test/ui/run-pass/ifmt.rs
similarity index 99%
rename from src/test/run-pass/ifmt.rs
rename to src/test/ui/run-pass/ifmt.rs
index 37436d7ae0042..4d3593499f759 100644
--- a/src/test/run-pass/ifmt.rs
+++ b/src/test/ui/run-pass/ifmt.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![deny(warnings)]
 #![allow(unused_must_use)]
 #![allow(unused_features)]
diff --git a/src/test/run-pass/ignore-all-the-things.rs b/src/test/ui/run-pass/ignore-all-the-things.rs
similarity index 96%
rename from src/test/run-pass/ignore-all-the-things.rs
rename to src/test/ui/run-pass/ignore-all-the-things.rs
index c14f3dc72916d..ed10661ddf580 100644
--- a/src/test/run-pass/ignore-all-the-things.rs
+++ b/src/test/ui/run-pass/ignore-all-the-things.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_shorthand_field_patterns)]
+
 // pretty-expanded FIXME #23616
 
 #![feature(slice_patterns)]
diff --git a/src/test/run-pass/impl-for-never.rs b/src/test/ui/run-pass/impl-for-never.rs
similarity index 98%
rename from src/test/run-pass/impl-for-never.rs
rename to src/test/ui/run-pass/impl-for-never.rs
index 794f5969bff50..49e058360da9d 100644
--- a/src/test/run-pass/impl-for-never.rs
+++ b/src/test/ui/run-pass/impl-for-never.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that we can call static methods on ! both directly and when it appears in a generic
 
 #![feature(never_type)]
diff --git a/src/test/run-pass/impl-inherent-non-conflict.rs b/src/test/ui/run-pass/impl-inherent-non-conflict.rs
similarity index 98%
rename from src/test/run-pass/impl-inherent-non-conflict.rs
rename to src/test/ui/run-pass/impl-inherent-non-conflict.rs
index 209b4acb09586..cbd5334d31027 100644
--- a/src/test/run-pass/impl-inherent-non-conflict.rs
+++ b/src/test/ui/run-pass/impl-inherent-non-conflict.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Ensure that a user-defined type admits multiple inherent methods
 // with the same name, which can be called on values that have a
 // precise enough type to allow distinguishing between the methods.
diff --git a/src/test/run-pass/impl-not-adjacent-to-type.rs b/src/test/ui/run-pass/impl-not-adjacent-to-type.rs
similarity index 98%
rename from src/test/run-pass/impl-not-adjacent-to-type.rs
rename to src/test/ui/run-pass/impl-not-adjacent-to-type.rs
index beba056b72cdc..a70d65b671225 100644
--- a/src/test/run-pass/impl-not-adjacent-to-type.rs
+++ b/src/test/ui/run-pass/impl-not-adjacent-to-type.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 mod foo {
     pub struct Point {
diff --git a/src/test/run-pass/impl-privacy-xc-1.rs b/src/test/ui/run-pass/impl-privacy-xc-1.rs
similarity index 98%
rename from src/test/run-pass/impl-privacy-xc-1.rs
rename to src/test/ui/run-pass/impl-privacy-xc-1.rs
index 97945f4c4dac3..8147abc93bc4f 100644
--- a/src/test/run-pass/impl-privacy-xc-1.rs
+++ b/src/test/ui/run-pass/impl-privacy-xc-1.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:impl_privacy_xc_1.rs
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/impl-privacy-xc-2.rs b/src/test/ui/run-pass/impl-privacy-xc-2.rs
similarity index 98%
rename from src/test/run-pass/impl-privacy-xc-2.rs
rename to src/test/ui/run-pass/impl-privacy-xc-2.rs
index 3ef4b43d079c8..cc57327a9e98c 100644
--- a/src/test/run-pass/impl-privacy-xc-2.rs
+++ b/src/test/ui/run-pass/impl-privacy-xc-2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:impl_privacy_xc_2.rs
 
 extern crate impl_privacy_xc_2;
diff --git a/src/test/run-pass/use-crate-name-alias.rs b/src/test/ui/run-pass/imports/use-crate-name-alias.rs
similarity index 97%
rename from src/test/run-pass/use-crate-name-alias.rs
rename to src/test/ui/run-pass/imports/use-crate-name-alias.rs
index 98594183a00d0..606335c4ca705 100644
--- a/src/test/run-pass/use-crate-name-alias.rs
+++ b/src/test/ui/run-pass/imports/use-crate-name-alias.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Issue #1706
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/use-keyword-2.rs b/src/test/ui/run-pass/imports/use-keyword-2.rs
similarity index 98%
rename from src/test/run-pass/use-keyword-2.rs
rename to src/test/ui/run-pass/imports/use-keyword-2.rs
index 60016f5959469..8289bc2316500 100644
--- a/src/test/run-pass/use-keyword-2.rs
+++ b/src/test/ui/run-pass/imports/use-keyword-2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub struct A;
 
 mod test {
diff --git a/src/test/run-pass/use-mod.rs b/src/test/ui/run-pass/imports/use-mod.rs
similarity index 98%
rename from src/test/run-pass/use-mod.rs
rename to src/test/ui/run-pass/imports/use-mod.rs
index 49ad171eaa2b6..7c9a58de4aefb 100644
--- a/src/test/run-pass/use-mod.rs
+++ b/src/test/ui/run-pass/imports/use-mod.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 pub use foo::bar::{self, First};
diff --git a/src/test/run-pass/use-nested-groups.rs b/src/test/ui/run-pass/imports/use-nested-groups.rs
similarity index 98%
rename from src/test/run-pass/use-nested-groups.rs
rename to src/test/ui/run-pass/imports/use-nested-groups.rs
index be06e463e3b37..63506800480c2 100644
--- a/src/test/run-pass/use-nested-groups.rs
+++ b/src/test/ui/run-pass/imports/use-nested-groups.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 mod a {
     pub enum B {}
 
diff --git a/src/test/run-pass/use.rs b/src/test/ui/run-pass/imports/use.rs
similarity index 95%
rename from src/test/run-pass/use.rs
rename to src/test/ui/run-pass/imports/use.rs
index 09a3849b9153b..5a61ab668acc1 100644
--- a/src/test/run-pass/use.rs
+++ b/src/test/ui/run-pass/imports/use.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+
 // pretty-expanded FIXME #23616
 
 #![allow(unused_imports)]
diff --git a/src/test/run-pass/in-band-lifetimes.rs b/src/test/ui/run-pass/in-band-lifetimes.rs
similarity index 99%
rename from src/test/run-pass/in-band-lifetimes.rs
rename to src/test/ui/run-pass/in-band-lifetimes.rs
index 6edd0d686eff8..7368b693a6d10 100644
--- a/src/test/run-pass/in-band-lifetimes.rs
+++ b/src/test/ui/run-pass/in-band-lifetimes.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![allow(warnings)]
 #![feature(in_band_lifetimes)]
 
diff --git a/src/test/run-pass/inc-range-pat.rs b/src/test/ui/run-pass/inc-range-pat.rs
similarity index 98%
rename from src/test/run-pass/inc-range-pat.rs
rename to src/test/ui/run-pass/inc-range-pat.rs
index 237b41b6128cf..fd85062076c35 100644
--- a/src/test/run-pass/inc-range-pat.rs
+++ b/src/test/ui/run-pass/inc-range-pat.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test old and new syntax for inclusive range patterns.
 
 fn main() {
diff --git a/src/test/run-pass/infer-fn-tail-expr.rs b/src/test/ui/run-pass/infer-fn-tail-expr.rs
similarity index 97%
rename from src/test/run-pass/infer-fn-tail-expr.rs
rename to src/test/ui/run-pass/infer-fn-tail-expr.rs
index f00005fc7d0b5..e698f1492f4a2 100644
--- a/src/test/run-pass/infer-fn-tail-expr.rs
+++ b/src/test/ui/run-pass/infer-fn-tail-expr.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // issue #680
 
 
diff --git a/src/test/run-pass/init-large-type.rs b/src/test/ui/run-pass/init-large-type.rs
similarity index 98%
rename from src/test/run-pass/init-large-type.rs
rename to src/test/ui/run-pass/init-large-type.rs
index c8f9a0e4cab6d..600b621099c2f 100644
--- a/src/test/run-pass/init-large-type.rs
+++ b/src/test/ui/run-pass/init-large-type.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Makes sure that zero-initializing large types is reasonably fast,
 // Doing it incorrectly causes massive slowdown in LLVM during
 // optimisation.
diff --git a/src/test/run-pass/init-res-into-things.rs b/src/test/ui/run-pass/init-res-into-things.rs
similarity index 97%
rename from src/test/run-pass/init-res-into-things.rs
rename to src/test/ui/run-pass/init-res-into-things.rs
index a270b00398166..c49308e9f663a 100644
--- a/src/test/run-pass/init-res-into-things.rs
+++ b/src/test/ui/run-pass/init-res-into-things.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 #![feature(box_syntax)]
 
 use std::cell::Cell;
diff --git a/src/test/run-pass/inlined-main.rs b/src/test/ui/run-pass/inlined-main.rs
similarity index 97%
rename from src/test/run-pass/inlined-main.rs
rename to src/test/ui/run-pass/inlined-main.rs
index 1288c37d615cd..282a1e21e7007 100644
--- a/src/test/run-pass/inlined-main.rs
+++ b/src/test/ui/run-pass/inlined-main.rs
@@ -8,5 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #[inline(always)]
 fn main() {}
diff --git a/src/test/run-pass/inner-attrs-on-impl.rs b/src/test/ui/run-pass/inner-attrs-on-impl.rs
similarity index 98%
rename from src/test/run-pass/inner-attrs-on-impl.rs
rename to src/test/ui/run-pass/inner-attrs-on-impl.rs
index d8d9d5136e2d1..194925f21b423 100644
--- a/src/test/run-pass/inner-attrs-on-impl.rs
+++ b/src/test/ui/run-pass/inner-attrs-on-impl.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 struct Foo;
diff --git a/src/test/run-pass/inner-static.rs b/src/test/ui/run-pass/inner-static.rs
similarity index 98%
rename from src/test/run-pass/inner-static.rs
rename to src/test/ui/run-pass/inner-static.rs
index b93ca943e4714..4d90bad846e23 100644
--- a/src/test/run-pass/inner-static.rs
+++ b/src/test/ui/run-pass/inner-static.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:inner_static.rs
 
 
diff --git a/src/test/run-pass/instantiable.rs b/src/test/ui/run-pass/instantiable.rs
similarity index 94%
rename from src/test/run-pass/instantiable.rs
rename to src/test/ui/run-pass/instantiable.rs
index 28fba70eb24d9..53f3f4feeec34 100644
--- a/src/test/run-pass/instantiable.rs
+++ b/src/test/ui/run-pass/instantiable.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 // pretty-expanded FIXME #23616
 
 use std::ptr;
diff --git a/src/test/run-pass/auxiliary/typeid-intrinsic-aux1.rs b/src/test/ui/run-pass/intrinsics/auxiliary/typeid-intrinsic-aux1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/typeid-intrinsic-aux1.rs
rename to src/test/ui/run-pass/intrinsics/auxiliary/typeid-intrinsic-aux1.rs
diff --git a/src/test/run-pass/auxiliary/typeid-intrinsic-aux2.rs b/src/test/ui/run-pass/intrinsics/auxiliary/typeid-intrinsic-aux2.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/typeid-intrinsic-aux2.rs
rename to src/test/ui/run-pass/intrinsics/auxiliary/typeid-intrinsic-aux2.rs
diff --git a/src/test/run-pass/typeid-intrinsic.rs b/src/test/ui/run-pass/intrinsics/typeid-intrinsic.rs
similarity index 99%
rename from src/test/run-pass/typeid-intrinsic.rs
rename to src/test/ui/run-pass/intrinsics/typeid-intrinsic.rs
index 54d5415a5539b..7e1f456d4d3f6 100644
--- a/src/test/run-pass/typeid-intrinsic.rs
+++ b/src/test/ui/run-pass/intrinsics/typeid-intrinsic.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(deprecated)]
+
 // aux-build:typeid-intrinsic-aux1.rs
 // aux-build:typeid-intrinsic-aux2.rs
 
diff --git a/src/test/run-pass/invalid_const_promotion.rs b/src/test/ui/run-pass/invalid_const_promotion.rs
similarity index 99%
rename from src/test/run-pass/invalid_const_promotion.rs
rename to src/test/ui/run-pass/invalid_const_promotion.rs
index a18d82fb7a4e7..ebf0458f5f59c 100644
--- a/src/test/run-pass/invalid_const_promotion.rs
+++ b/src/test/ui/run-pass/invalid_const_promotion.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-wasm32
 // ignore-emscripten
 
diff --git a/src/test/run-pass/irrefutable-unit.rs b/src/test/ui/run-pass/irrefutable-unit.rs
similarity index 97%
rename from src/test/run-pass/irrefutable-unit.rs
rename to src/test/ui/run-pass/irrefutable-unit.rs
index 0c2fbb01f48f4..73e6856814885 100644
--- a/src/test/run-pass/irrefutable-unit.rs
+++ b/src/test/ui/run-pass/irrefutable-unit.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 pub fn main() {
diff --git a/src/test/run-pass/bug-7183-generics.rs b/src/test/ui/run-pass/issues/bug-7183-generics.rs
similarity index 99%
rename from src/test/run-pass/bug-7183-generics.rs
rename to src/test/ui/run-pass/issues/bug-7183-generics.rs
index 80fd09114fc95..0981e78ebd224 100644
--- a/src/test/run-pass/bug-7183-generics.rs
+++ b/src/test/ui/run-pass/issues/bug-7183-generics.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 trait Speak : Sized {
     fn say(&self, s:&str) -> String;
diff --git a/src/test/run-pass/bug-7295.rs b/src/test/ui/run-pass/issues/bug-7295.rs
similarity index 98%
rename from src/test/run-pass/bug-7295.rs
rename to src/test/ui/run-pass/issues/bug-7295.rs
index 89fd51bd5f1dc..0c4234ec5161a 100644
--- a/src/test/run-pass/bug-7295.rs
+++ b/src/test/ui/run-pass/issues/bug-7295.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 pub trait Foo<T> {
diff --git a/src/test/run-pass/issue-48006.rs b/src/test/ui/run-pass/issues/issue-48006.rs
similarity index 98%
rename from src/test/run-pass/issue-48006.rs
rename to src/test/ui/run-pass/issues/issue-48006.rs
index d5887bb64cd25..243917226ea5e 100644
--- a/src/test/run-pass/issue-48006.rs
+++ b/src/test/ui/run-pass/issues/issue-48006.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(step_trait)]
 
 use std::iter::Step;
diff --git a/src/test/run-pass/issue-53728.rs b/src/test/ui/run-pass/issues/issue-53728.rs
similarity index 98%
rename from src/test/run-pass/issue-53728.rs
rename to src/test/ui/run-pass/issues/issue-53728.rs
index f9cb5da29a7d0..1f73c2a2e905c 100644
--- a/src/test/run-pass/issue-53728.rs
+++ b/src/test/ui/run-pass/issues/issue-53728.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #[repr(u16)]
 enum DeviceKind {
     Nil = 0,
diff --git a/src/test/run-pass/istr.rs b/src/test/ui/run-pass/istr.rs
similarity index 99%
rename from src/test/run-pass/istr.rs
rename to src/test/ui/run-pass/istr.rs
index 7ebeb79f56669..dd0e38dd154cc 100644
--- a/src/test/run-pass/istr.rs
+++ b/src/test/ui/run-pass/istr.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::string::String;
 
 fn test_stack_assign() {
diff --git a/src/test/run-pass/item-attributes.rs b/src/test/ui/run-pass/item-attributes.rs
similarity index 97%
rename from src/test/run-pass/item-attributes.rs
rename to src/test/ui/run-pass/item-attributes.rs
index 0fc13319b8734..dbcdcdc47e484 100644
--- a/src/test/run-pass/item-attributes.rs
+++ b/src/test/ui/run-pass/item-attributes.rs
@@ -8,6 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+#![allow(non_upper_case_globals)]
+#![allow(unknown_lints)]
+
 // These are attributes of the implicit crate. Really this just needs to parse
 // for completeness since .rs files linked from .rc files support this
 // notation to specify their module's attributes
diff --git a/src/test/run-pass/item-name-overload.rs b/src/test/ui/run-pass/item-name-overload.rs
similarity index 97%
rename from src/test/run-pass/item-name-overload.rs
rename to src/test/ui/run-pass/item-name-overload.rs
index 2827a6df33737..736685ac30965 100644
--- a/src/test/run-pass/item-name-overload.rs
+++ b/src/test/ui/run-pass/item-name-overload.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/keyword-changes-2012-07-31.rs b/src/test/ui/run-pass/keyword-changes-2012-07-31.rs
similarity index 98%
rename from src/test/run-pass/keyword-changes-2012-07-31.rs
rename to src/test/ui/run-pass/keyword-changes-2012-07-31.rs
index 9838fe62394ce..bf752790d4f25 100644
--- a/src/test/run-pass/keyword-changes-2012-07-31.rs
+++ b/src/test/ui/run-pass/keyword-changes-2012-07-31.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // return -> return
 // mod -> module
 // match -> match
diff --git a/src/test/run-pass/kindck-implicit-close-over-mut-var.rs b/src/test/ui/run-pass/kindck-implicit-close-over-mut-var.rs
similarity index 99%
rename from src/test/run-pass/kindck-implicit-close-over-mut-var.rs
rename to src/test/ui/run-pass/kindck-implicit-close-over-mut-var.rs
index 1c5d8a69bf340..3b6f104bf1d6a 100644
--- a/src/test/run-pass/kindck-implicit-close-over-mut-var.rs
+++ b/src/test/ui/run-pass/kindck-implicit-close-over-mut-var.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::thread;
 
 fn user(_i: isize) {}
diff --git a/src/test/run-pass/kinds-in-metadata.rs b/src/test/ui/run-pass/kinds-in-metadata.rs
similarity index 98%
rename from src/test/run-pass/kinds-in-metadata.rs
rename to src/test/ui/run-pass/kinds-in-metadata.rs
index 84c5da1ad6c2a..aefea6dd85043 100644
--- a/src/test/run-pass/kinds-in-metadata.rs
+++ b/src/test/ui/run-pass/kinds-in-metadata.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:kinds_in_metadata.rs
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/large-records.rs b/src/test/ui/run-pass/large-records.rs
similarity index 98%
rename from src/test/run-pass/large-records.rs
rename to src/test/ui/run-pass/large-records.rs
index e9c66093fb0cf..e48c4eb8bf546 100644
--- a/src/test/run-pass/large-records.rs
+++ b/src/test/ui/run-pass/large-records.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/lazy-and-or.rs b/src/test/ui/run-pass/lazy-and-or.rs
similarity index 98%
rename from src/test/run-pass/lazy-and-or.rs
rename to src/test/ui/run-pass/lazy-and-or.rs
index 500de64ae832c..fdc9f01ac6720 100644
--- a/src/test/run-pass/lazy-and-or.rs
+++ b/src/test/ui/run-pass/lazy-and-or.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 fn incr(x: &mut isize) -> bool { *x += 1; assert!((false)); return false; }
 
 pub fn main() {
diff --git a/src/test/run-pass/lazy-init.rs b/src/test/ui/run-pass/lazy-init.rs
similarity index 97%
rename from src/test/run-pass/lazy-init.rs
rename to src/test/ui/run-pass/lazy-init.rs
index d71d7e751a045..9a2378cdb19af 100644
--- a/src/test/run-pass/lazy-init.rs
+++ b/src/test/ui/run-pass/lazy-init.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 fn foo(x: isize) { println!("{}", x); }
diff --git a/src/test/run-pass/leak-unique-as-tydesc.rs b/src/test/ui/run-pass/leak-unique-as-tydesc.rs
similarity index 97%
rename from src/test/run-pass/leak-unique-as-tydesc.rs
rename to src/test/ui/run-pass/leak-unique-as-tydesc.rs
index d89888927e1bd..4aae22010f588 100644
--- a/src/test/run-pass/leak-unique-as-tydesc.rs
+++ b/src/test/ui/run-pass/leak-unique-as-tydesc.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/lex-bare-cr-nondoc-comment.rs b/src/test/ui/run-pass/lex-bare-cr-nondoc-comment.rs
similarity index 97%
rename from src/test/run-pass/lex-bare-cr-nondoc-comment.rs
rename to src/test/ui/run-pass/lex-bare-cr-nondoc-comment.rs
index ba949ca88814d..d96c763cb03ca 100644
--- a/src/test/run-pass/lex-bare-cr-nondoc-comment.rs
+++ b/src/test/ui/run-pass/lex-bare-cr-nondoc-comment.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-tidy-cr
 
 // nondoc comment with bare CR: '
'
diff --git a/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs b/src/test/ui/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs
similarity index 95%
rename from src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs
rename to src/test/ui/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs
index 05f1f1bfea0fb..4f7abf5725837 100644
--- a/src/test/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs
+++ b/src/test/ui/run-pass/lexer-crlf-line-endings-string-literal-doc-comment.rs
@@ -12,6 +12,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // NB: this file needs CRLF line endings. The .gitattributes file in
 // this directory should enforce it.
 
diff --git a/src/test/run-pass/lexical-scoping.rs b/src/test/ui/run-pass/lexical-scoping.rs
similarity index 98%
rename from src/test/run-pass/lexical-scoping.rs
rename to src/test/ui/run-pass/lexical-scoping.rs
index 36604042d0f25..d53b7e8137222 100644
--- a/src/test/run-pass/lexical-scoping.rs
+++ b/src/test/ui/run-pass/lexical-scoping.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Tests that items in subscopes can shadow type parameters and local variables (see issue #23880).
 
 #![allow(unused)]
diff --git a/src/test/run-pass/link-cfg-works.rs b/src/test/ui/run-pass/link-cfg-works.rs
similarity index 98%
rename from src/test/run-pass/link-cfg-works.rs
rename to src/test/ui/run-pass/link-cfg-works.rs
index 7db948c7daa9f..ad2c82d3fb3aa 100644
--- a/src/test/run-pass/link-cfg-works.rs
+++ b/src/test/ui/run-pass/link-cfg-works.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:link-cfg-works-transitive-rlib.rs
 // aux-build:link-cfg-works-transitive-dylib.rs
 
diff --git a/src/test/run-pass/link-section.rs b/src/test/ui/run-pass/link-section.rs
similarity index 96%
rename from src/test/run-pass/link-section.rs
rename to src/test/ui/run-pass/link-section.rs
index 3336ce7e723de..987f8c51269b7 100644
--- a/src/test/run-pass/link-section.rs
+++ b/src/test/ui/run-pass/link-section.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_upper_case_globals)]
+
 #[cfg(not(target_os = "macos"))]
 #[link_section=".moretext"]
 fn i_live_in_more_text() -> &'static str {
diff --git a/src/test/run-pass/linkage1.rs b/src/test/ui/run-pass/linkage1.rs
similarity index 99%
rename from src/test/run-pass/linkage1.rs
rename to src/test/ui/run-pass/linkage1.rs
index f12a233f493ee..fb50e63af0f36 100644
--- a/src/test/run-pass/linkage1.rs
+++ b/src/test/ui/run-pass/linkage1.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-windows
 // ignore-macos
 // ignore-emscripten doesn't support this linkage
diff --git a/src/test/run-pass/lint-cap.rs b/src/test/ui/run-pass/lint-cap.rs
similarity index 97%
rename from src/test/run-pass/lint-cap.rs
rename to src/test/ui/run-pass/lint-cap.rs
index 003a99f746a59..0dfb6e8b9f3a8 100644
--- a/src/test/run-pass/lint-cap.rs
+++ b/src/test/ui/run-pass/lint-cap.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags: --cap-lints allow
 
 #![deny(warnings)]
diff --git a/src/test/run-pass/lint-dead-code-associated-type.rs b/src/test/ui/run-pass/lint-dead-code-associated-type.rs
similarity index 97%
rename from src/test/run-pass/lint-dead-code-associated-type.rs
rename to src/test/ui/run-pass/lint-dead-code-associated-type.rs
index 1ae078ba2211a..53f388b531d5f 100644
--- a/src/test/run-pass/lint-dead-code-associated-type.rs
+++ b/src/test/ui/run-pass/lint-dead-code-associated-type.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![deny(dead_code)]
 
 trait Foo {
diff --git a/src/test/run-pass/lint-dead-code-variant.rs b/src/test/ui/run-pass/lint-dead-code-variant.rs
similarity index 97%
rename from src/test/run-pass/lint-dead-code-variant.rs
rename to src/test/ui/run-pass/lint-dead-code-variant.rs
index 074c69d87087f..65e5375977f07 100644
--- a/src/test/run-pass/lint-dead-code-variant.rs
+++ b/src/test/ui/run-pass/lint-dead-code-variant.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![deny(dead_code)]
 
 enum Foo {
diff --git a/src/test/run-pass/lint-expr-stmt-attrs-for-early-lints.rs b/src/test/ui/run-pass/lint-expr-stmt-attrs-for-early-lints.rs
similarity index 98%
rename from src/test/run-pass/lint-expr-stmt-attrs-for-early-lints.rs
rename to src/test/ui/run-pass/lint-expr-stmt-attrs-for-early-lints.rs
index 16c7176a68db4..e242b94e26549 100644
--- a/src/test/run-pass/lint-expr-stmt-attrs-for-early-lints.rs
+++ b/src/test/ui/run-pass/lint-expr-stmt-attrs-for-early-lints.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(stmt_expr_attributes)]
 #![deny(unused_parens)]
 
diff --git a/src/test/run-pass/lint-non-camel-case-types-non-uppercase-statics-unicode.rs b/src/test/ui/run-pass/lint-non-camel-case-types-non-uppercase-statics-unicode.rs
similarity index 98%
rename from src/test/run-pass/lint-non-camel-case-types-non-uppercase-statics-unicode.rs
rename to src/test/ui/run-pass/lint-non-camel-case-types-non-uppercase-statics-unicode.rs
index 6e65cb2afd4ff..50b5c3853d40c 100644
--- a/src/test/run-pass/lint-non-camel-case-types-non-uppercase-statics-unicode.rs
+++ b/src/test/ui/run-pass/lint-non-camel-case-types-non-uppercase-statics-unicode.rs
@@ -7,6 +7,8 @@
 // <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.
+
+// run-pass
 //
 
 
diff --git a/src/test/run-pass/lint-non-camel-case-with-trailing-underscores.rs b/src/test/ui/run-pass/lint-non-camel-case-with-trailing-underscores.rs
similarity index 98%
rename from src/test/run-pass/lint-non-camel-case-with-trailing-underscores.rs
rename to src/test/ui/run-pass/lint-non-camel-case-with-trailing-underscores.rs
index 3b4bd001e8dc0..36ec583861517 100644
--- a/src/test/run-pass/lint-non-camel-case-with-trailing-underscores.rs
+++ b/src/test/ui/run-pass/lint-non-camel-case-with-trailing-underscores.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // This is ok because we often use the trailing underscore to mean 'prime'
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/lint-unknown-lints-at-crate-level.rs b/src/test/ui/run-pass/lint-unknown-lints-at-crate-level.rs
similarity index 97%
rename from src/test/run-pass/lint-unknown-lints-at-crate-level.rs
rename to src/test/ui/run-pass/lint-unknown-lints-at-crate-level.rs
index 1e510c28e7858..6a5377fad4d7c 100644
--- a/src/test/run-pass/lint-unknown-lints-at-crate-level.rs
+++ b/src/test/ui/run-pass/lint-unknown-lints-at-crate-level.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags: -D warnings -D unknown-lints
 
 #![allow(unknown_lints)]
diff --git a/src/test/run-pass/list.rs b/src/test/ui/run-pass/list.rs
similarity index 93%
rename from src/test/run-pass/list.rs
rename to src/test/ui/run-pass/list.rs
index 3761241555509..e8afb55565a56 100644
--- a/src/test/run-pass/list.rs
+++ b/src/test/ui/run-pass/list.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/liveness-assign-imm-local-after-ret.rs b/src/test/ui/run-pass/liveness-assign-imm-local-after-ret.rs
similarity index 97%
rename from src/test/run-pass/liveness-assign-imm-local-after-ret.rs
rename to src/test/ui/run-pass/liveness-assign-imm-local-after-ret.rs
index 76b44832a8a16..075a2316bc19b 100644
--- a/src/test/run-pass/liveness-assign-imm-local-after-ret.rs
+++ b/src/test/ui/run-pass/liveness-assign-imm-local-after-ret.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![allow(dead_code)]
diff --git a/src/test/run-pass/llvm-pr32379.rs b/src/test/ui/run-pass/llvm-pr32379.rs
similarity index 98%
rename from src/test/run-pass/llvm-pr32379.rs
rename to src/test/ui/run-pass/llvm-pr32379.rs
index 5625e81c0e63c..bb9723bae88de 100644
--- a/src/test/run-pass/llvm-pr32379.rs
+++ b/src/test/ui/run-pass/llvm-pr32379.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:llvm_pr32379.rs
 
 // LLVM PR #32379 (https://bugs.llvm.org/show_bug.cgi?id=32379), which
diff --git a/src/test/run-pass/log-err-phi.rs b/src/test/ui/run-pass/log-err-phi.rs
similarity index 97%
rename from src/test/run-pass/log-err-phi.rs
rename to src/test/ui/run-pass/log-err-phi.rs
index 2f2328faaca7f..c1d416965fb51 100644
--- a/src/test/run-pass/log-err-phi.rs
+++ b/src/test/ui/run-pass/log-err-phi.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 pub fn main() {
diff --git a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs b/src/test/ui/run-pass/log-knows-the-names-of-variants-in-std.rs
similarity index 95%
rename from src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
rename to src/test/ui/run-pass/log-knows-the-names-of-variants-in-std.rs
index 1991e2b178d51..88beadb49fad7 100644
--- a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs
+++ b/src/test/ui/run-pass/log-knows-the-names-of-variants-in-std.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 #[derive(Clone, Debug)]
 enum foo {
   a(usize),
diff --git a/src/test/run-pass/log-knows-the-names-of-variants.rs b/src/test/ui/run-pass/log-knows-the-names-of-variants.rs
similarity index 94%
rename from src/test/run-pass/log-knows-the-names-of-variants.rs
rename to src/test/ui/run-pass/log-knows-the-names-of-variants.rs
index e8852377957f8..9971454068096 100644
--- a/src/test/run-pass/log-knows-the-names-of-variants.rs
+++ b/src/test/ui/run-pass/log-knows-the-names-of-variants.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 #[derive(Debug)]
 enum foo {
   a(usize),
diff --git a/src/test/run-pass/log-poly.rs b/src/test/ui/run-pass/log-poly.rs
similarity index 98%
rename from src/test/run-pass/log-poly.rs
rename to src/test/ui/run-pass/log-poly.rs
index b54b4692a41bf..fa8f9b3c6f840 100644
--- a/src/test/run-pass/log-poly.rs
+++ b/src/test/ui/run-pass/log-poly.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #[derive(Debug)]
 enum Numbers {
     Three
diff --git a/src/test/run-pass/logging-only-prints-once.rs b/src/test/ui/run-pass/logging-only-prints-once.rs
similarity index 98%
rename from src/test/run-pass/logging-only-prints-once.rs
rename to src/test/ui/run-pass/logging-only-prints-once.rs
index 11ab43fd08763..5fbfecfe0eef3 100644
--- a/src/test/run-pass/logging-only-prints-once.rs
+++ b/src/test/ui/run-pass/logging-only-prints-once.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-windows
 // ignore-emscripten no threads support
 // exec-env:RUST_LOG=debug
diff --git a/src/test/run-pass/logging_before_rt_started.rs b/src/test/ui/run-pass/logging_before_rt_started.rs
similarity index 98%
rename from src/test/run-pass/logging_before_rt_started.rs
rename to src/test/ui/run-pass/logging_before_rt_started.rs
index 820285188ae4e..89f8e27297731 100644
--- a/src/test/run-pass/logging_before_rt_started.rs
+++ b/src/test/ui/run-pass/logging_before_rt_started.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // exec-env:RUST_LOG=std::ptr
 
 // In issue #9487, it was realized that std::ptr was invoking the logging
diff --git a/src/test/run-pass/long-while.rs b/src/test/ui/run-pass/long-while.rs
similarity index 98%
rename from src/test/run-pass/long-while.rs
rename to src/test/ui/run-pass/long-while.rs
index ce55c76120235..00a75df4d9bab 100644
--- a/src/test/run-pass/long-while.rs
+++ b/src/test/ui/run-pass/long-while.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/lto-many-codegen-units.rs b/src/test/ui/run-pass/lto-many-codegen-units.rs
similarity index 97%
rename from src/test/run-pass/lto-many-codegen-units.rs
rename to src/test/ui/run-pass/lto-many-codegen-units.rs
index bed675cee5604..e8aed9bcc1e6f 100644
--- a/src/test/run-pass/lto-many-codegen-units.rs
+++ b/src/test/ui/run-pass/lto-many-codegen-units.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags: -C lto -C codegen-units=8
 // no-prefer-dynamic
 
diff --git a/src/test/run-pass/lto-still-runs-thread-dtors.rs b/src/test/ui/run-pass/lto-still-runs-thread-dtors.rs
similarity index 98%
rename from src/test/run-pass/lto-still-runs-thread-dtors.rs
rename to src/test/ui/run-pass/lto-still-runs-thread-dtors.rs
index 91fb7aa51d4b0..639ad629f0f46 100644
--- a/src/test/run-pass/lto-still-runs-thread-dtors.rs
+++ b/src/test/ui/run-pass/lto-still-runs-thread-dtors.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags: -C lto
 // no-prefer-dynamic
 // ignore-emscripten no threads support
diff --git a/src/test/run-pass/lub-glb-with-unbound-infer-var.rs b/src/test/ui/run-pass/lub-glb-with-unbound-infer-var.rs
similarity index 98%
rename from src/test/run-pass/lub-glb-with-unbound-infer-var.rs
rename to src/test/ui/run-pass/lub-glb-with-unbound-infer-var.rs
index 6b9bd67f9a5a4..a4935179db887 100644
--- a/src/test/run-pass/lub-glb-with-unbound-infer-var.rs
+++ b/src/test/ui/run-pass/lub-glb-with-unbound-infer-var.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test for a specific corner case: when we compute the LUB of two fn
 // types and their parameters have unbound variables. In that case, we
 // wind up relating those two variables. This was causing an ICE in an
diff --git a/src/test/run-pass/max-min-classes.rs b/src/test/ui/run-pass/max-min-classes.rs
similarity index 95%
rename from src/test/run-pass/max-min-classes.rs
rename to src/test/ui/run-pass/max-min-classes.rs
index f0844b8e1eb17..9e02acf8fdefb 100644
--- a/src/test/run-pass/max-min-classes.rs
+++ b/src/test/ui/run-pass/max-min-classes.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_snake_case)]
+
 trait Product {
     fn product(&self) -> isize;
 }
diff --git a/src/test/run-pass/mid-path-type-params.rs b/src/test/ui/run-pass/mid-path-type-params.rs
similarity index 98%
rename from src/test/run-pass/mid-path-type-params.rs
rename to src/test/ui/run-pass/mid-path-type-params.rs
index 3055f90ee2597..6ef5cb38abca1 100644
--- a/src/test/run-pass/mid-path-type-params.rs
+++ b/src/test/ui/run-pass/mid-path-type-params.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 struct S<T> {
diff --git a/src/test/run-pass/minmax-stability-issue-23687.rs b/src/test/ui/run-pass/minmax-stability-issue-23687.rs
similarity index 99%
rename from src/test/run-pass/minmax-stability-issue-23687.rs
rename to src/test/ui/run-pass/minmax-stability-issue-23687.rs
index ba48648df32fb..8a74c44326462 100644
--- a/src/test/run-pass/minmax-stability-issue-23687.rs
+++ b/src/test/ui/run-pass/minmax-stability-issue-23687.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::fmt::Debug;
 use std::cmp::{self, PartialOrd, Ordering};
 
diff --git a/src/test/run-pass/inner-module.rs b/src/test/ui/run-pass/modules/inner-module.rs
similarity index 98%
rename from src/test/run-pass/inner-module.rs
rename to src/test/ui/run-pass/modules/inner-module.rs
index 95a10df5f8128..7fea3ca7ee8b4 100644
--- a/src/test/run-pass/inner-module.rs
+++ b/src/test/ui/run-pass/modules/inner-module.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/super.rs b/src/test/ui/run-pass/modules/super.rs
similarity index 97%
rename from src/test/run-pass/super.rs
rename to src/test/ui/run-pass/modules/super.rs
index 51520c77751b0..f5ad0421caded 100644
--- a/src/test/run-pass/super.rs
+++ b/src/test/ui/run-pass/modules/super.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 pub mod a {
diff --git a/src/test/run-pass/use-import-export.rs b/src/test/ui/run-pass/modules/use-import-export.rs
similarity index 98%
rename from src/test/run-pass/use-import-export.rs
rename to src/test/ui/run-pass/modules/use-import-export.rs
index 044472606a530..7a7ccb84d5bb0 100644
--- a/src/test/run-pass/use-import-export.rs
+++ b/src/test/ui/run-pass/modules/use-import-export.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/monad.rs b/src/test/ui/run-pass/monad.rs
similarity index 97%
rename from src/test/run-pass/monad.rs
rename to src/test/ui/run-pass/monad.rs
index 211827f92222c..b7a21da40999c 100644
--- a/src/test/run-pass/monad.rs
+++ b/src/test/ui/run-pass/monad.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 
 
 
diff --git a/src/test/run-pass/monomorphize-abi-alignment.rs b/src/test/ui/run-pass/monomorphize-abi-alignment.rs
similarity index 96%
rename from src/test/run-pass/monomorphize-abi-alignment.rs
rename to src/test/ui/run-pass/monomorphize-abi-alignment.rs
index 00e97ebc24e7b..9e096d832d4fb 100644
--- a/src/test/run-pass/monomorphize-abi-alignment.rs
+++ b/src/test/ui/run-pass/monomorphize-abi-alignment.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_upper_case_globals)]
+
 /*!
  * On x86_64-linux-gnu and possibly other platforms, structs get 8-byte "preferred" alignment,
  * but their "ABI" alignment (i.e., what actually matters for data layout) is the largest alignment
diff --git a/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs b/src/test/ui/run-pass/monomorphized-callees-with-ty-params-3314.rs
similarity index 98%
rename from src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs
rename to src/test/ui/run-pass/monomorphized-callees-with-ty-params-3314.rs
index b7de1b5f4cbb5..da1750c2634ae 100644
--- a/src/test/run-pass/monomorphized-callees-with-ty-params-3314.rs
+++ b/src/test/ui/run-pass/monomorphized-callees-with-ty-params-3314.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 trait Serializer {
diff --git a/src/test/run-pass/msvc-data-only.rs b/src/test/ui/run-pass/msvc-data-only.rs
similarity index 97%
rename from src/test/run-pass/msvc-data-only.rs
rename to src/test/ui/run-pass/msvc-data-only.rs
index ad6888c4d3096..ab5b5917338aa 100644
--- a/src/test/run-pass/msvc-data-only.rs
+++ b/src/test/ui/run-pass/msvc-data-only.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:msvc-data-only-lib.rs
 
 extern crate msvc_data_only_lib;
diff --git a/src/test/run-pass/multi-panic.rs b/src/test/ui/run-pass/multi-panic.rs
similarity index 99%
rename from src/test/run-pass/multi-panic.rs
rename to src/test/ui/run-pass/multi-panic.rs
index 2e6e10935fa7a..4612355fe93c3 100644
--- a/src/test/run-pass/multi-panic.rs
+++ b/src/test/ui/run-pass/multi-panic.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 
diff --git a/src/test/run-pass/multibyte.rs b/src/test/ui/run-pass/multibyte.rs
similarity index 97%
rename from src/test/run-pass/multibyte.rs
rename to src/test/ui/run-pass/multibyte.rs
index 0475dd10fdef9..9338e70287a9c 100644
--- a/src/test/run-pass/multibyte.rs
+++ b/src/test/ui/run-pass/multibyte.rs
@@ -7,6 +7,8 @@
 // <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.
+
+// run-pass
 //
 
 // Test that multibyte characters don't crash the compiler
diff --git a/src/test/run-pass/multiline-comment.rs b/src/test/ui/run-pass/multiline-comment.rs
similarity index 97%
rename from src/test/run-pass/multiline-comment.rs
rename to src/test/ui/run-pass/multiline-comment.rs
index 8c74326d1c34a..e44781dbf8a4c 100644
--- a/src/test/run-pass/multiline-comment.rs
+++ b/src/test/ui/run-pass/multiline-comment.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/multiple-reprs.rs b/src/test/ui/run-pass/multiple-reprs.rs
similarity index 99%
rename from src/test/run-pass/multiple-reprs.rs
rename to src/test/ui/run-pass/multiple-reprs.rs
index d8eafb806f747..fb511623e6d78 100644
--- a/src/test/run-pass/multiple-reprs.rs
+++ b/src/test/ui/run-pass/multiple-reprs.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 use std::mem::{size_of, align_of};
 use std::os::raw::c_int;
diff --git a/src/test/run-pass/mut-function-arguments.rs b/src/test/ui/run-pass/mut-function-arguments.rs
similarity index 98%
rename from src/test/run-pass/mut-function-arguments.rs
rename to src/test/ui/run-pass/mut-function-arguments.rs
index bf4d4ea921aa5..2befba09d82c2 100644
--- a/src/test/run-pass/mut-function-arguments.rs
+++ b/src/test/ui/run-pass/mut-function-arguments.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(box_syntax)]
 
 fn f(mut y: Box<isize>) {
diff --git a/src/test/run-pass/mut-vstore-expr.rs b/src/test/ui/run-pass/mut-vstore-expr.rs
similarity index 97%
rename from src/test/run-pass/mut-vstore-expr.rs
rename to src/test/ui/run-pass/mut-vstore-expr.rs
index 503f3ce5f9b2f..62d018f5b9324 100644
--- a/src/test/run-pass/mut-vstore-expr.rs
+++ b/src/test/ui/run-pass/mut-vstore-expr.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 pub fn main() {
diff --git a/src/test/run-pass/mutual-recursion-group.rs b/src/test/ui/run-pass/mutual-recursion-group.rs
similarity index 94%
rename from src/test/run-pass/mutual-recursion-group.rs
rename to src/test/ui/run-pass/mutual-recursion-group.rs
index 72a8847094b2c..380d0efd46a19 100644
--- a/src/test/run-pass/mutual-recursion-group.rs
+++ b/src/test/ui/run-pass/mutual-recursion-group.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/native-print-no-runtime.rs b/src/test/ui/run-pass/native-print-no-runtime.rs
similarity index 97%
rename from src/test/run-pass/native-print-no-runtime.rs
rename to src/test/ui/run-pass/native-print-no-runtime.rs
index deb0b5030614e..2d8428e6583ae 100644
--- a/src/test/run-pass/native-print-no-runtime.rs
+++ b/src/test/ui/run-pass/native-print-no-runtime.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(start)]
 
 #[start]
diff --git a/src/test/run-pass/negative.rs b/src/test/ui/run-pass/negative.rs
similarity index 97%
rename from src/test/run-pass/negative.rs
rename to src/test/ui/run-pass/negative.rs
index df074ddc06ac5..52f9b5dbae774 100644
--- a/src/test/run-pass/negative.rs
+++ b/src/test/ui/run-pass/negative.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 pub fn main() {
     match -5 {
diff --git a/src/test/run-pass/nested-block-comment.rs b/src/test/ui/run-pass/nested-block-comment.rs
similarity index 97%
rename from src/test/run-pass/nested-block-comment.rs
rename to src/test/ui/run-pass/nested-block-comment.rs
index 650e28548c17a..0df04f958b3da 100644
--- a/src/test/run-pass/nested-block-comment.rs
+++ b/src/test/ui/run-pass/nested-block-comment.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 /* This test checks that nested comments are supported
diff --git a/src/test/run-pass/nested-class.rs b/src/test/ui/run-pass/nested-class.rs
similarity index 94%
rename from src/test/run-pass/nested-class.rs
rename to src/test/ui/run-pass/nested-class.rs
index 1ad68cb9de052..56684a67e7884 100644
--- a/src/test/run-pass/nested-class.rs
+++ b/src/test/ui/run-pass/nested-class.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 
 pub fn main() {
     struct b {
diff --git a/src/test/run-pass/nested-function-names-issue-8587.rs b/src/test/ui/run-pass/nested-function-names-issue-8587.rs
similarity index 98%
rename from src/test/run-pass/nested-function-names-issue-8587.rs
rename to src/test/ui/run-pass/nested-function-names-issue-8587.rs
index 24b1f5ac75eae..fa468d8405cda 100644
--- a/src/test/run-pass/nested-function-names-issue-8587.rs
+++ b/src/test/ui/run-pass/nested-function-names-issue-8587.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Make sure nested functions are separate, even if they have
 // equal name.
 //
diff --git a/src/test/run-pass/nested_item_main.rs b/src/test/ui/run-pass/nested_item_main.rs
similarity index 98%
rename from src/test/run-pass/nested_item_main.rs
rename to src/test/ui/run-pass/nested_item_main.rs
index b24d517f7375c..acca456630665 100644
--- a/src/test/run-pass/nested_item_main.rs
+++ b/src/test/ui/run-pass/nested_item_main.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:nested_item.rs
 
 
diff --git a/src/test/run-pass/never-result.rs b/src/test/ui/run-pass/never-result.rs
similarity index 98%
rename from src/test/run-pass/never-result.rs
rename to src/test/ui/run-pass/never-result.rs
index 5c0af392f44df..d0de61d49f11b 100644
--- a/src/test/run-pass/never-result.rs
+++ b/src/test/ui/run-pass/never-result.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that we can extract a ! through pattern matching then use it as several different types.
 
 #![feature(never_type)]
diff --git a/src/test/run-pass/never-type-rvalues.rs b/src/test/ui/run-pass/never-type-rvalues.rs
similarity index 98%
rename from src/test/run-pass/never-type-rvalues.rs
rename to src/test/ui/run-pass/never-type-rvalues.rs
index bda288f40869b..971eeecf5859c 100644
--- a/src/test/run-pass/never-type-rvalues.rs
+++ b/src/test/ui/run-pass/never-type-rvalues.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(never_type)]
 #![allow(dead_code)]
 #![allow(path_statements)]
diff --git a/src/test/run-pass/never_coercions.rs b/src/test/ui/run-pass/never_coercions.rs
similarity index 98%
rename from src/test/run-pass/never_coercions.rs
rename to src/test/ui/run-pass/never_coercions.rs
index dfba5d2c3da0a..5bebd6c2fb0ef 100644
--- a/src/test/run-pass/never_coercions.rs
+++ b/src/test/ui/run-pass/never_coercions.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that having something of type ! doesn't screw up type-checking and that it coerces to the
 // LUB type of the other match arms.
 
diff --git a/src/test/run-pass/new-box-syntax.rs b/src/test/ui/run-pass/new-box-syntax.rs
similarity index 98%
rename from src/test/run-pass/new-box-syntax.rs
rename to src/test/ui/run-pass/new-box-syntax.rs
index 6598b70b3d5cd..f889a631efc4a 100644
--- a/src/test/run-pass/new-box-syntax.rs
+++ b/src/test/ui/run-pass/new-box-syntax.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 /* Any copyright is dedicated to the Public Domain.
diff --git a/src/test/run-pass/new-box.rs b/src/test/ui/run-pass/new-box.rs
similarity index 98%
rename from src/test/run-pass/new-box.rs
rename to src/test/ui/run-pass/new-box.rs
index d6881ea90afb6..cf4d19485cd77 100644
--- a/src/test/run-pass/new-box.rs
+++ b/src/test/ui/run-pass/new-box.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(box_syntax)]
 
 fn f(x: Box<isize>) {
diff --git a/src/test/run-pass/new-impl-syntax.rs b/src/test/ui/run-pass/new-impl-syntax.rs
similarity index 98%
rename from src/test/run-pass/new-impl-syntax.rs
rename to src/test/ui/run-pass/new-impl-syntax.rs
index 554fab53e4b58..386909abb6a55 100644
--- a/src/test/run-pass/new-impl-syntax.rs
+++ b/src/test/ui/run-pass/new-impl-syntax.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::fmt;
 
 struct Thingy {
diff --git a/src/test/run-pass/new-import-syntax.rs b/src/test/ui/run-pass/new-import-syntax.rs
similarity index 97%
rename from src/test/run-pass/new-import-syntax.rs
rename to src/test/ui/run-pass/new-import-syntax.rs
index 36e5b020b55ab..0d5c087903dab 100644
--- a/src/test/run-pass/new-import-syntax.rs
+++ b/src/test/ui/run-pass/new-import-syntax.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() {
     println!("Hello world!");
 }
diff --git a/src/test/run-pass/new-style-constants.rs b/src/test/ui/run-pass/new-style-constants.rs
similarity index 97%
rename from src/test/run-pass/new-style-constants.rs
rename to src/test/ui/run-pass/new-style-constants.rs
index 36d66d1e12b6b..7b1cf146035fa 100644
--- a/src/test/run-pass/new-style-constants.rs
+++ b/src/test/ui/run-pass/new-style-constants.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 static FOO: isize = 3;
 
 pub fn main() {
diff --git a/src/test/run-pass/new-unicode-escapes.rs b/src/test/ui/run-pass/new-unicode-escapes.rs
similarity index 98%
rename from src/test/run-pass/new-unicode-escapes.rs
rename to src/test/ui/run-pass/new-unicode-escapes.rs
index 2c0417576052e..241f9e50ea2a5 100644
--- a/src/test/run-pass/new-unicode-escapes.rs
+++ b/src/test/ui/run-pass/new-unicode-escapes.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 pub fn main() {
     let s = "\u{2603}";
diff --git a/src/test/run-pass/new-unsafe-pointers.rs b/src/test/ui/run-pass/new-unsafe-pointers.rs
similarity index 97%
rename from src/test/run-pass/new-unsafe-pointers.rs
rename to src/test/ui/run-pass/new-unsafe-pointers.rs
index a0d631046a635..bad3367929dea 100644
--- a/src/test/run-pass/new-unsafe-pointers.rs
+++ b/src/test/ui/run-pass/new-unsafe-pointers.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 fn main() {
diff --git a/src/test/run-pass/newtype-polymorphic.rs b/src/test/ui/run-pass/newtype-polymorphic.rs
similarity index 95%
rename from src/test/run-pass/newtype-polymorphic.rs
rename to src/test/ui/run-pass/newtype-polymorphic.rs
index e7da8d7bf93c7..7a8bab3defd4a 100644
--- a/src/test/run-pass/newtype-polymorphic.rs
+++ b/src/test/ui/run-pass/newtype-polymorphic.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 
 
 #[derive(Clone)]
diff --git a/src/test/run-pass/newtype-temporary.rs b/src/test/ui/run-pass/newtype-temporary.rs
similarity index 97%
rename from src/test/run-pass/newtype-temporary.rs
rename to src/test/ui/run-pass/newtype-temporary.rs
index 19790a488b58e..61ce45b3c58cd 100644
--- a/src/test/run-pass/newtype-temporary.rs
+++ b/src/test/ui/run-pass/newtype-temporary.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #[derive(PartialEq, Debug)]
 struct Foo(usize);
 
diff --git a/src/test/run-pass/newtype.rs b/src/test/ui/run-pass/newtype.rs
similarity index 95%
rename from src/test/run-pass/newtype.rs
rename to src/test/ui/run-pass/newtype.rs
index 818ea4c9f2326..b34237f8f96b5 100644
--- a/src/test/run-pass/newtype.rs
+++ b/src/test/ui/run-pass/newtype.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 #[derive(Copy, Clone)]
 struct mytype(Mytype);
 
diff --git a/src/test/run-pass/nil-decl-in-foreign.rs b/src/test/ui/run-pass/nil-decl-in-foreign.rs
similarity index 93%
rename from src/test/run-pass/nil-decl-in-foreign.rs
rename to src/test/ui/run-pass/nil-decl-in-foreign.rs
index 97ee237771f3f..0d8c3c0908408 100644
--- a/src/test/run-pass/nil-decl-in-foreign.rs
+++ b/src/test/ui/run-pass/nil-decl-in-foreign.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(improper_ctypes)]
+
 // Issue #901
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/no-core-1.rs b/src/test/ui/run-pass/no-core-1.rs
similarity index 94%
rename from src/test/run-pass/no-core-1.rs
rename to src/test/ui/run-pass/no-core-1.rs
index 7868077fbf244..1e5b37d895759 100644
--- a/src/test/run-pass/no-core-1.rs
+++ b/src/test/ui/run-pass/no-core-1.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+
 #![feature(no_core, core)]
 #![no_core]
 
diff --git a/src/test/run-pass/no-landing-pads.rs b/src/test/ui/run-pass/no-landing-pads.rs
similarity index 98%
rename from src/test/run-pass/no-landing-pads.rs
rename to src/test/ui/run-pass/no-landing-pads.rs
index 73f123045d249..306864704c219 100644
--- a/src/test/run-pass/no-landing-pads.rs
+++ b/src/test/ui/run-pass/no-landing-pads.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags: -Z no-landing-pads -C codegen-units=1
 // ignore-emscripten no threads support
 
diff --git a/src/test/run-pass/no-std-1.rs b/src/test/ui/run-pass/no-std-1.rs
similarity index 97%
rename from src/test/run-pass/no-std-1.rs
rename to src/test/ui/run-pass/no-std-1.rs
index 9298d74f9c47b..38b0b5278a8aa 100644
--- a/src/test/run-pass/no-std-1.rs
+++ b/src/test/ui/run-pass/no-std-1.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![no_std]
 
 extern crate std;
diff --git a/src/test/run-pass/no-std-2.rs b/src/test/ui/run-pass/no-std-2.rs
similarity index 97%
rename from src/test/run-pass/no-std-2.rs
rename to src/test/ui/run-pass/no-std-2.rs
index 1b24987052b49..987c0cbcab9d4 100644
--- a/src/test/run-pass/no-std-2.rs
+++ b/src/test/ui/run-pass/no-std-2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![no_std]
 
 extern crate std;
diff --git a/src/test/run-pass/no-std-3.rs b/src/test/ui/run-pass/no-std-3.rs
similarity index 98%
rename from src/test/run-pass/no-std-3.rs
rename to src/test/ui/run-pass/no-std-3.rs
index 685c62f5a532a..f83b5097b31f0 100644
--- a/src/test/run-pass/no-std-3.rs
+++ b/src/test/ui/run-pass/no-std-3.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![no_std]
 
 extern crate std;
diff --git a/src/test/run-pass/no-stdio.rs b/src/test/ui/run-pass/no-stdio.rs
similarity index 99%
rename from src/test/run-pass/no-stdio.rs
rename to src/test/ui/run-pass/no-stdio.rs
index d34241769603b..c341574f2d4d7 100644
--- a/src/test/run-pass/no-stdio.rs
+++ b/src/test/ui/run-pass/no-stdio.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-android
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
diff --git a/src/test/run-pass/non-built-in-quote.rs b/src/test/ui/run-pass/non-built-in-quote.rs
similarity index 97%
rename from src/test/run-pass/non-built-in-quote.rs
rename to src/test/ui/run-pass/non-built-in-quote.rs
index 6c0df5f4c14e7..8ef6d1d45d27a 100644
--- a/src/test/run-pass/non-built-in-quote.rs
+++ b/src/test/ui/run-pass/non-built-in-quote.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 macro_rules! quote_tokens { () => (()) }
diff --git a/src/test/run-pass/non-legacy-modes.rs b/src/test/ui/run-pass/non-legacy-modes.rs
similarity index 98%
rename from src/test/run-pass/non-legacy-modes.rs
rename to src/test/ui/run-pass/non-legacy-modes.rs
index 58534ed96da83..8b629416a97e4 100644
--- a/src/test/run-pass/non-legacy-modes.rs
+++ b/src/test/ui/run-pass/non-legacy-modes.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 struct X {
     repr: isize
diff --git a/src/test/run-pass/nul-characters.rs b/src/test/ui/run-pass/nul-characters.rs
similarity index 99%
rename from src/test/run-pass/nul-characters.rs
rename to src/test/ui/run-pass/nul-characters.rs
index cbea5e71f255f..fc89d483c92c9 100644
--- a/src/test/run-pass/nul-characters.rs
+++ b/src/test/ui/run-pass/nul-characters.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 pub fn main()
 {
diff --git a/src/test/run-pass/nullable-pointer-ffi-compat.rs b/src/test/ui/run-pass/nullable-pointer-ffi-compat.rs
similarity index 99%
rename from src/test/run-pass/nullable-pointer-ffi-compat.rs
rename to src/test/ui/run-pass/nullable-pointer-ffi-compat.rs
index 2b7cf6c668247..84219a2192716 100644
--- a/src/test/run-pass/nullable-pointer-ffi-compat.rs
+++ b/src/test/ui/run-pass/nullable-pointer-ffi-compat.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // #11303, #11040:
 // This would previously crash on i686 Linux due to abi differences
 // between returning an Option<T> and T, where T is a non nullable
diff --git a/src/test/run-pass/nullable-pointer-iotareduction.rs b/src/test/ui/run-pass/nullable-pointer-iotareduction.rs
similarity index 99%
rename from src/test/run-pass/nullable-pointer-iotareduction.rs
rename to src/test/ui/run-pass/nullable-pointer-iotareduction.rs
index d33102a38f96e..9a80a58a0db43 100644
--- a/src/test/run-pass/nullable-pointer-iotareduction.rs
+++ b/src/test/ui/run-pass/nullable-pointer-iotareduction.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(box_syntax)]
 
 // Iota-reduction is a rule in the Calculus of (Co-)Inductive Constructions,
diff --git a/src/test/run-pass/nullable-pointer-size.rs b/src/test/ui/run-pass/nullable-pointer-size.rs
similarity index 98%
rename from src/test/run-pass/nullable-pointer-size.rs
rename to src/test/ui/run-pass/nullable-pointer-size.rs
index b097d350c8d5e..79c2927ba2cee 100644
--- a/src/test/run-pass/nullable-pointer-size.rs
+++ b/src/test/ui/run-pass/nullable-pointer-size.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 use std::mem;
 
diff --git a/src/test/run-pass/big-literals.rs b/src/test/ui/run-pass/numbers-arithmetic/big-literals.rs
similarity index 98%
rename from src/test/run-pass/big-literals.rs
rename to src/test/ui/run-pass/numbers-arithmetic/big-literals.rs
index 56e0039f66de3..2fcf29b602ce9 100644
--- a/src/test/run-pass/big-literals.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/big-literals.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Catch mistakes in the overflowing literals lint.
 #![deny(overflowing_literals)]
 
diff --git a/src/test/run-pass/bitwise.rs b/src/test/ui/run-pass/numbers-arithmetic/bitwise.rs
similarity index 98%
rename from src/test/run-pass/bitwise.rs
rename to src/test/ui/run-pass/numbers-arithmetic/bitwise.rs
index bb4b9cfecf7b6..3ef26b66aaa2a 100644
--- a/src/test/run-pass/bitwise.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/bitwise.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #[cfg(any(target_pointer_width = "32"))]
 fn target() {
     assert_eq!(-1000isize as usize >> 3_usize, 536870787_usize);
diff --git a/src/test/run-pass/unary-minus-suffix-inference.rs b/src/test/ui/run-pass/numbers-arithmetic/unary-minus-suffix-inference.rs
similarity index 98%
rename from src/test/run-pass/unary-minus-suffix-inference.rs
rename to src/test/ui/run-pass/numbers-arithmetic/unary-minus-suffix-inference.rs
index cff260c3ba63e..1631f0379816a 100644
--- a/src/test/run-pass/unary-minus-suffix-inference.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/unary-minus-suffix-inference.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() {
     let a = 1;
     let a_neg: i8 = -a;
diff --git a/src/test/run-pass/wrapping-int-api.rs b/src/test/ui/run-pass/numbers-arithmetic/wrapping-int-api.rs
similarity index 99%
rename from src/test/run-pass/wrapping-int-api.rs
rename to src/test/ui/run-pass/numbers-arithmetic/wrapping-int-api.rs
index 5470ad93e1426..39b56aefe25aa 100644
--- a/src/test/run-pass/wrapping-int-api.rs
+++ b/src/test/ui/run-pass/numbers-arithmetic/wrapping-int-api.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test inherent wrapping_* methods for {i,u}{size,8,16,32,64}.
 
 use std::{i8, i16, i32, i64, isize};
diff --git a/src/test/run-pass/object-lifetime-default-default-to-static.rs b/src/test/ui/run-pass/object-lifetime-default-default-to-static.rs
similarity index 98%
rename from src/test/run-pass/object-lifetime-default-default-to-static.rs
rename to src/test/ui/run-pass/object-lifetime-default-default-to-static.rs
index 1b631f171eb79..b1097c1ce7e76 100644
--- a/src/test/run-pass/object-lifetime-default-default-to-static.rs
+++ b/src/test/ui/run-pass/object-lifetime-default-default-to-static.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that `Box<Test>` is equivalent to `Box<Test+'static>`, both in
 // fields and fn arguments.
 
diff --git a/src/test/run-pass/object-lifetime-default-from-rptr-box.rs b/src/test/ui/run-pass/object-lifetime-default-from-rptr-box.rs
similarity index 98%
rename from src/test/run-pass/object-lifetime-default-from-rptr-box.rs
rename to src/test/ui/run-pass/object-lifetime-default-from-rptr-box.rs
index af8018b765341..f515240f3ab1b 100644
--- a/src/test/run-pass/object-lifetime-default-from-rptr-box.rs
+++ b/src/test/ui/run-pass/object-lifetime-default-from-rptr-box.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that the lifetime from the enclosing `&` is "inherited"
 // through the `Box` struct.
 
diff --git a/src/test/run-pass/object-lifetime-default-from-rptr-mut.rs b/src/test/ui/run-pass/object-lifetime-default-from-rptr-mut.rs
similarity index 98%
rename from src/test/run-pass/object-lifetime-default-from-rptr-mut.rs
rename to src/test/ui/run-pass/object-lifetime-default-from-rptr-mut.rs
index edd0bdb32c2b1..d48493010d638 100644
--- a/src/test/run-pass/object-lifetime-default-from-rptr-mut.rs
+++ b/src/test/ui/run-pass/object-lifetime-default-from-rptr-mut.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that the lifetime of the enclosing `&` is used for the object
 // lifetime bound.
 
diff --git a/src/test/run-pass/object-lifetime-default-from-rptr.rs b/src/test/ui/run-pass/object-lifetime-default-from-rptr.rs
similarity index 98%
rename from src/test/run-pass/object-lifetime-default-from-rptr.rs
rename to src/test/ui/run-pass/object-lifetime-default-from-rptr.rs
index cbff0d4dbaa3c..62c312d4e70f0 100644
--- a/src/test/run-pass/object-lifetime-default-from-rptr.rs
+++ b/src/test/ui/run-pass/object-lifetime-default-from-rptr.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that the lifetime of the enclosing `&` is used for the object
 // lifetime bound.
 
diff --git a/src/test/run-pass/object-method-numbering.rs b/src/test/ui/run-pass/object-method-numbering.rs
similarity index 98%
rename from src/test/run-pass/object-method-numbering.rs
rename to src/test/ui/run-pass/object-method-numbering.rs
index 82d34fa9ae48b..fb449d661904d 100644
--- a/src/test/run-pass/object-method-numbering.rs
+++ b/src/test/ui/run-pass/object-method-numbering.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test for using an object with an associated type binding as the
 // instantiation for a generic type with a bound.
 
diff --git a/src/test/run-pass/objects-coerce-freeze-borrored.rs b/src/test/ui/run-pass/objects-coerce-freeze-borrored.rs
similarity index 98%
rename from src/test/run-pass/objects-coerce-freeze-borrored.rs
rename to src/test/ui/run-pass/objects-coerce-freeze-borrored.rs
index f907b5723f41b..7fcedb5c56270 100644
--- a/src/test/run-pass/objects-coerce-freeze-borrored.rs
+++ b/src/test/ui/run-pass/objects-coerce-freeze-borrored.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that we can coerce an `@Object` to an `&Object`
 
 
diff --git a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs b/src/test/ui/run-pass/objects-owned-object-borrowed-method-headerless.rs
similarity index 98%
rename from src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs
rename to src/test/ui/run-pass/objects-owned-object-borrowed-method-headerless.rs
index c27bc62ada803..0a8abd558b9d8 100644
--- a/src/test/run-pass/objects-owned-object-borrowed-method-headerless.rs
+++ b/src/test/ui/run-pass/objects-owned-object-borrowed-method-headerless.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test invoked `&self` methods on owned objects where the values
 // closed over do not contain managed values, and thus the boxes do
 // not have headers.
diff --git a/src/test/run-pass/objects-owned-object-owned-method.rs b/src/test/ui/run-pass/objects-owned-object-owned-method.rs
similarity index 98%
rename from src/test/run-pass/objects-owned-object-owned-method.rs
rename to src/test/ui/run-pass/objects-owned-object-owned-method.rs
index 5d9658dc15d63..e287612f301c7 100644
--- a/src/test/run-pass/objects-owned-object-owned-method.rs
+++ b/src/test/ui/run-pass/objects-owned-object-owned-method.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test invoked `&self` methods on owned objects where the values
 // closed over contain managed values. This implies that the boxes
 // will have headers that must be skipped over.
diff --git a/src/test/run-pass/once-move-out-on-heap.rs b/src/test/ui/run-pass/once-move-out-on-heap.rs
similarity index 98%
rename from src/test/run-pass/once-move-out-on-heap.rs
rename to src/test/ui/run-pass/once-move-out-on-heap.rs
index 6dd4c0ddce3c5..52e16bbaffdd6 100644
--- a/src/test/run-pass/once-move-out-on-heap.rs
+++ b/src/test/ui/run-pass/once-move-out-on-heap.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Testing guarantees provided by once functions.
 
 
diff --git a/src/test/run-pass/one-tuple.rs b/src/test/ui/run-pass/one-tuple.rs
similarity index 98%
rename from src/test/run-pass/one-tuple.rs
rename to src/test/ui/run-pass/one-tuple.rs
index 68974b47d06a9..d417a9c4ab210 100644
--- a/src/test/run-pass/one-tuple.rs
+++ b/src/test/ui/run-pass/one-tuple.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Why one-tuples? Because macros.
 
 
diff --git a/src/test/run-pass/op-assign-builtins-by-ref.rs b/src/test/ui/run-pass/op-assign-builtins-by-ref.rs
similarity index 99%
rename from src/test/run-pass/op-assign-builtins-by-ref.rs
rename to src/test/ui/run-pass/op-assign-builtins-by-ref.rs
index 230d44ba647a5..15f272d790a46 100644
--- a/src/test/run-pass/op-assign-builtins-by-ref.rs
+++ b/src/test/ui/run-pass/op-assign-builtins-by-ref.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 fn main() {
     // test compound assignment operators with ref as right-hand side,
     // for each operator, with various types as operands.
diff --git a/src/test/run-pass/opeq.rs b/src/test/ui/run-pass/opeq.rs
similarity index 98%
rename from src/test/run-pass/opeq.rs
rename to src/test/ui/run-pass/opeq.rs
index f5f0928ff144a..a9902dee509c3 100644
--- a/src/test/run-pass/opeq.rs
+++ b/src/test/ui/run-pass/opeq.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/operator-associativity.rs b/src/test/ui/run-pass/operator-associativity.rs
similarity index 97%
rename from src/test/run-pass/operator-associativity.rs
rename to src/test/ui/run-pass/operator-associativity.rs
index 86ca8f3325a82..8e5fa8384bdcf 100644
--- a/src/test/run-pass/operator-associativity.rs
+++ b/src/test/ui/run-pass/operator-associativity.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/operator-multidispatch.rs b/src/test/ui/run-pass/operator-multidispatch.rs
similarity index 98%
rename from src/test/run-pass/operator-multidispatch.rs
rename to src/test/ui/run-pass/operator-multidispatch.rs
index af7deef11b6b2..fdfd68146efe9 100644
--- a/src/test/run-pass/operator-multidispatch.rs
+++ b/src/test/ui/run-pass/operator-multidispatch.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that we can overload the `+` operator for points so that two
 // points can be added, and a point can be added to an integer.
 
diff --git a/src/test/run-pass/operator-overloading.rs b/src/test/ui/run-pass/operator-overloading.rs
similarity index 99%
rename from src/test/run-pass/operator-overloading.rs
rename to src/test/ui/run-pass/operator-overloading.rs
index c3a1164ba9c6a..c6ecdf5283d71 100644
--- a/src/test/run-pass/operator-overloading.rs
+++ b/src/test/ui/run-pass/operator-overloading.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::cmp;
 use std::ops;
 
diff --git a/src/test/run-pass/optimization-fuel-0.rs b/src/test/ui/run-pass/optimization-fuel-0.rs
similarity index 98%
rename from src/test/run-pass/optimization-fuel-0.rs
rename to src/test/ui/run-pass/optimization-fuel-0.rs
index 3832c040108f8..2cb2d6548d30c 100644
--- a/src/test/run-pass/optimization-fuel-0.rs
+++ b/src/test/ui/run-pass/optimization-fuel-0.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![crate_name="foo"]
 
 use std::mem::size_of;
diff --git a/src/test/ui/run-pass/optimization-fuel-0.stdout b/src/test/ui/run-pass/optimization-fuel-0.stdout
new file mode 100644
index 0000000000000..3ad405b2b50ff
--- /dev/null
+++ b/src/test/ui/run-pass/optimization-fuel-0.stdout
@@ -0,0 +1 @@
+optimization-fuel-exhausted: Reorder fields of "S1"
diff --git a/src/test/run-pass/optimization-fuel-1.rs b/src/test/ui/run-pass/optimization-fuel-1.rs
similarity index 98%
rename from src/test/run-pass/optimization-fuel-1.rs
rename to src/test/ui/run-pass/optimization-fuel-1.rs
index e3529ebfb0d81..4030c6cbb58cd 100644
--- a/src/test/run-pass/optimization-fuel-1.rs
+++ b/src/test/ui/run-pass/optimization-fuel-1.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![crate_name="foo"]
 
 use std::mem::size_of;
diff --git a/src/test/ui/run-pass/optimization-fuel-1.stdout b/src/test/ui/run-pass/optimization-fuel-1.stdout
new file mode 100644
index 0000000000000..197e45219c3f8
--- /dev/null
+++ b/src/test/ui/run-pass/optimization-fuel-1.stdout
@@ -0,0 +1 @@
+optimization-fuel-exhausted: Reorder fields of "S2"
diff --git a/src/test/run-pass/option-ext.rs b/src/test/ui/run-pass/option-ext.rs
similarity index 97%
rename from src/test/run-pass/option-ext.rs
rename to src/test/ui/run-pass/option-ext.rs
index c054171ff008a..5216db589b9f7 100644
--- a/src/test/run-pass/option-ext.rs
+++ b/src/test/ui/run-pass/option-ext.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() {
     let thing = "{{ f }}";
     let f = thing.find("{{");
diff --git a/src/test/run-pass/option-unwrap.rs b/src/test/ui/run-pass/option-unwrap.rs
similarity index 95%
rename from src/test/run-pass/option-unwrap.rs
rename to src/test/ui/run-pass/option-unwrap.rs
index e22edb3caede4..3b8af985baa15 100644
--- a/src/test/run-pass/option-unwrap.rs
+++ b/src/test/ui/run-pass/option-unwrap.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 use std::cell::Cell;
 
 struct dtor<'a> {
diff --git a/src/test/run-pass/out-of-stack.rs b/src/test/ui/run-pass/out-of-stack.rs
similarity index 98%
rename from src/test/run-pass/out-of-stack.rs
rename to src/test/ui/run-pass/out-of-stack.rs
index 6ed07fb2f7d25..5f148b52c9208 100644
--- a/src/test/run-pass/out-of-stack.rs
+++ b/src/test/ui/run-pass/out-of-stack.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(unconditional_recursion)]
+
 // ignore-android: FIXME (#20004)
 // ignore-musl
 // ignore-cloudabi no processes
diff --git a/src/test/run-pass/out-pointer-aliasing.rs b/src/test/ui/run-pass/out-pointer-aliasing.rs
similarity index 98%
rename from src/test/run-pass/out-pointer-aliasing.rs
rename to src/test/ui/run-pass/out-pointer-aliasing.rs
index 790affd939f24..efd8c5c8b8774 100644
--- a/src/test/run-pass/out-pointer-aliasing.rs
+++ b/src/test/ui/run-pass/out-pointer-aliasing.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 #[derive(Copy, Clone)]
 pub struct Foo {
diff --git a/src/test/run-pass/output-slot-variants.rs b/src/test/ui/run-pass/output-slot-variants.rs
similarity index 98%
rename from src/test/run-pass/output-slot-variants.rs
rename to src/test/ui/run-pass/output-slot-variants.rs
index 2171b8c481d1f..a79a683a042e5 100644
--- a/src/test/run-pass/output-slot-variants.rs
+++ b/src/test/ui/run-pass/output-slot-variants.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(unknown_lints)]
+
 // pretty-expanded FIXME #23616
 
 #![allow(dead_assignment)]
diff --git a/src/test/run-pass/over-constrained-vregs.rs b/src/test/ui/run-pass/over-constrained-vregs.rs
similarity index 98%
rename from src/test/run-pass/over-constrained-vregs.rs
rename to src/test/ui/run-pass/over-constrained-vregs.rs
index e4e07941470a8..e9090ce79d8f4 100644
--- a/src/test/run-pass/over-constrained-vregs.rs
+++ b/src/test/ui/run-pass/over-constrained-vregs.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Regression test for issue #152.
 pub fn main() {
     let mut b: usize = 1_usize;
diff --git a/src/test/run-pass/overlap-doesnt-conflict-with-specialization.rs b/src/test/ui/run-pass/overlap-doesnt-conflict-with-specialization.rs
similarity index 98%
rename from src/test/run-pass/overlap-doesnt-conflict-with-specialization.rs
rename to src/test/ui/run-pass/overlap-doesnt-conflict-with-specialization.rs
index ed45d81c0d6a1..f8f42b5b60f54 100644
--- a/src/test/run-pass/overlap-doesnt-conflict-with-specialization.rs
+++ b/src/test/ui/run-pass/overlap-doesnt-conflict-with-specialization.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(overlapping_marker_traits)]
 #![feature(specialization)]
 
diff --git a/src/test/run-pass/owned-implies-static.rs b/src/test/ui/run-pass/owned-implies-static.rs
similarity index 97%
rename from src/test/run-pass/owned-implies-static.rs
rename to src/test/ui/run-pass/owned-implies-static.rs
index f698b660751ab..f1f1620412473 100644
--- a/src/test/run-pass/owned-implies-static.rs
+++ b/src/test/ui/run-pass/owned-implies-static.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 fn f<T: 'static>(_x: T) {}
diff --git a/src/test/run-pass/paren-free.rs b/src/test/ui/run-pass/paren-free.rs
similarity index 97%
rename from src/test/run-pass/paren-free.rs
rename to src/test/ui/run-pass/paren-free.rs
index d9669812d2ad3..813635689cc9f 100644
--- a/src/test/run-pass/paren-free.rs
+++ b/src/test/ui/run-pass/paren-free.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() {
     let x = true;
     if x { let mut i = 10; while i > 0 { i -= 1; } }
diff --git a/src/test/run-pass/parse-assoc-type-lt.rs b/src/test/ui/run-pass/parse-assoc-type-lt.rs
similarity index 97%
rename from src/test/run-pass/parse-assoc-type-lt.rs
rename to src/test/ui/run-pass/parse-assoc-type-lt.rs
index c81677220539e..801332dcfd0c1 100644
--- a/src/test/run-pass/parse-assoc-type-lt.rs
+++ b/src/test/ui/run-pass/parse-assoc-type-lt.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 trait Foo {
diff --git a/src/test/run-pass/parse-panic.rs b/src/test/ui/run-pass/parse-panic.rs
similarity index 97%
rename from src/test/run-pass/parse-panic.rs
rename to src/test/ui/run-pass/parse-panic.rs
index 22b24ebb3b589..b11ec8a2360b7 100644
--- a/src/test/run-pass/parse-panic.rs
+++ b/src/test/ui/run-pass/parse-panic.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![allow(unreachable_code)]
 
 fn dont_call_me() { panic!(); println!("{}", 1); }
diff --git a/src/test/run-pass/parser-unicode-whitespace.rs b/src/test/ui/run-pass/parser-unicode-whitespace.rs
similarity index 98%
rename from src/test/run-pass/parser-unicode-whitespace.rs
rename to src/test/ui/run-pass/parser-unicode-whitespace.rs
index 837bb8339e1d1..14c829b4fe059 100644
--- a/src/test/run-pass/parser-unicode-whitespace.rs
+++ b/src/test/ui/run-pass/parser-unicode-whitespace.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 // Beware editing: it has numerous whitespace characters which are important.
 // It contains one ranges from the 'PATTERN_WHITE_SPACE' property outlined in
diff --git a/src/test/run-pass/path.rs b/src/test/ui/run-pass/path.rs
similarity index 97%
rename from src/test/run-pass/path.rs
rename to src/test/ui/run-pass/path.rs
index fddc2744eb174..ddef7254935a7 100644
--- a/src/test/run-pass/path.rs
+++ b/src/test/ui/run-pass/path.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/paths-containing-nul.rs b/src/test/ui/run-pass/paths-containing-nul.rs
similarity index 98%
rename from src/test/run-pass/paths-containing-nul.rs
rename to src/test/ui/run-pass/paths-containing-nul.rs
index e0fe1ea72df16..e15f5f179f837 100644
--- a/src/test/run-pass/paths-containing-nul.rs
+++ b/src/test/ui/run-pass/paths-containing-nul.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(deprecated)]
+
 // ignore-cloudabi no files or I/O
 // ignore-wasm32-bare no files or I/O
 
diff --git a/src/test/run-pass/print-stdout-eprint-stderr.rs b/src/test/ui/run-pass/print-stdout-eprint-stderr.rs
similarity index 99%
rename from src/test/run-pass/print-stdout-eprint-stderr.rs
rename to src/test/ui/run-pass/print-stdout-eprint-stderr.rs
index 9e36089cc23df..c880572d75d59 100644
--- a/src/test/run-pass/print-stdout-eprint-stderr.rs
+++ b/src/test/ui/run-pass/print-stdout-eprint-stderr.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-cloudabi spawning processes is not supported
 // ignore-emscripten spawning processes is not supported
 
diff --git a/src/test/run-pass/project-cache-issue-31849.rs b/src/test/ui/run-pass/project-cache-issue-31849.rs
similarity index 99%
rename from src/test/run-pass/project-cache-issue-31849.rs
rename to src/test/ui/run-pass/project-cache-issue-31849.rs
index d03424b2b2b7a..0d3e4612a9242 100644
--- a/src/test/run-pass/project-cache-issue-31849.rs
+++ b/src/test/ui/run-pass/project-cache-issue-31849.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Regression test for #31849: the problem here was actually a performance
 // cliff, but I'm adding the test for reference.
 
diff --git a/src/test/run-pass/project-cache-issue-37154.rs b/src/test/ui/run-pass/project-cache-issue-37154.rs
similarity index 98%
rename from src/test/run-pass/project-cache-issue-37154.rs
rename to src/test/ui/run-pass/project-cache-issue-37154.rs
index 29dc6984e234a..427b1e5016da7 100644
--- a/src/test/run-pass/project-cache-issue-37154.rs
+++ b/src/test/ui/run-pass/project-cache-issue-37154.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Regression test for #37154: the problem here was that the cache
 // results in a false error because it was caching skolemized results
 // even after those skolemized regions had been popped.
diff --git a/src/test/run-pass/project-defer-unification.rs b/src/test/ui/run-pass/project-defer-unification.rs
similarity index 99%
rename from src/test/run-pass/project-defer-unification.rs
rename to src/test/ui/run-pass/project-defer-unification.rs
index 9a6ea2272fea7..01aae941f0759 100644
--- a/src/test/run-pass/project-defer-unification.rs
+++ b/src/test/ui/run-pass/project-defer-unification.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // A regression test extracted from image-0.3.11. The point of
 // failure was in `index_colors` below.
 
diff --git a/src/test/run-pass/ptr-coercion.rs b/src/test/ui/run-pass/ptr-coercion.rs
similarity index 98%
rename from src/test/run-pass/ptr-coercion.rs
rename to src/test/ui/run-pass/ptr-coercion.rs
index ac1b6aebec5b1..ed17f9879307d 100644
--- a/src/test/run-pass/ptr-coercion.rs
+++ b/src/test/ui/run-pass/ptr-coercion.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test coercions between pointers which don't do anything fancy like unsizing.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/pure-sum.rs b/src/test/ui/run-pass/pure-sum.rs
similarity index 99%
rename from src/test/run-pass/pure-sum.rs
rename to src/test/ui/run-pass/pure-sum.rs
index 3313196a5eced..a9ea252213252 100644
--- a/src/test/run-pass/pure-sum.rs
+++ b/src/test/ui/run-pass/pure-sum.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Check that functions can modify local state.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/purity-infer.rs b/src/test/ui/run-pass/purity-infer.rs
similarity index 97%
rename from src/test/run-pass/purity-infer.rs
rename to src/test/ui/run-pass/purity-infer.rs
index c5588a29cb526..28aeb0c1aee64 100644
--- a/src/test/run-pass/purity-infer.rs
+++ b/src/test/ui/run-pass/purity-infer.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 fn something<F>(f: F) where F: FnOnce() { f(); }
 pub fn main() {
diff --git a/src/test/run-pass/range-type-infer.rs b/src/test/ui/run-pass/range-type-infer.rs
similarity index 98%
rename from src/test/run-pass/range-type-infer.rs
rename to src/test/ui/run-pass/range-type-infer.rs
index b6d4d09d69727..db7e199bf7bdd 100644
--- a/src/test/run-pass/range-type-infer.rs
+++ b/src/test/ui/run-pass/range-type-infer.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Make sure the type inference for the new range expression work as
 // good as the old one. Check out issue #21672, #21595 and #21649 for
 // more details.
diff --git a/src/test/run-pass/range.rs b/src/test/ui/run-pass/range.rs
similarity index 97%
rename from src/test/run-pass/range.rs
rename to src/test/ui/run-pass/range.rs
index 4c249bbe1f73e..ece123efb39d3 100644
--- a/src/test/run-pass/range.rs
+++ b/src/test/ui/run-pass/range.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(unused_comparisons)]
+
 // Test range syntax.
 
 
diff --git a/src/test/run-pass/range_inclusive.rs b/src/test/ui/run-pass/range_inclusive.rs
similarity index 99%
rename from src/test/run-pass/range_inclusive.rs
rename to src/test/ui/run-pass/range_inclusive.rs
index 2bedfc133b581..4c2391c0d92e1 100644
--- a/src/test/run-pass/range_inclusive.rs
+++ b/src/test/ui/run-pass/range_inclusive.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test inclusive range syntax.
 
 #![feature(range_is_empty)]
diff --git a/src/test/run-pass/range_inclusive_gate.rs b/src/test/ui/run-pass/range_inclusive_gate.rs
similarity index 94%
rename from src/test/run-pass/range_inclusive_gate.rs
rename to src/test/ui/run-pass/range_inclusive_gate.rs
index 6c2731fa5a9bb..b908ffb3ae66b 100644
--- a/src/test/run-pass/range_inclusive_gate.rs
+++ b/src/test/ui/run-pass/range_inclusive_gate.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(unused_comparisons)]
+
 // Test that you only need the syntax gate if you don't mention the structs.
 // (Obsoleted since both features are stabilized)
 
diff --git a/src/test/run-pass/ranges-precedence.rs b/src/test/ui/run-pass/ranges-precedence.rs
similarity index 99%
rename from src/test/run-pass/ranges-precedence.rs
rename to src/test/ui/run-pass/ranges-precedence.rs
index eb404751ee6f9..aabffe81e7893 100644
--- a/src/test/run-pass/ranges-precedence.rs
+++ b/src/test/ui/run-pass/ranges-precedence.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that the precedence of ranges is correct
 
 
diff --git a/src/test/run-pass/raw-fat-ptr.rs b/src/test/ui/run-pass/raw-fat-ptr.rs
similarity index 99%
rename from src/test/run-pass/raw-fat-ptr.rs
rename to src/test/ui/run-pass/raw-fat-ptr.rs
index b4572f4577133..d9bb2afc94447 100644
--- a/src/test/run-pass/raw-fat-ptr.rs
+++ b/src/test/ui/run-pass/raw-fat-ptr.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // check raw fat pointer ops
 
 use std::mem;
diff --git a/src/test/run-pass/raw-str.rs b/src/test/ui/run-pass/raw-str.rs
similarity index 99%
rename from src/test/run-pass/raw-str.rs
rename to src/test/ui/run-pass/raw-str.rs
index 9ee824d418585..f638a13b2635d 100644
Binary files a/src/test/run-pass/raw-str.rs and b/src/test/ui/run-pass/raw-str.rs differ
diff --git a/src/test/run-pass/rcvr-borrowed-to-region.rs b/src/test/ui/run-pass/rcvr-borrowed-to-region.rs
similarity index 95%
rename from src/test/run-pass/rcvr-borrowed-to-region.rs
rename to src/test/ui/run-pass/rcvr-borrowed-to-region.rs
index bc869113fe900..9e581dd9559a7 100644
--- a/src/test/run-pass/rcvr-borrowed-to-region.rs
+++ b/src/test/ui/run-pass/rcvr-borrowed-to-region.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 #![feature(box_syntax)]
 
 trait get {
diff --git a/src/test/run-pass/reachable-unnameable-items.rs b/src/test/ui/run-pass/reachable-unnameable-items.rs
similarity index 99%
rename from src/test/run-pass/reachable-unnameable-items.rs
rename to src/test/ui/run-pass/reachable-unnameable-items.rs
index d087be6d10cfc..fe849a340bc00 100644
--- a/src/test/run-pass/reachable-unnameable-items.rs
+++ b/src/test/ui/run-pass/reachable-unnameable-items.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-wasm32-bare compiled with panic=abort by default
 // aux-build:reachable-unnameable-items.rs
 
diff --git a/src/test/run-pass/reachable-unnameable-type-alias.rs b/src/test/ui/run-pass/reachable-unnameable-type-alias.rs
similarity index 98%
rename from src/test/run-pass/reachable-unnameable-type-alias.rs
rename to src/test/ui/run-pass/reachable-unnameable-type-alias.rs
index 5d0c6df3d582f..141740f65f0ca 100644
--- a/src/test/run-pass/reachable-unnameable-type-alias.rs
+++ b/src/test/ui/run-pass/reachable-unnameable-type-alias.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(staged_api)]
 #![stable(feature = "a", since = "b")]
 
diff --git a/src/test/run-pass/readalias.rs b/src/test/ui/run-pass/readalias.rs
similarity index 97%
rename from src/test/run-pass/readalias.rs
rename to src/test/ui/run-pass/readalias.rs
index 56b15c243618f..563d7d29ecdcb 100644
--- a/src/test/run-pass/readalias.rs
+++ b/src/test/ui/run-pass/readalias.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/reexport-should-still-link.rs b/src/test/ui/run-pass/reexport-should-still-link.rs
similarity index 97%
rename from src/test/run-pass/reexport-should-still-link.rs
rename to src/test/ui/run-pass/reexport-should-still-link.rs
index 1243d72af5efb..ebfe16c4bdbb1 100644
--- a/src/test/run-pass/reexport-should-still-link.rs
+++ b/src/test/ui/run-pass/reexport-should-still-link.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:reexport-should-still-link.rs
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/reexport-star.rs b/src/test/ui/run-pass/reexport-star.rs
similarity index 97%
rename from src/test/run-pass/reexport-star.rs
rename to src/test/ui/run-pass/reexport-star.rs
index a8d052f407fcc..87c61890d3d1c 100644
--- a/src/test/run-pass/reexport-star.rs
+++ b/src/test/ui/run-pass/reexport-star.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/reexport-test-harness-main.rs b/src/test/ui/run-pass/reexport-test-harness-main.rs
similarity index 98%
rename from src/test/run-pass/reexport-test-harness-main.rs
rename to src/test/ui/run-pass/reexport-test-harness-main.rs
index 88e3e6ba4acd3..b062d5a1ff170 100644
--- a/src/test/run-pass/reexport-test-harness-main.rs
+++ b/src/test/ui/run-pass/reexport-test-harness-main.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags:--test
 
 #![reexport_test_harness_main = "test_main"]
diff --git a/src/test/run-pass/result-opt-conversions.rs b/src/test/ui/run-pass/result-opt-conversions.rs
similarity index 99%
rename from src/test/run-pass/result-opt-conversions.rs
rename to src/test/ui/run-pass/result-opt-conversions.rs
index 0f6da002dda37..a6604409878c3 100644
--- a/src/test/run-pass/result-opt-conversions.rs
+++ b/src/test/ui/run-pass/result-opt-conversions.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(transpose_result)]
 
 #[derive(Copy, Clone, Debug, PartialEq)]
diff --git a/src/test/run-pass/ret-bang.rs b/src/test/ui/run-pass/ret-bang.rs
similarity index 98%
rename from src/test/run-pass/ret-bang.rs
rename to src/test/ui/run-pass/ret-bang.rs
index 7d4d021811227..10e07df2160a7 100644
--- a/src/test/run-pass/ret-bang.rs
+++ b/src/test/ui/run-pass/ret-bang.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/ret-none.rs b/src/test/ui/run-pass/ret-none.rs
similarity index 93%
rename from src/test/run-pass/ret-none.rs
rename to src/test/ui/run-pass/ret-none.rs
index 032a4b662cb1a..0f5998a0991ed 100644
--- a/src/test/run-pass/ret-none.rs
+++ b/src/test/ui/run-pass/ret-none.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/return-nil.rs b/src/test/ui/run-pass/return-nil.rs
similarity index 97%
rename from src/test/run-pass/return-nil.rs
rename to src/test/ui/run-pass/return-nil.rs
index fe4244084cb19..361ed41c0ae74 100644
--- a/src/test/run-pass/return-nil.rs
+++ b/src/test/ui/run-pass/return-nil.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/rmeta.rs b/src/test/ui/run-pass/rmeta.rs
similarity index 98%
rename from src/test/run-pass/rmeta.rs
rename to src/test/ui/run-pass/rmeta.rs
index 11684d8663af8..f0ee61b9d8ece 100644
--- a/src/test/run-pass/rmeta.rs
+++ b/src/test/ui/run-pass/rmeta.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that using rlibs and rmeta dep crates work together. Specifically, that
 // there can be both an rmeta and an rlib file and rustc will prefer the rlib.
 
diff --git a/src/test/run-pass/running-with-no-runtime.rs b/src/test/ui/run-pass/running-with-no-runtime.rs
similarity index 99%
rename from src/test/run-pass/running-with-no-runtime.rs
rename to src/test/ui/run-pass/running-with-no-runtime.rs
index d349519478ae4..2006cab25e870 100644
--- a/src/test/run-pass/running-with-no-runtime.rs
+++ b/src/test/ui/run-pass/running-with-no-runtime.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-cloudabi spawning processes is not supported
 // ignore-emscripten spawning processes is not supported
 
diff --git a/src/test/run-pass/rvalue-static-promotion.rs b/src/test/ui/run-pass/rvalue-static-promotion.rs
similarity index 98%
rename from src/test/run-pass/rvalue-static-promotion.rs
rename to src/test/ui/run-pass/rvalue-static-promotion.rs
index acf96b566df84..4d7e29484cc32 100644
--- a/src/test/run-pass/rvalue-static-promotion.rs
+++ b/src/test/ui/run-pass/rvalue-static-promotion.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::cell::Cell;
 
 const NONE_CELL_STRING: Option<Cell<String>> = None;
diff --git a/src/test/run-pass/segfault-no-out-of-stack.rs b/src/test/ui/run-pass/segfault-no-out-of-stack.rs
similarity index 99%
rename from src/test/run-pass/segfault-no-out-of-stack.rs
rename to src/test/ui/run-pass/segfault-no-out-of-stack.rs
index 307ead4b74f74..45747dddd6b96 100644
--- a/src/test/run-pass/segfault-no-out-of-stack.rs
+++ b/src/test/ui/run-pass/segfault-no-out-of-stack.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-cloudabi can't run commands
 // ignore-emscripten can't run commands
 
diff --git a/src/test/run-pass/seq-compare.rs b/src/test/ui/run-pass/seq-compare.rs
similarity index 98%
rename from src/test/run-pass/seq-compare.rs
rename to src/test/ui/run-pass/seq-compare.rs
index 43612f529772a..67785104fb3c1 100644
--- a/src/test/run-pass/seq-compare.rs
+++ b/src/test/ui/run-pass/seq-compare.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 pub fn main() {
diff --git a/src/test/run-pass/shadow.rs b/src/test/ui/run-pass/shadow.rs
similarity index 95%
rename from src/test/run-pass/shadow.rs
rename to src/test/ui/run-pass/shadow.rs
index b764fc6f1ec96..609f7477fa95a 100644
--- a/src/test/run-pass/shadow.rs
+++ b/src/test/ui/run-pass/shadow.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 fn foo(c: Vec<isize> ) {
     let a: isize = 5;
     let mut b: Vec<isize> = Vec::new();
diff --git a/src/test/run-pass/shadowed-use-visibility.rs b/src/test/ui/run-pass/shadowed-use-visibility.rs
similarity index 97%
rename from src/test/run-pass/shadowed-use-visibility.rs
rename to src/test/ui/run-pass/shadowed-use-visibility.rs
index d2a32da4feaa2..f42efa9d56e5b 100644
--- a/src/test/run-pass/shadowed-use-visibility.rs
+++ b/src/test/ui/run-pass/shadowed-use-visibility.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 mod foo {
     pub fn f() {}
 
diff --git a/src/test/run-pass/shebang.rs b/src/test/ui/run-pass/shebang.rs
similarity index 97%
rename from src/test/run-pass/shebang.rs
rename to src/test/ui/run-pass/shebang.rs
index a0947cd49a42d..e9f89ac87d403 100644
--- a/src/test/run-pass/shebang.rs
+++ b/src/test/ui/run-pass/shebang.rs
@@ -9,4 +9,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() { println!("Hello World"); }
diff --git a/src/test/run-pass/signal-alternate-stack-cleanup.rs b/src/test/ui/run-pass/signal-alternate-stack-cleanup.rs
similarity index 99%
rename from src/test/run-pass/signal-alternate-stack-cleanup.rs
rename to src/test/ui/run-pass/signal-alternate-stack-cleanup.rs
index ad099f82d13b9..89d4345529f06 100644
--- a/src/test/run-pass/signal-alternate-stack-cleanup.rs
+++ b/src/test/ui/run-pass/signal-alternate-stack-cleanup.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Previously memory for alternate signal stack have been unmapped during
 // main thread exit while still being in use by signal handlers. This test
 // triggers this situation by sending signal from atexit handler.
diff --git a/src/test/run-pass/signal-exit-status.rs b/src/test/ui/run-pass/signal-exit-status.rs
similarity index 98%
rename from src/test/run-pass/signal-exit-status.rs
rename to src/test/ui/run-pass/signal-exit-status.rs
index 76171a4cc4656..e36ce8c2fb966 100644
--- a/src/test/run-pass/signal-exit-status.rs
+++ b/src/test/ui/run-pass/signal-exit-status.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 // ignore-windows
diff --git a/src/test/run-pass/sigpipe-should-be-ignored.rs b/src/test/ui/run-pass/sigpipe-should-be-ignored.rs
similarity index 99%
rename from src/test/run-pass/sigpipe-should-be-ignored.rs
rename to src/test/ui/run-pass/sigpipe-should-be-ignored.rs
index f5e2239538f65..64f743e5adb98 100644
--- a/src/test/run-pass/sigpipe-should-be-ignored.rs
+++ b/src/test/ui/run-pass/sigpipe-should-be-ignored.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Be sure that when a SIGPIPE would have been received that the entire process
 // doesn't die in a ball of fire, but rather it's gracefully handled.
 
diff --git a/src/test/run-pass/simple-infer.rs b/src/test/ui/run-pass/simple-infer.rs
similarity index 97%
rename from src/test/run-pass/simple-infer.rs
rename to src/test/ui/run-pass/simple-infer.rs
index 04c1af4326bbd..b7060fd305961 100644
--- a/src/test/run-pass/simple-infer.rs
+++ b/src/test/ui/run-pass/simple-infer.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 pub fn main() { let mut n; n = 1; println!("{}", n); }
diff --git a/src/test/run-pass/simple_global_asm.rs b/src/test/ui/run-pass/simple_global_asm.rs
similarity index 98%
rename from src/test/run-pass/simple_global_asm.rs
rename to src/test/ui/run-pass/simple_global_asm.rs
index cd8273c6bc2b8..bc8c9ef3f53ae 100644
--- a/src/test/run-pass/simple_global_asm.rs
+++ b/src/test/ui/run-pass/simple_global_asm.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(global_asm)]
 #![feature(naked_functions)]
 
diff --git a/src/test/run-pass/size-and-align.rs b/src/test/ui/run-pass/size-and-align.rs
similarity index 95%
rename from src/test/run-pass/size-and-align.rs
rename to src/test/ui/run-pass/size-and-align.rs
index 13d55e0172e71..d22f4967ee291 100644
--- a/src/test/run-pass/size-and-align.rs
+++ b/src/test/ui/run-pass/size-and-align.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 enum clam<T> { a(T, isize), b, }
 
 fn uhoh<T>(v: Vec<clam<T>> ) {
diff --git a/src/test/run-pass/sized-borrowed-pointer.rs b/src/test/ui/run-pass/sized-borrowed-pointer.rs
similarity index 98%
rename from src/test/run-pass/sized-borrowed-pointer.rs
rename to src/test/ui/run-pass/sized-borrowed-pointer.rs
index 76c06d560d754..f29bb87eab843 100644
--- a/src/test/run-pass/sized-borrowed-pointer.rs
+++ b/src/test/ui/run-pass/sized-borrowed-pointer.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Possibly-dynamic size of typaram should be cleared at pointer boundary.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/sized-owned-pointer.rs b/src/test/ui/run-pass/sized-owned-pointer.rs
similarity index 98%
rename from src/test/run-pass/sized-owned-pointer.rs
rename to src/test/ui/run-pass/sized-owned-pointer.rs
index d3a6b104dba55..fc120ccbd2fea 100644
--- a/src/test/run-pass/sized-owned-pointer.rs
+++ b/src/test/ui/run-pass/sized-owned-pointer.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Possibly-dynamic size of typaram should be cleared at pointer boundary.
 
 
diff --git a/src/test/run-pass/sleep.rs b/src/test/ui/run-pass/sleep.rs
similarity index 98%
rename from src/test/run-pass/sleep.rs
rename to src/test/ui/run-pass/sleep.rs
index 9acc6ff8cf084..8e1611b804d28 100644
--- a/src/test/run-pass/sleep.rs
+++ b/src/test/ui/run-pass/sleep.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-emscripten no threads support
 
 use std::thread::{self, sleep};
diff --git a/src/test/run-pass/slowparse-bstring.rs b/src/test/ui/run-pass/slowparse-bstring.rs
similarity index 99%
rename from src/test/run-pass/slowparse-bstring.rs
rename to src/test/ui/run-pass/slowparse-bstring.rs
index b2bbd7e9103d2..7dc0e94ff55d1 100644
--- a/src/test/run-pass/slowparse-bstring.rs
+++ b/src/test/ui/run-pass/slowparse-bstring.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-tidy-linelength
 
 // Issue #16624
diff --git a/src/test/run-pass/slowparse-string.rs b/src/test/ui/run-pass/slowparse-string.rs
similarity index 99%
rename from src/test/run-pass/slowparse-string.rs
rename to src/test/ui/run-pass/slowparse-string.rs
index 46b47c8537fe7..07c3e55e2574a 100644
--- a/src/test/run-pass/slowparse-string.rs
+++ b/src/test/ui/run-pass/slowparse-string.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-tidy-linelength
 
 // Issue #16624
diff --git a/src/test/run-pass/snake-case-no-lowercase-equivalent.rs b/src/test/ui/run-pass/snake-case-no-lowercase-equivalent.rs
similarity index 97%
rename from src/test/run-pass/snake-case-no-lowercase-equivalent.rs
rename to src/test/ui/run-pass/snake-case-no-lowercase-equivalent.rs
index 90ea7537c6e60..25167c8e89ad9 100644
--- a/src/test/run-pass/snake-case-no-lowercase-equivalent.rs
+++ b/src/test/ui/run-pass/snake-case-no-lowercase-equivalent.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![feature(non_ascii_idents)]
diff --git a/src/test/run-pass/sse2.rs b/src/test/ui/run-pass/sse2.rs
similarity index 96%
rename from src/test/run-pass/sse2.rs
rename to src/test/ui/run-pass/sse2.rs
index b1d7e5435c4cb..5f01d7cafb390 100644
--- a/src/test/run-pass/sse2.rs
+++ b/src/test/ui/run-pass/sse2.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+
 // min-llvm-version 6.0
 // ^ needs MCSubtargetInfo::checkFeatures()
 // ignore-cloudabi no std::env
diff --git a/src/test/run-pass/stable-addr-of.rs b/src/test/ui/run-pass/stable-addr-of.rs
similarity index 97%
rename from src/test/run-pass/stable-addr-of.rs
rename to src/test/ui/run-pass/stable-addr-of.rs
index 5ffceb2c6a8bc..7f203ba81df38 100644
--- a/src/test/run-pass/stable-addr-of.rs
+++ b/src/test/ui/run-pass/stable-addr-of.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Issue #2040
 
 
diff --git a/src/test/run-pass/stack-probes-lto.rs b/src/test/ui/run-pass/stack-probes-lto.rs
similarity index 98%
rename from src/test/run-pass/stack-probes-lto.rs
rename to src/test/ui/run-pass/stack-probes-lto.rs
index ff5413ce06ca0..a55b4e1d29373 100644
--- a/src/test/run-pass/stack-probes-lto.rs
+++ b/src/test/ui/run-pass/stack-probes-lto.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-arm
 // ignore-aarch64
 // ignore-mips
diff --git a/src/test/run-pass/stack-probes.rs b/src/test/ui/run-pass/stack-probes.rs
similarity index 99%
rename from src/test/run-pass/stack-probes.rs
rename to src/test/ui/run-pass/stack-probes.rs
index 1334ab8dc6378..1bf7550ca7d14 100644
--- a/src/test/run-pass/stack-probes.rs
+++ b/src/test/ui/run-pass/stack-probes.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-arm
 // ignore-aarch64
 // ignore-mips
diff --git a/src/test/run-pass/refer-to-other-statics-by-value.rs b/src/test/ui/run-pass/statics/refer-to-other-statics-by-value.rs
similarity index 97%
rename from src/test/run-pass/refer-to-other-statics-by-value.rs
rename to src/test/ui/run-pass/statics/refer-to-other-statics-by-value.rs
index 94c98ff95aba2..cd8330250bc29 100644
--- a/src/test/run-pass/refer-to-other-statics-by-value.rs
+++ b/src/test/ui/run-pass/statics/refer-to-other-statics-by-value.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 static A: usize = 42;
 static B: usize = A;
 
diff --git a/src/test/run-pass/repeat-expr-in-static.rs b/src/test/ui/run-pass/statics/repeat-expr-in-static.rs
similarity index 97%
rename from src/test/run-pass/repeat-expr-in-static.rs
rename to src/test/ui/run-pass/statics/repeat-expr-in-static.rs
index fc85aa8b51025..921f6b33373d1 100644
--- a/src/test/run-pass/repeat-expr-in-static.rs
+++ b/src/test/ui/run-pass/statics/repeat-expr-in-static.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 static FOO: [isize; 4] = [32; 4];
 static BAR: [isize; 4] = [32, 32, 32, 32];
diff --git a/src/test/run-pass/stdio-is-blocking.rs b/src/test/ui/run-pass/stdio-is-blocking.rs
similarity index 99%
rename from src/test/run-pass/stdio-is-blocking.rs
rename to src/test/ui/run-pass/stdio-is-blocking.rs
index 8d4ee14628408..87c18b97af901 100644
--- a/src/test/run-pass/stdio-is-blocking.rs
+++ b/src/test/ui/run-pass/stdio-is-blocking.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 
diff --git a/src/test/run-pass/str-concat.rs b/src/test/ui/run-pass/str-concat.rs
similarity index 98%
rename from src/test/run-pass/str-concat.rs
rename to src/test/ui/run-pass/str-concat.rs
index ad0d2f11abd86..3eac9369d6e31 100644
--- a/src/test/run-pass/str-concat.rs
+++ b/src/test/ui/run-pass/str-concat.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/str-multiline.rs b/src/test/ui/run-pass/str-multiline.rs
similarity index 98%
rename from src/test/run-pass/str-multiline.rs
rename to src/test/ui/run-pass/str-multiline.rs
index 94e14290498b8..1ea5b53e5198d 100644
--- a/src/test/run-pass/str-multiline.rs
+++ b/src/test/ui/run-pass/str-multiline.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 pub fn main() {
     let a: String = "this \
diff --git a/src/test/run-pass/string-box-error.rs b/src/test/ui/run-pass/string-box-error.rs
similarity index 98%
rename from src/test/run-pass/string-box-error.rs
rename to src/test/ui/run-pass/string-box-error.rs
index a80d9a0593566..5d5d4e2ed336f 100644
--- a/src/test/run-pass/string-box-error.rs
+++ b/src/test/ui/run-pass/string-box-error.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Ensure that both `Box<Error + Send + Sync>` and `Box<Error>` can be obtained from `String`.
 
 use std::error::Error;
diff --git a/src/test/run-pass/string-escapes.rs b/src/test/ui/run-pass/string-escapes.rs
similarity index 97%
rename from src/test/run-pass/string-escapes.rs
rename to src/test/ui/run-pass/string-escapes.rs
index acd9e0675aed9..04c308de59f5f 100644
--- a/src/test/run-pass/string-escapes.rs
+++ b/src/test/ui/run-pass/string-escapes.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 fn main() {
     let x = "\\\\\
diff --git a/src/test/run-pass/structured-compare.rs b/src/test/ui/run-pass/structured-compare.rs
similarity index 96%
rename from src/test/run-pass/structured-compare.rs
rename to src/test/ui/run-pass/structured-compare.rs
index 7974366c395fc..25e9b1ac334b2 100644
--- a/src/test/run-pass/structured-compare.rs
+++ b/src/test/ui/run-pass/structured-compare.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 
 
 #[derive(Copy, Clone, Debug)]
diff --git a/src/test/run-pass/super-fast-paren-parsing.rs b/src/test/ui/run-pass/super-fast-paren-parsing.rs
similarity index 96%
rename from src/test/run-pass/super-fast-paren-parsing.rs
rename to src/test/ui/run-pass/super-fast-paren-parsing.rs
index a1bbd19021127..724cb851c3859 100644
--- a/src/test/run-pass/super-fast-paren-parsing.rs
+++ b/src/test/ui/run-pass/super-fast-paren-parsing.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_upper_case_globals)]
+
 // exec-env:RUST_MIN_STACK=16000000
 // rustc-env:RUST_MIN_STACK=16000000
 //
diff --git a/src/test/run-pass/supported-cast.rs b/src/test/ui/run-pass/supported-cast.rs
similarity index 99%
rename from src/test/run-pass/supported-cast.rs
rename to src/test/ui/run-pass/supported-cast.rs
index 7f92707586b28..8c62f3e40aae6 100644
--- a/src/test/run-pass/supported-cast.rs
+++ b/src/test/ui/run-pass/supported-cast.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() {
   let f = 1_usize as *const String;
   println!("{:?}", f as isize);
diff --git a/src/test/run-pass/svh-add-nothing.rs b/src/test/ui/run-pass/svh-add-nothing.rs
similarity index 98%
rename from src/test/run-pass/svh-add-nothing.rs
rename to src/test/ui/run-pass/svh-add-nothing.rs
index aca50859b6eda..ea45894f1a3e8 100644
--- a/src/test/run-pass/svh-add-nothing.rs
+++ b/src/test/ui/run-pass/svh-add-nothing.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // note that these aux-build directives must be in this order
 // aux-build:svh-a-base.rs
 // aux-build:svh-b.rs
diff --git a/src/test/run-pass/swap-1.rs b/src/test/ui/run-pass/swap-1.rs
similarity index 97%
rename from src/test/run-pass/swap-1.rs
rename to src/test/ui/run-pass/swap-1.rs
index 12e72aac38d4a..9f9fbeb76fde3 100644
--- a/src/test/run-pass/swap-1.rs
+++ b/src/test/ui/run-pass/swap-1.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 use std::mem::swap;
 
diff --git a/src/test/run-pass/swap-2.rs b/src/test/ui/run-pass/swap-2.rs
similarity index 98%
rename from src/test/run-pass/swap-2.rs
rename to src/test/ui/run-pass/swap-2.rs
index 4601b7d7cf567..432f922f4b71e 100644
--- a/src/test/run-pass/swap-2.rs
+++ b/src/test/ui/run-pass/swap-2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 use std::mem::swap;
 
diff --git a/src/test/run-pass/swap-overlapping.rs b/src/test/ui/run-pass/swap-overlapping.rs
similarity index 98%
rename from src/test/run-pass/swap-overlapping.rs
rename to src/test/ui/run-pass/swap-overlapping.rs
index 2e5386d6866ed..d214622f8a92b 100644
--- a/src/test/run-pass/swap-overlapping.rs
+++ b/src/test/ui/run-pass/swap-overlapping.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Issue #5041 - avoid overlapping memcpy when src and dest of a swap are the same
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/tail-call-arg-leak.rs b/src/test/ui/run-pass/tail-call-arg-leak.rs
similarity index 98%
rename from src/test/run-pass/tail-call-arg-leak.rs
rename to src/test/ui/run-pass/tail-call-arg-leak.rs
index 8842e1b85915b..c7130978adaf9 100644
--- a/src/test/run-pass/tail-call-arg-leak.rs
+++ b/src/test/ui/run-pass/tail-call-arg-leak.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/tail-cps.rs b/src/test/ui/run-pass/tail-cps.rs
similarity index 98%
rename from src/test/run-pass/tail-cps.rs
rename to src/test/ui/run-pass/tail-cps.rs
index b6313905923d6..1ab1e8171c6a2 100644
--- a/src/test/run-pass/tail-cps.rs
+++ b/src/test/ui/run-pass/tail-cps.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 fn checktrue(rs: bool) -> bool { assert!((rs)); return true; }
 
 pub fn main() { let k = checktrue; evenk(42, k); oddk(45, k); }
diff --git a/src/test/run-pass/tail-direct.rs b/src/test/ui/run-pass/tail-direct.rs
similarity index 98%
rename from src/test/run-pass/tail-direct.rs
rename to src/test/ui/run-pass/tail-direct.rs
index 4a7a0acdfa891..11408cc68a106 100644
--- a/src/test/run-pass/tail-direct.rs
+++ b/src/test/ui/run-pass/tail-direct.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 
 
diff --git a/src/test/run-pass/tcp-stress.rs b/src/test/ui/run-pass/tcp-stress.rs
similarity index 99%
rename from src/test/run-pass/tcp-stress.rs
rename to src/test/ui/run-pass/tcp-stress.rs
index 30da1e523fc52..8d2044c87c5b1 100644
--- a/src/test/run-pass/tcp-stress.rs
+++ b/src/test/ui/run-pass/tcp-stress.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-android needs extra network permissions
 // ignore-bitrig system ulimit (Too many open files)
 // ignore-cloudabi no global network namespace access
diff --git a/src/test/run-pass/terminate-in-initializer.rs b/src/test/ui/run-pass/terminate-in-initializer.rs
similarity index 98%
rename from src/test/run-pass/terminate-in-initializer.rs
rename to src/test/ui/run-pass/terminate-in-initializer.rs
index c9133bae85408..7471853312132 100644
--- a/src/test/run-pass/terminate-in-initializer.rs
+++ b/src/test/ui/run-pass/terminate-in-initializer.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-emscripten no threads support
 
 // Issue #787
diff --git a/src/test/run-pass/test-allow-dead-extern-static-no-warning.rs b/src/test/ui/run-pass/test-allow-dead-extern-static-no-warning.rs
similarity index 97%
rename from src/test/run-pass/test-allow-dead-extern-static-no-warning.rs
rename to src/test/ui/run-pass/test-allow-dead-extern-static-no-warning.rs
index 8df32b54b8530..0a9f96417b6f0 100644
--- a/src/test/run-pass/test-allow-dead-extern-static-no-warning.rs
+++ b/src/test/ui/run-pass/test-allow-dead-extern-static-no-warning.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags: --test
 
 #![deny(dead_code)]
diff --git a/src/test/run-pass/test-allow-fail-attr.rs b/src/test/ui/run-pass/test-allow-fail-attr.rs
similarity index 98%
rename from src/test/run-pass/test-allow-fail-attr.rs
rename to src/test/ui/run-pass/test-allow-fail-attr.rs
index 884633df66b1b..def27bb7ee17c 100644
--- a/src/test/run-pass/test-allow-fail-attr.rs
+++ b/src/test/ui/run-pass/test-allow-fail-attr.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-wasm32-bare compiled with panic=abort by default
 // compile-flags: --test
 #![feature(allow_fail)]
diff --git a/src/test/run-pass/test-allow-non-camel-case-variant.rs b/src/test/ui/run-pass/test-allow-non-camel-case-variant.rs
similarity index 97%
rename from src/test/run-pass/test-allow-non-camel-case-variant.rs
rename to src/test/ui/run-pass/test-allow-non-camel-case-variant.rs
index c7073b3a95e12..bf9e63a9961c0 100644
--- a/src/test/run-pass/test-allow-non-camel-case-variant.rs
+++ b/src/test/ui/run-pass/test-allow-non-camel-case-variant.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![deny(non_camel_case_types)]
 
 pub enum Foo {
diff --git a/src/test/run-pass/test-fn-signature-verification-for-explicit-return-type.rs b/src/test/ui/run-pass/test-fn-signature-verification-for-explicit-return-type.rs
similarity index 98%
rename from src/test/run-pass/test-fn-signature-verification-for-explicit-return-type.rs
rename to src/test/ui/run-pass/test-fn-signature-verification-for-explicit-return-type.rs
index 10ad838d3cb87..09a6c260af260 100644
--- a/src/test/run-pass/test-fn-signature-verification-for-explicit-return-type.rs
+++ b/src/test/ui/run-pass/test-fn-signature-verification-for-explicit-return-type.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(test)]
 
 // compile-flags: --test
diff --git a/src/test/run-pass/test-main-not-dead-attr.rs b/src/test/ui/run-pass/test-main-not-dead-attr.rs
similarity index 97%
rename from src/test/run-pass/test-main-not-dead-attr.rs
rename to src/test/ui/run-pass/test-main-not-dead-attr.rs
index 295559b6ddb6f..d96270d526008 100644
--- a/src/test/run-pass/test-main-not-dead-attr.rs
+++ b/src/test/ui/run-pass/test-main-not-dead-attr.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags: --test
 
 #![feature(main)]
diff --git a/src/test/run-pass/test-main-not-dead.rs b/src/test/ui/run-pass/test-main-not-dead.rs
similarity index 97%
rename from src/test/run-pass/test-main-not-dead.rs
rename to src/test/ui/run-pass/test-main-not-dead.rs
index 7de3ca7479659..12926adba17d8 100644
--- a/src/test/run-pass/test-main-not-dead.rs
+++ b/src/test/ui/run-pass/test-main-not-dead.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags: --test
 
 #![deny(dead_code)]
diff --git a/src/test/run-pass/test-runner-hides-buried-main.rs b/src/test/ui/run-pass/test-runner-hides-buried-main.rs
similarity index 98%
rename from src/test/run-pass/test-runner-hides-buried-main.rs
rename to src/test/ui/run-pass/test-runner-hides-buried-main.rs
index 7ba10850403e0..fc2170c40f2aa 100644
--- a/src/test/run-pass/test-runner-hides-buried-main.rs
+++ b/src/test/ui/run-pass/test-runner-hides-buried-main.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags: --test
 
 #![feature(main)]
diff --git a/src/test/run-pass/test-runner-hides-main.rs b/src/test/ui/run-pass/test-runner-hides-main.rs
similarity index 97%
rename from src/test/run-pass/test-runner-hides-main.rs
rename to src/test/ui/run-pass/test-runner-hides-main.rs
index 7b696c1f8d27c..48bb92d632917 100644
--- a/src/test/run-pass/test-runner-hides-main.rs
+++ b/src/test/ui/run-pass/test-runner-hides-main.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags:--test
 // Building as a test runner means that a synthetic main will be run,
 // not ours
diff --git a/src/test/run-pass/test-runner-hides-start.rs b/src/test/ui/run-pass/test-runner-hides-start.rs
similarity index 97%
rename from src/test/run-pass/test-runner-hides-start.rs
rename to src/test/ui/run-pass/test-runner-hides-start.rs
index fc94b19ada1fb..6b01894a9f832 100644
--- a/src/test/run-pass/test-runner-hides-start.rs
+++ b/src/test/ui/run-pass/test-runner-hides-start.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags: --test
 
 #![feature(start)]
diff --git a/src/test/run-pass/test-should-fail-good-message.rs b/src/test/ui/run-pass/test-should-fail-good-message.rs
similarity index 98%
rename from src/test/run-pass/test-should-fail-good-message.rs
rename to src/test/ui/run-pass/test-should-fail-good-message.rs
index 360d4952d16aa..60687f80e9ce6 100644
--- a/src/test/run-pass/test-should-fail-good-message.rs
+++ b/src/test/ui/run-pass/test-should-fail-good-message.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-wasm32-bare compiled with panic=abort by default
 // compile-flags: --test
 #[test]
diff --git a/src/test/run-pass/test-vs-cfg-test.rs b/src/test/ui/run-pass/test-vs-cfg-test.rs
similarity index 97%
rename from src/test/run-pass/test-vs-cfg-test.rs
rename to src/test/ui/run-pass/test-vs-cfg-test.rs
index 708fde5988862..35c7e3011c3b5 100644
--- a/src/test/run-pass/test-vs-cfg-test.rs
+++ b/src/test/ui/run-pass/test-vs-cfg-test.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags: --cfg test
 
 // Make sure `--cfg test` does not inject test harness
diff --git a/src/test/run-pass/thin-lto-global-allocator.rs b/src/test/ui/run-pass/thin-lto-global-allocator.rs
similarity index 97%
rename from src/test/run-pass/thin-lto-global-allocator.rs
rename to src/test/ui/run-pass/thin-lto-global-allocator.rs
index 257d5bbc30677..a27dbddb45201 100644
--- a/src/test/run-pass/thin-lto-global-allocator.rs
+++ b/src/test/ui/run-pass/thin-lto-global-allocator.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // compile-flags: -Z thinlto -C codegen-units=2
 
 #[global_allocator]
diff --git a/src/test/run-pass/tool_attributes.rs b/src/test/ui/run-pass/tool_attributes.rs
similarity index 98%
rename from src/test/run-pass/tool_attributes.rs
rename to src/test/ui/run-pass/tool_attributes.rs
index 9d8e56e44cbb3..1b4c44bb28b0e 100644
--- a/src/test/run-pass/tool_attributes.rs
+++ b/src/test/ui/run-pass/tool_attributes.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Scoped attributes should not trigger an unused attributes lint.
 
 #![deny(unused_attributes)]
diff --git a/src/test/run-pass/tool_lints.rs b/src/test/ui/run-pass/tool_lints.rs
similarity index 97%
rename from src/test/run-pass/tool_lints.rs
rename to src/test/ui/run-pass/tool_lints.rs
index 24ec43b12f60e..f3786fa6d1dd3 100644
--- a/src/test/run-pass/tool_lints.rs
+++ b/src/test/ui/run-pass/tool_lints.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(tool_lints)]
 #![deny(unknown_lints)]
 
diff --git a/src/test/run-pass/tool_lints_2018_preview.rs b/src/test/ui/run-pass/tool_lints_2018_preview.rs
similarity index 97%
rename from src/test/run-pass/tool_lints_2018_preview.rs
rename to src/test/ui/run-pass/tool_lints_2018_preview.rs
index 6cd57eaa19595..ad95fede345ca 100644
--- a/src/test/run-pass/tool_lints_2018_preview.rs
+++ b/src/test/ui/run-pass/tool_lints_2018_preview.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(tool_lints)]
 #![feature(rust_2018_preview)]
 #![deny(unknown_lints)]
diff --git a/src/test/run-pass/trailing-comma.rs b/src/test/ui/run-pass/trailing-comma.rs
similarity index 98%
rename from src/test/run-pass/trailing-comma.rs
rename to src/test/ui/run-pass/trailing-comma.rs
index 02bae5aa45515..112517e777142 100644
--- a/src/test/run-pass/trailing-comma.rs
+++ b/src/test/ui/run-pass/trailing-comma.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![feature(slice_patterns)]
diff --git a/src/test/run-pass/multidispatch-conditional-impl-not-considered.rs b/src/test/ui/run-pass/traits/multidispatch-conditional-impl-not-considered.rs
similarity index 98%
rename from src/test/run-pass/multidispatch-conditional-impl-not-considered.rs
rename to src/test/ui/run-pass/traits/multidispatch-conditional-impl-not-considered.rs
index 49ecef9c7359a..63191482a11ac 100644
--- a/src/test/run-pass/multidispatch-conditional-impl-not-considered.rs
+++ b/src/test/ui/run-pass/traits/multidispatch-conditional-impl-not-considered.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that we correctly ignore the blanket impl
 // because (in this case) `T` does not impl `Clone`.
 //
diff --git a/src/test/run-pass/multidispatch1.rs b/src/test/ui/run-pass/traits/multidispatch1.rs
similarity index 98%
rename from src/test/run-pass/multidispatch1.rs
rename to src/test/ui/run-pass/traits/multidispatch1.rs
index 7137a4109b151..c3e327fcd25d8 100644
--- a/src/test/run-pass/multidispatch1.rs
+++ b/src/test/ui/run-pass/traits/multidispatch1.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 use std::fmt::Debug;
 
diff --git a/src/test/run-pass/multidispatch2.rs b/src/test/ui/run-pass/traits/multidispatch2.rs
similarity index 98%
rename from src/test/run-pass/multidispatch2.rs
rename to src/test/ui/run-pass/traits/multidispatch2.rs
index 1573c0234a6e4..89ff3832163c2 100644
--- a/src/test/run-pass/multidispatch2.rs
+++ b/src/test/ui/run-pass/traits/multidispatch2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 use std::fmt::Debug;
 use std::default::Default;
diff --git a/src/test/run-pass/transmute-non-immediate-to-immediate.rs b/src/test/ui/run-pass/transmute-non-immediate-to-immediate.rs
similarity index 98%
rename from src/test/run-pass/transmute-non-immediate-to-immediate.rs
rename to src/test/ui/run-pass/transmute-non-immediate-to-immediate.rs
index bd705a909b0ec..02d2dcdfe0134 100644
--- a/src/test/run-pass/transmute-non-immediate-to-immediate.rs
+++ b/src/test/ui/run-pass/transmute-non-immediate-to-immediate.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Issue #7988
 // Transmuting non-immediate type to immediate type
 
diff --git a/src/test/run-pass/transmute-specialization.rs b/src/test/ui/run-pass/transmute-specialization.rs
similarity index 98%
rename from src/test/run-pass/transmute-specialization.rs
rename to src/test/ui/run-pass/transmute-specialization.rs
index 823def3227044..ecd90912e0683 100644
--- a/src/test/run-pass/transmute-specialization.rs
+++ b/src/test/ui/run-pass/transmute-specialization.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(specialization)]
 
 trait Specializable { type Output; }
diff --git a/src/test/run-pass/trivial-message.rs b/src/test/ui/run-pass/trivial-message.rs
similarity index 98%
rename from src/test/run-pass/trivial-message.rs
rename to src/test/ui/run-pass/trivial-message.rs
index fd60c61463818..bd7adafaafaeb 100644
--- a/src/test/run-pass/trivial-message.rs
+++ b/src/test/ui/run-pass/trivial-message.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 /*
   This is about the simplest program that can successfully send a
   message.
diff --git a/src/test/run-pass/trivial_casts.rs b/src/test/ui/run-pass/trivial_casts.rs
similarity index 99%
rename from src/test/run-pass/trivial_casts.rs
rename to src/test/ui/run-pass/trivial_casts.rs
index 3da1ba0f0451f..f9fb22bf2fe05 100644
--- a/src/test/run-pass/trivial_casts.rs
+++ b/src/test/ui/run-pass/trivial_casts.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that all coercions can actually be done using casts (modulo the lints).
 
 #![allow(trivial_casts, trivial_numeric_casts)]
diff --git a/src/test/run-pass/try-block.rs b/src/test/ui/run-pass/try-block.rs
similarity index 97%
rename from src/test/run-pass/try-block.rs
rename to src/test/ui/run-pass/try-block.rs
index a7e7cc2062095..8489a52d431b1 100644
--- a/src/test/run-pass/try-block.rs
+++ b/src/test/ui/run-pass/try-block.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 // compile-flags: --edition 2018
 
 #![feature(try_blocks)]
diff --git a/src/test/run-pass/try-from-int-error-partial-eq.rs b/src/test/ui/run-pass/try-from-int-error-partial-eq.rs
similarity index 98%
rename from src/test/run-pass/try-from-int-error-partial-eq.rs
rename to src/test/ui/run-pass/try-from-int-error-partial-eq.rs
index 1122f5a75592c..0699dfc00d2b7 100644
--- a/src/test/run-pass/try-from-int-error-partial-eq.rs
+++ b/src/test/ui/run-pass/try-from-int-error-partial-eq.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(try_from)]
 #![allow(unused_must_use)]
 
diff --git a/src/test/run-pass/try-is-identifier-edition2015.rs b/src/test/ui/run-pass/try-is-identifier-edition2015.rs
similarity index 93%
rename from src/test/run-pass/try-is-identifier-edition2015.rs
rename to src/test/ui/run-pass/try-is-identifier-edition2015.rs
index aafb52e4c491f..105fd32cff9a8 100644
--- a/src/test/run-pass/try-is-identifier-edition2015.rs
+++ b/src/test/ui/run-pass/try-is-identifier-edition2015.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 // compile-flags: --edition 2015
 
 fn main() {
diff --git a/src/test/run-pass/try-operator-custom.rs b/src/test/ui/run-pass/try-operator-custom.rs
similarity index 99%
rename from src/test/run-pass/try-operator-custom.rs
rename to src/test/ui/run-pass/try-operator-custom.rs
index 82ba70c945944..3adc6242858b0 100644
--- a/src/test/run-pass/try-operator-custom.rs
+++ b/src/test/ui/run-pass/try-operator-custom.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(try_trait)]
 
 use std::ops::Try;
diff --git a/src/test/run-pass/try-operator-hygiene.rs b/src/test/ui/run-pass/try-operator-hygiene.rs
similarity index 95%
rename from src/test/run-pass/try-operator-hygiene.rs
rename to src/test/ui/run-pass/try-operator-hygiene.rs
index 53d6185020a02..712fd2246f49f 100644
--- a/src/test/run-pass/try-operator-hygiene.rs
+++ b/src/test/ui/run-pass/try-operator-hygiene.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_upper_case_globals)]
+
 // `expr?` expands to:
 //
 // match expr {
diff --git a/src/test/run-pass/try-operator.rs b/src/test/ui/run-pass/try-operator.rs
similarity index 99%
rename from src/test/run-pass/try-operator.rs
rename to src/test/ui/run-pass/try-operator.rs
index d615c5f1034dc..a5579c7cfef5d 100644
--- a/src/test/run-pass/try-operator.rs
+++ b/src/test/ui/run-pass/try-operator.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-cloudabi no std::fs
 
 use std::fs::File;
diff --git a/src/test/run-pass/try-wait.rs b/src/test/ui/run-pass/try-wait.rs
similarity index 98%
rename from src/test/run-pass/try-wait.rs
rename to src/test/ui/run-pass/try-wait.rs
index b8c0d80c5a67c..29e4382a6e4c4 100644
--- a/src/test/run-pass/try-wait.rs
+++ b/src/test/ui/run-pass/try-wait.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 
diff --git a/src/test/run-pass/tup.rs b/src/test/ui/run-pass/tup.rs
similarity index 94%
rename from src/test/run-pass/tup.rs
rename to src/test/ui/run-pass/tup.rs
index 86ca37deb02d1..4ebb581d233bf 100644
--- a/src/test/run-pass/tup.rs
+++ b/src/test/ui/run-pass/tup.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 
 type point = (isize, isize);
 
diff --git a/src/test/run-pass/tuple-index-fat-types.rs b/src/test/ui/run-pass/tuple-index-fat-types.rs
similarity index 98%
rename from src/test/run-pass/tuple-index-fat-types.rs
rename to src/test/ui/run-pass/tuple-index-fat-types.rs
index e4ea073bfc28a..4876ecd533df0 100644
--- a/src/test/run-pass/tuple-index-fat-types.rs
+++ b/src/test/ui/run-pass/tuple-index-fat-types.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 struct Foo<'a>(&'a [isize]);
 
diff --git a/src/test/run-pass/tuple-index.rs b/src/test/ui/run-pass/tuple-index.rs
similarity index 98%
rename from src/test/run-pass/tuple-index.rs
rename to src/test/ui/run-pass/tuple-index.rs
index 26d918f236750..722ae5ff26abf 100644
--- a/src/test/run-pass/tuple-index.rs
+++ b/src/test/ui/run-pass/tuple-index.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 struct Point(isize, isize);
 
diff --git a/src/test/run-pass/tydesc-name.rs b/src/test/ui/run-pass/tydesc-name.rs
similarity index 98%
rename from src/test/run-pass/tydesc-name.rs
rename to src/test/ui/run-pass/tydesc-name.rs
index 4a169c0a384aa..a53de0ae95f7a 100644
--- a/src/test/run-pass/tydesc-name.rs
+++ b/src/test/ui/run-pass/tydesc-name.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 #![feature(core_intrinsics)]
 
diff --git a/src/test/run-pass/type-ascription.rs b/src/test/ui/run-pass/type-ascription.rs
similarity index 98%
rename from src/test/run-pass/type-ascription.rs
rename to src/test/ui/run-pass/type-ascription.rs
index 18fb8e2e408f1..95bb85affd26e 100644
--- a/src/test/run-pass/type-ascription.rs
+++ b/src/test/ui/run-pass/type-ascription.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Type ascription doesn't lead to unsoundness
 
 #![feature(type_ascription)]
diff --git a/src/test/run-pass/type-id-higher-rank-2.rs b/src/test/ui/run-pass/type-id-higher-rank-2.rs
similarity index 98%
rename from src/test/run-pass/type-id-higher-rank-2.rs
rename to src/test/ui/run-pass/type-id-higher-rank-2.rs
index aead8bc264d7e..3f81021fb9cb8 100644
--- a/src/test/run-pass/type-id-higher-rank-2.rs
+++ b/src/test/ui/run-pass/type-id-higher-rank-2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that we can't ignore lifetimes by going through Any.
 
 use std::any::Any;
diff --git a/src/test/run-pass/type-id-higher-rank.rs b/src/test/ui/run-pass/type-id-higher-rank.rs
similarity index 99%
rename from src/test/run-pass/type-id-higher-rank.rs
rename to src/test/ui/run-pass/type-id-higher-rank.rs
index 2a6708dc99904..2a4a02ff8df78 100644
--- a/src/test/run-pass/type-id-higher-rank.rs
+++ b/src/test/ui/run-pass/type-id-higher-rank.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that type IDs correctly account for higher-rank lifetimes
 // Also acts as a regression test for an ICE (issue #19791)
 
diff --git a/src/test/run-pass/type-in-nested-module.rs b/src/test/ui/run-pass/type-in-nested-module.rs
similarity index 93%
rename from src/test/run-pass/type-in-nested-module.rs
rename to src/test/ui/run-pass/type-in-nested-module.rs
index 7e2360caa93ff..60396146595e0 100644
--- a/src/test/run-pass/type-in-nested-module.rs
+++ b/src/test/ui/run-pass/type-in-nested-module.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/type-infer-generalize-ty-var.rs b/src/test/ui/run-pass/type-infer-generalize-ty-var.rs
similarity index 96%
rename from src/test/run-pass/type-infer-generalize-ty-var.rs
rename to src/test/ui/run-pass/type-infer-generalize-ty-var.rs
index d7fb85ca4842e..04379c1eea163 100644
--- a/src/test/run-pass/type-infer-generalize-ty-var.rs
+++ b/src/test/ui/run-pass/type-infer-generalize-ty-var.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_upper_case_globals)]
+
 // Test a scenario where we generate a constraint like `?1 <: &?2`.
 // In such a case, it is important that we instantiate `?1` with `&?3`
 // where `?3 <: ?2`, and not with `&?2`. This is a regression test for
diff --git a/src/test/run-pass/type-namespace.rs b/src/test/ui/run-pass/type-namespace.rs
similarity index 97%
rename from src/test/run-pass/type-namespace.rs
rename to src/test/ui/run-pass/type-namespace.rs
index 7172e9b85e3c8..ac19b330e7add 100644
--- a/src/test/run-pass/type-namespace.rs
+++ b/src/test/ui/run-pass/type-namespace.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 struct A { a: isize }
 
diff --git a/src/test/run-pass/type-param-constraints.rs b/src/test/ui/run-pass/type-param-constraints.rs
similarity index 95%
rename from src/test/run-pass/type-param-constraints.rs
rename to src/test/ui/run-pass/type-param-constraints.rs
index 1a3bdcca7a1e5..28e60e0b8a6f2 100644
--- a/src/test/run-pass/type-param-constraints.rs
+++ b/src/test/ui/run-pass/type-param-constraints.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/type-param.rs b/src/test/ui/run-pass/type-param.rs
similarity index 92%
rename from src/test/run-pass/type-param.rs
rename to src/test/ui/run-pass/type-param.rs
index c59e40934fb4b..4768c676eea6d 100644
--- a/src/test/run-pass/type-param.rs
+++ b/src/test/ui/run-pass/type-param.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/type-params-in-for-each.rs b/src/test/ui/run-pass/type-params-in-for-each.rs
similarity index 98%
rename from src/test/run-pass/type-params-in-for-each.rs
rename to src/test/ui/run-pass/type-params-in-for-each.rs
index fea2bd978eb96..b5800f170935c 100644
--- a/src/test/run-pass/type-params-in-for-each.rs
+++ b/src/test/ui/run-pass/type-params-in-for-each.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/type-ptr.rs b/src/test/ui/run-pass/type-ptr.rs
similarity index 98%
rename from src/test/run-pass/type-ptr.rs
rename to src/test/ui/run-pass/type-ptr.rs
index 67ead80c89b25..753baa4cfa73f 100644
--- a/src/test/run-pass/type-ptr.rs
+++ b/src/test/ui/run-pass/type-ptr.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 fn f(a: *const isize) -> *const isize { return a; }
diff --git a/src/test/run-pass/type-sizes.rs b/src/test/ui/run-pass/type-sizes.rs
similarity index 98%
rename from src/test/run-pass/type-sizes.rs
rename to src/test/ui/run-pass/type-sizes.rs
index 5eb079988f5be..55d100633d88f 100644
--- a/src/test/run-pass/type-sizes.rs
+++ b/src/test/ui/run-pass/type-sizes.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 #![feature(never_type)]
 
 use std::mem::size_of;
diff --git a/src/test/run-pass/type-use-i1-versus-i8.rs b/src/test/ui/run-pass/type-use-i1-versus-i8.rs
similarity index 98%
rename from src/test/run-pass/type-use-i1-versus-i8.rs
rename to src/test/ui/run-pass/type-use-i1-versus-i8.rs
index 6cef9c3be172d..9fa5d25eb45b5 100644
--- a/src/test/run-pass/type-use-i1-versus-i8.rs
+++ b/src/test/ui/run-pass/type-use-i1-versus-i8.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 use std::ptr;
diff --git a/src/test/run-pass/typeck-fn-to-unsafe-fn-ptr.rs b/src/test/ui/run-pass/typeck-fn-to-unsafe-fn-ptr.rs
similarity index 98%
rename from src/test/run-pass/typeck-fn-to-unsafe-fn-ptr.rs
rename to src/test/ui/run-pass/typeck-fn-to-unsafe-fn-ptr.rs
index 323705f3f955f..e339a75e2a633 100644
--- a/src/test/run-pass/typeck-fn-to-unsafe-fn-ptr.rs
+++ b/src/test/ui/run-pass/typeck-fn-to-unsafe-fn-ptr.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // This tests reification from safe function to `unsafe fn` pointer
 
 fn do_nothing() -> () {}
diff --git a/src/test/run-pass/typeck_type_placeholder_1.rs b/src/test/ui/run-pass/typeck_type_placeholder_1.rs
similarity index 98%
rename from src/test/run-pass/typeck_type_placeholder_1.rs
rename to src/test/ui/run-pass/typeck_type_placeholder_1.rs
index 113d52ffb35b9..a4a5cd5ee1317 100644
--- a/src/test/run-pass/typeck_type_placeholder_1.rs
+++ b/src/test/ui/run-pass/typeck_type_placeholder_1.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // This test checks that the `_` type placeholder works
 // correctly for enabling type inference.
 
diff --git a/src/test/run-pass/typeclasses-eq-example-static.rs b/src/test/ui/run-pass/typeclasses-eq-example-static.rs
similarity index 96%
rename from src/test/run-pass/typeclasses-eq-example-static.rs
rename to src/test/ui/run-pass/typeclasses-eq-example-static.rs
index d386f27d8c23b..dd4ec7aa66b7c 100644
--- a/src/test/run-pass/typeclasses-eq-example-static.rs
+++ b/src/test/ui/run-pass/typeclasses-eq-example-static.rs
@@ -8,6 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+#![allow(non_snake_case)]
+
 #![feature(box_syntax)]
 
 // Example from lkuper's intern talk, August 2012 -- now with static
diff --git a/src/test/run-pass/typeclasses-eq-example.rs b/src/test/ui/run-pass/typeclasses-eq-example.rs
similarity index 96%
rename from src/test/run-pass/typeclasses-eq-example.rs
rename to src/test/ui/run-pass/typeclasses-eq-example.rs
index 8e8fd9bf64843..c30e7a6629651 100644
--- a/src/test/run-pass/typeclasses-eq-example.rs
+++ b/src/test/ui/run-pass/typeclasses-eq-example.rs
@@ -8,6 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+#![allow(non_snake_case)]
+
 #![feature(box_syntax)]
 
 // Example from lkuper's intern talk, August 2012.
diff --git a/src/test/run-pass/typestate-cfg-nesting.rs b/src/test/ui/run-pass/typestate-cfg-nesting.rs
similarity index 95%
rename from src/test/run-pass/typestate-cfg-nesting.rs
rename to src/test/ui/run-pass/typestate-cfg-nesting.rs
index 2acaff262690b..8fc186facc353 100644
--- a/src/test/run-pass/typestate-cfg-nesting.rs
+++ b/src/test/ui/run-pass/typestate-cfg-nesting.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(unknown_lints)]
+
 // pretty-expanded FIXME #23616
 
 #![allow(dead_assignment)]
diff --git a/src/test/run-pass/typestate-multi-decl.rs b/src/test/ui/run-pass/typestate-multi-decl.rs
similarity index 97%
rename from src/test/run-pass/typestate-multi-decl.rs
rename to src/test/ui/run-pass/typestate-multi-decl.rs
index a47883463e8a0..8cb06f58284bd 100644
--- a/src/test/run-pass/typestate-multi-decl.rs
+++ b/src/test/ui/run-pass/typestate-multi-decl.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 pub fn main() {
     let (x, y) = (10, 20);
diff --git a/src/test/run-pass/ufcs-polymorphic-paths.rs b/src/test/ui/run-pass/ufcs-polymorphic-paths.rs
similarity index 99%
rename from src/test/run-pass/ufcs-polymorphic-paths.rs
rename to src/test/ui/run-pass/ufcs-polymorphic-paths.rs
index 491045564ce22..abe899ed63faa 100644
--- a/src/test/run-pass/ufcs-polymorphic-paths.rs
+++ b/src/test/ui/run-pass/ufcs-polymorphic-paths.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::borrow::{Cow, ToOwned};
 use std::default::Default;
 use std::iter::FromIterator;
diff --git a/src/test/run-pass/ufcs-type-params.rs b/src/test/ui/run-pass/ufcs-type-params.rs
similarity index 98%
rename from src/test/run-pass/ufcs-type-params.rs
rename to src/test/ui/run-pass/ufcs-type-params.rs
index d72fde1a3332f..8ac16ce54d347 100644
--- a/src/test/run-pass/ufcs-type-params.rs
+++ b/src/test/ui/run-pass/ufcs-type-params.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 trait Foo<T> {
diff --git a/src/test/run-pass/underscore-lifetimes.rs b/src/test/ui/run-pass/underscore-lifetimes.rs
similarity index 98%
rename from src/test/run-pass/underscore-lifetimes.rs
rename to src/test/ui/run-pass/underscore-lifetimes.rs
index 4dd1a565c9f14..98aa9d623a797 100644
--- a/src/test/run-pass/underscore-lifetimes.rs
+++ b/src/test/ui/run-pass/underscore-lifetimes.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 struct Foo<'a>(&'a u8);
 
 fn foo(x: &u8) -> Foo<'_> {
diff --git a/src/test/run-pass/underscore-method-after-integer.rs b/src/test/ui/run-pass/underscore-method-after-integer.rs
similarity index 97%
rename from src/test/run-pass/underscore-method-after-integer.rs
rename to src/test/ui/run-pass/underscore-method-after-integer.rs
index af91256421101..4c6d5a0bd2598 100644
--- a/src/test/run-pass/underscore-method-after-integer.rs
+++ b/src/test/ui/run-pass/underscore-method-after-integer.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 trait Tr : Sized {
     fn _method_on_numbers(self) {}
 }
diff --git a/src/test/run-pass/uniform-paths/auxiliary/issue-53691.rs b/src/test/ui/run-pass/uniform-paths/auxiliary/issue-53691.rs
similarity index 100%
rename from src/test/run-pass/uniform-paths/auxiliary/issue-53691.rs
rename to src/test/ui/run-pass/uniform-paths/auxiliary/issue-53691.rs
diff --git a/src/test/run-pass/uniform-paths/issue-53691.rs b/src/test/ui/run-pass/uniform-paths/issue-53691.rs
similarity index 97%
rename from src/test/run-pass/uniform-paths/issue-53691.rs
rename to src/test/ui/run-pass/uniform-paths/issue-53691.rs
index 62be31d6b85fe..0105d80a2689e 100644
--- a/src/test/run-pass/uniform-paths/issue-53691.rs
+++ b/src/test/ui/run-pass/uniform-paths/issue-53691.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // aux-build:issue-53691.rs
 
 extern crate issue_53691;
diff --git a/src/test/run-pass/unify-return-ty.rs b/src/test/ui/run-pass/unify-return-ty.rs
similarity index 98%
rename from src/test/run-pass/unify-return-ty.rs
rename to src/test/ui/run-pass/unify-return-ty.rs
index 01b55ebb8e26e..fc62a485261d7 100644
--- a/src/test/run-pass/unify-return-ty.rs
+++ b/src/test/ui/run-pass/unify-return-ty.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Tests that the tail expr in null() has its type
 // unified with the type *T, and so the type variable
 // in that type gets resolved.
diff --git a/src/test/run-pass/uninit-empty-types.rs b/src/test/ui/run-pass/uninit-empty-types.rs
similarity index 98%
rename from src/test/run-pass/uninit-empty-types.rs
rename to src/test/ui/run-pass/uninit-empty-types.rs
index 8c69704b3bd19..bfa551a585fa7 100644
--- a/src/test/run-pass/uninit-empty-types.rs
+++ b/src/test/ui/run-pass/uninit-empty-types.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test the uninit() construct returning various empty types.
 
 // pretty-expanded FIXME #23616
diff --git a/src/test/run-pass/unit.rs b/src/test/ui/run-pass/unit.rs
similarity index 94%
rename from src/test/run-pass/unit.rs
rename to src/test/ui/run-pass/unit.rs
index 67eceba020c80..8d75a45170f5e 100644
--- a/src/test/run-pass/unit.rs
+++ b/src/test/ui/run-pass/unit.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(unknown_lints)]
+
 // pretty-expanded FIXME #23616
 
 #![allow(unused_variables)]
diff --git a/src/test/run-pass/unnamed_argument_mode.rs b/src/test/ui/run-pass/unnamed_argument_mode.rs
similarity index 98%
rename from src/test/run-pass/unnamed_argument_mode.rs
rename to src/test/ui/run-pass/unnamed_argument_mode.rs
index d498a70be491e..d2336c7af12f5 100644
--- a/src/test/run-pass/unnamed_argument_mode.rs
+++ b/src/test/ui/run-pass/unnamed_argument_mode.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 fn good(_a: &isize) {
diff --git a/src/test/run-pass/unreachable-code-1.rs b/src/test/ui/run-pass/unreachable-code-1.rs
similarity index 98%
rename from src/test/run-pass/unreachable-code-1.rs
rename to src/test/ui/run-pass/unreachable-code-1.rs
index 6448056fb11f4..7c49baf436f29 100644
--- a/src/test/run-pass/unreachable-code-1.rs
+++ b/src/test/ui/run-pass/unreachable-code-1.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 #![allow(unused_variables)]
 #![allow(dead_code)]
diff --git a/src/test/run-pass/unreachable-code.rs b/src/test/ui/run-pass/unreachable-code.rs
similarity index 98%
rename from src/test/run-pass/unreachable-code.rs
rename to src/test/ui/run-pass/unreachable-code.rs
index 5cb5e8c4f99cd..59ff0e2730be7 100644
--- a/src/test/run-pass/unreachable-code.rs
+++ b/src/test/ui/run-pass/unreachable-code.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 #![allow(path_statements)]
 #![allow(unreachable_code)]
diff --git a/src/test/run-pass/unsafe-coercion.rs b/src/test/ui/run-pass/unsafe-coercion.rs
similarity index 98%
rename from src/test/run-pass/unsafe-coercion.rs
rename to src/test/ui/run-pass/unsafe-coercion.rs
index 8661ebb414ce5..cfbe02fd2f84c 100644
--- a/src/test/run-pass/unsafe-coercion.rs
+++ b/src/test/ui/run-pass/unsafe-coercion.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Check that safe fns are not a subtype of unsafe fns.
 
 
diff --git a/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs b/src/test/ui/run-pass/unsafe-fn-called-from-unsafe-blk.rs
similarity index 98%
rename from src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs
rename to src/test/ui/run-pass/unsafe-fn-called-from-unsafe-blk.rs
index f3a2ad749a168..0690fab611b95 100644
--- a/src/test/run-pass/unsafe-fn-called-from-unsafe-blk.rs
+++ b/src/test/ui/run-pass/unsafe-fn-called-from-unsafe-blk.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 //
 // See also: compile-fail/unsafe-fn-called-from-safe.rs
 
diff --git a/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs b/src/test/ui/run-pass/unsafe-fn-called-from-unsafe-fn.rs
similarity index 98%
rename from src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs
rename to src/test/ui/run-pass/unsafe-fn-called-from-unsafe-fn.rs
index 37c72ba8ab065..1e77b1fd175fb 100644
--- a/src/test/run-pass/unsafe-fn-called-from-unsafe-fn.rs
+++ b/src/test/ui/run-pass/unsafe-fn-called-from-unsafe-fn.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 //
 // See also: compile-fail/unsafe-fn-called-from-safe.rs
 
diff --git a/src/test/run-pass/unsafe-pointer-assignability.rs b/src/test/ui/run-pass/unsafe-pointer-assignability.rs
similarity index 97%
rename from src/test/run-pass/unsafe-pointer-assignability.rs
rename to src/test/ui/run-pass/unsafe-pointer-assignability.rs
index c8ee0f83b9b0c..299aa5f7f9f4f 100644
--- a/src/test/run-pass/unsafe-pointer-assignability.rs
+++ b/src/test/ui/run-pass/unsafe-pointer-assignability.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 fn f(x: *const isize) {
     unsafe {
diff --git a/src/test/run-pass/unsized-tuple-impls.rs b/src/test/ui/run-pass/unsized-tuple-impls.rs
similarity index 98%
rename from src/test/run-pass/unsized-tuple-impls.rs
rename to src/test/ui/run-pass/unsized-tuple-impls.rs
index 591b19f89e897..b166b36cbe942 100644
--- a/src/test/run-pass/unsized-tuple-impls.rs
+++ b/src/test/ui/run-pass/unsized-tuple-impls.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 #![feature(unsized_tuple_coercion)]
 
 use std::collections::HashSet;
diff --git a/src/test/run-pass/unsized.rs b/src/test/ui/run-pass/unsized.rs
similarity index 95%
rename from src/test/run-pass/unsized.rs
rename to src/test/ui/run-pass/unsized.rs
index 26f7b767988d2..5cb7309b6524f 100644
--- a/src/test/run-pass/unsized.rs
+++ b/src/test/ui/run-pass/unsized.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(type_alias_bounds)]
+
 // Test syntax checks for `?Sized` syntax.
 
 use std::marker::PhantomData;
diff --git a/src/test/run-pass/unsized2.rs b/src/test/ui/run-pass/unsized2.rs
similarity index 97%
rename from src/test/run-pass/unsized2.rs
rename to src/test/ui/run-pass/unsized2.rs
index 90b99f98533de..d83c547304109 100644
--- a/src/test/run-pass/unsized2.rs
+++ b/src/test/ui/run-pass/unsized2.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(unconditional_recursion)]
+
 #![feature(box_syntax)]
 
 // Test sized-ness checking in substitution.
diff --git a/src/test/run-pass/unsized3.rs b/src/test/ui/run-pass/unsized3.rs
similarity index 99%
rename from src/test/run-pass/unsized3.rs
rename to src/test/ui/run-pass/unsized3.rs
index 6d378cb294e32..426b42fa727f5 100644
--- a/src/test/run-pass/unsized3.rs
+++ b/src/test/ui/run-pass/unsized3.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test structs with always-unsized fields.
 
 
diff --git a/src/test/run-pass/unused-move-capture.rs b/src/test/ui/run-pass/unused-move-capture.rs
similarity index 97%
rename from src/test/run-pass/unused-move-capture.rs
rename to src/test/ui/run-pass/unused-move-capture.rs
index e5a77d1cdbd9d..16f5101fb269d 100644
--- a/src/test/run-pass/unused-move-capture.rs
+++ b/src/test/ui/run-pass/unused-move-capture.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // pretty-expanded FIXME #23616
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/unused-move.rs b/src/test/ui/run-pass/unused-move.rs
similarity index 98%
rename from src/test/run-pass/unused-move.rs
rename to src/test/ui/run-pass/unused-move.rs
index 9a0ea181d996d..3c95205e89551 100644
--- a/src/test/run-pass/unused-move.rs
+++ b/src/test/ui/run-pass/unused-move.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Issue #3878
 // Issue Name: Unused move causes a crash
 // Abstract: zero-fill to block after drop
diff --git a/src/test/run-pass/unwind-resource.rs b/src/test/ui/run-pass/unwind-resource.rs
similarity index 96%
rename from src/test/run-pass/unwind-resource.rs
rename to src/test/ui/run-pass/unwind-resource.rs
index 85ee21e090255..9271c63d1cc16 100644
--- a/src/test/run-pass/unwind-resource.rs
+++ b/src/test/ui/run-pass/unwind-resource.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 // ignore-emscripten no threads support
 
 use std::sync::mpsc::{channel, Sender};
diff --git a/src/test/run-pass/unwind-unique.rs b/src/test/ui/run-pass/unwind-unique.rs
similarity index 98%
rename from src/test/run-pass/unwind-unique.rs
rename to src/test/ui/run-pass/unwind-unique.rs
index 321e819881703..6d1192263e2ed 100644
--- a/src/test/run-pass/unwind-unique.rs
+++ b/src/test/ui/run-pass/unwind-unique.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-emscripten no threads support
 
 #![feature(box_syntax)]
diff --git a/src/test/run-pass/using-target-feature-unstable.rs b/src/test/ui/run-pass/using-target-feature-unstable.rs
similarity index 98%
rename from src/test/run-pass/using-target-feature-unstable.rs
rename to src/test/ui/run-pass/using-target-feature-unstable.rs
index 614c8d4e1d477..9591757d29aa9 100644
--- a/src/test/run-pass/using-target-feature-unstable.rs
+++ b/src/test/ui/run-pass/using-target-feature-unstable.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // only-x86_64
 // aux-build:using-target-feature-unstable.rs
 
diff --git a/src/test/run-pass/utf8-bom.rs b/src/test/ui/run-pass/utf8-bom.rs
similarity index 97%
rename from src/test/run-pass/utf8-bom.rs
rename to src/test/ui/run-pass/utf8-bom.rs
index c3052a928d6d6..2ae5b4bd0ebbe 100644
--- a/src/test/run-pass/utf8-bom.rs
+++ b/src/test/ui/run-pass/utf8-bom.rs
@@ -7,6 +7,8 @@
 // <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.
+
+// run-pass
 //
 
 // This file has utf-8 BOM, it should be compiled normally without error.
diff --git a/src/test/run-pass/utf8.rs b/src/test/ui/run-pass/utf8.rs
similarity index 99%
rename from src/test/run-pass/utf8.rs
rename to src/test/ui/run-pass/utf8.rs
index ec1c6970ea0c9..ca9097df76beb 100644
--- a/src/test/run-pass/utf8.rs
+++ b/src/test/ui/run-pass/utf8.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 pub fn main() {
     let yen: char = '¥'; // 0xa5
     let c_cedilla: char = 'ç'; // 0xe7
diff --git a/src/test/run-pass/utf8_chars.rs b/src/test/ui/run-pass/utf8_chars.rs
similarity index 99%
rename from src/test/run-pass/utf8_chars.rs
rename to src/test/ui/run-pass/utf8_chars.rs
index b2550e77a8a37..f4d7bc538d882 100644
--- a/src/test/run-pass/utf8_chars.rs
+++ b/src/test/ui/run-pass/utf8_chars.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::str;
 
 pub fn main() {
diff --git a/src/test/run-pass/utf8_idents.rs b/src/test/ui/run-pass/utf8_idents.rs
similarity index 97%
rename from src/test/run-pass/utf8_idents.rs
rename to src/test/ui/run-pass/utf8_idents.rs
index 579070a295adf..94669bebaaf1e 100644
--- a/src/test/run-pass/utf8_idents.rs
+++ b/src/test/ui/run-pass/utf8_idents.rs
@@ -7,6 +7,9 @@
 // <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.
+
+// run-pass
+#![allow(non_snake_case)]
 //
 
 #![feature(non_ascii_idents)]
diff --git a/src/test/run-pass/variant-attributes.rs b/src/test/ui/run-pass/variant-attributes.rs
similarity index 96%
rename from src/test/run-pass/variant-attributes.rs
rename to src/test/ui/run-pass/variant-attributes.rs
index 18987d1e016b1..efbc17eaab297 100644
--- a/src/test/run-pass/variant-attributes.rs
+++ b/src/test/ui/run-pass/variant-attributes.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 // pp-exact - Make sure we actually print the attributes
 // pretty-expanded FIXME #23616
 
diff --git a/src/test/run-pass/volatile-fat-ptr.rs b/src/test/ui/run-pass/volatile-fat-ptr.rs
similarity index 94%
rename from src/test/run-pass/volatile-fat-ptr.rs
rename to src/test/ui/run-pass/volatile-fat-ptr.rs
index 03ba5587fcec8..bfc62b0e63ce1 100644
--- a/src/test/run-pass/volatile-fat-ptr.rs
+++ b/src/test/ui/run-pass/volatile-fat-ptr.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(stable_features)]
+
 #![feature(volatile)]
 use std::ptr::{read_volatile, write_volatile};
 
diff --git a/src/test/run-pass/wait-forked-but-failed-child.rs b/src/test/ui/run-pass/wait-forked-but-failed-child.rs
similarity index 99%
rename from src/test/run-pass/wait-forked-but-failed-child.rs
rename to src/test/ui/run-pass/wait-forked-but-failed-child.rs
index dc47108e183df..e0e4930650e7b 100644
--- a/src/test/run-pass/wait-forked-but-failed-child.rs
+++ b/src/test/ui/run-pass/wait-forked-but-failed-child.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-cloudabi no processes
 // ignore-emscripten no processes
 
diff --git a/src/test/run-pass/weak-new-uninhabited-issue-48493.rs b/src/test/ui/run-pass/weak-new-uninhabited-issue-48493.rs
similarity index 97%
rename from src/test/run-pass/weak-new-uninhabited-issue-48493.rs
rename to src/test/ui/run-pass/weak-new-uninhabited-issue-48493.rs
index eb57c12ed12c6..92487b663d8d8 100644
--- a/src/test/run-pass/weak-new-uninhabited-issue-48493.rs
+++ b/src/test/ui/run-pass/weak-new-uninhabited-issue-48493.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 fn main() {
     enum Void {}
     std::rc::Weak::<Void>::new();
diff --git a/src/test/run-pass/weird-exit-code.rs b/src/test/ui/run-pass/weird-exit-code.rs
similarity index 99%
rename from src/test/run-pass/weird-exit-code.rs
rename to src/test/ui/run-pass/weird-exit-code.rs
index cdd6a9b5331de..3220230ab2d3a 100644
--- a/src/test/run-pass/weird-exit-code.rs
+++ b/src/test/ui/run-pass/weird-exit-code.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // On Windows the GetExitCodeProcess API is used to get the exit code of a
 // process, but it's easy to mistake a process exiting with the code 259 as
 // "still running" because this is the value of the STILL_ACTIVE constant. Make
diff --git a/src/test/run-pass/weird-exprs.rs b/src/test/ui/run-pass/weird-exprs.rs
similarity index 98%
rename from src/test/run-pass/weird-exprs.rs
rename to src/test/ui/run-pass/weird-exprs.rs
index 35120e428a7bd..f2459d9fff7cc 100644
--- a/src/test/run-pass/weird-exprs.rs
+++ b/src/test/ui/run-pass/weird-exprs.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 // compile-flags: -Z borrowck=compare
 
 #![recursion_limit = "128"]
diff --git a/src/test/run-pass/wf-bound-region-in-object-type.rs b/src/test/ui/run-pass/wf-bound-region-in-object-type.rs
similarity index 98%
rename from src/test/run-pass/wf-bound-region-in-object-type.rs
rename to src/test/ui/run-pass/wf-bound-region-in-object-type.rs
index cdb5e3fe1d4ae..ef9f4a772717a 100644
--- a/src/test/run-pass/wf-bound-region-in-object-type.rs
+++ b/src/test/ui/run-pass/wf-bound-region-in-object-type.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // Test that the `wf` checker properly handles bound regions in object
 // types. Compiling this code used to trigger an ICE.
 
diff --git a/src/test/run-pass/write-fmt-errors.rs b/src/test/ui/run-pass/write-fmt-errors.rs
similarity index 99%
rename from src/test/run-pass/write-fmt-errors.rs
rename to src/test/ui/run-pass/write-fmt-errors.rs
index e4439087946c1..7c2b36c2ea118 100644
--- a/src/test/run-pass/write-fmt-errors.rs
+++ b/src/test/ui/run-pass/write-fmt-errors.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::fmt;
 use std::io::{self, Error, Write, sink};
 
diff --git a/src/test/run-pass/writealias.rs b/src/test/ui/run-pass/writealias.rs
similarity index 98%
rename from src/test/run-pass/writealias.rs
rename to src/test/ui/run-pass/writealias.rs
index 7339fe47dc297..796e918ffc13f 100644
--- a/src/test/run-pass/writealias.rs
+++ b/src/test/ui/run-pass/writealias.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 
 use std::sync::Mutex;
 
diff --git a/src/test/run-pass/wrong-hashset-issue-42918.rs b/src/test/ui/run-pass/wrong-hashset-issue-42918.rs
similarity index 98%
rename from src/test/run-pass/wrong-hashset-issue-42918.rs
rename to src/test/ui/run-pass/wrong-hashset-issue-42918.rs
index 5a23adeceb5c0..f71f0bc72f4b2 100644
--- a/src/test/run-pass/wrong-hashset-issue-42918.rs
+++ b/src/test/ui/run-pass/wrong-hashset-issue-42918.rs
@@ -7,6 +7,8 @@
 // <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.
+
+// run-pass
 //
 // compile-flags: -O
 
diff --git a/src/test/run-pass/x86stdcall.rs b/src/test/ui/run-pass/x86stdcall.rs
similarity index 99%
rename from src/test/run-pass/x86stdcall.rs
rename to src/test/ui/run-pass/x86stdcall.rs
index 69ac68d2583e3..b4012d7d94934 100644
--- a/src/test/run-pass/x86stdcall.rs
+++ b/src/test/ui/run-pass/x86stdcall.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-wasm32-bare no libc to test ffi with
 
 // GetLastError doesn't seem to work with stack switching
diff --git a/src/test/run-pass/x86stdcall2.rs b/src/test/ui/run-pass/x86stdcall2.rs
similarity index 96%
rename from src/test/run-pass/x86stdcall2.rs
rename to src/test/ui/run-pass/x86stdcall2.rs
index bbdd65f7e5b2d..14133ab51578d 100644
--- a/src/test/run-pass/x86stdcall2.rs
+++ b/src/test/ui/run-pass/x86stdcall2.rs
@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+#![allow(non_camel_case_types)]
+
 pub type HANDLE = usize;
 pub type DWORD = u32;
 pub type SIZE_T = u32;
diff --git a/src/test/run-pass/yield.rs b/src/test/ui/run-pass/yield.rs
similarity index 98%
rename from src/test/run-pass/yield.rs
rename to src/test/ui/run-pass/yield.rs
index db884638622d1..658dff81a7237 100644
--- a/src/test/run-pass/yield.rs
+++ b/src/test/ui/run-pass/yield.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-emscripten no threads support
 
 use std::thread;
diff --git a/src/test/run-pass/yield1.rs b/src/test/ui/run-pass/yield1.rs
similarity index 98%
rename from src/test/run-pass/yield1.rs
rename to src/test/ui/run-pass/yield1.rs
index cab68794e1cc4..62b9dfadf262f 100644
--- a/src/test/run-pass/yield1.rs
+++ b/src/test/ui/run-pass/yield1.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // ignore-emscripten no threads support
 
 use std::thread;
diff --git a/src/test/run-pass/yield2.rs b/src/test/ui/run-pass/yield2.rs
similarity index 97%
rename from src/test/run-pass/yield2.rs
rename to src/test/ui/run-pass/yield2.rs
index acc55833133a3..b6ea16b87de97 100644
--- a/src/test/run-pass/yield2.rs
+++ b/src/test/ui/run-pass/yield2.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 use std::thread;
 
 pub fn main() {
diff --git a/src/test/run-pass/z-crate-attr.rs b/src/test/ui/run-pass/z-crate-attr.rs
similarity index 98%
rename from src/test/run-pass/z-crate-attr.rs
rename to src/test/ui/run-pass/z-crate-attr.rs
index 3df0985a2a38b..8ef662d0aa2df 100644
--- a/src/test/run-pass/z-crate-attr.rs
+++ b/src/test/ui/run-pass/z-crate-attr.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// run-pass
+
 // This test checks if an unstable feature is enabled with the -Zcrate-attr=feature(foo) flag. If
 // the exact feature used here is causing problems feel free to replace it with another
 // perma-unstable feature.