diff --git a/src/test/run-fail/bounds-check-no-overflow.rs b/src/test/ui/array-slice-vec/bounds-check-no-overflow.rs
similarity index 93%
rename from src/test/run-fail/bounds-check-no-overflow.rs
rename to src/test/ui/array-slice-vec/bounds-check-no-overflow.rs
index 3943f87f7fe0c..70cbb0672544f 100644
--- a/src/test/run-fail/bounds-check-no-overflow.rs
+++ b/src/test/ui/array-slice-vec/bounds-check-no-overflow.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:index out of bounds
 
 use std::usize;
diff --git a/src/test/run-fail/bug-2470-bounds-check-overflow.rs b/src/test/ui/array-slice-vec/bug-2470-bounds-check-overflow.rs
similarity index 98%
rename from src/test/run-fail/bug-2470-bounds-check-overflow.rs
rename to src/test/ui/array-slice-vec/bug-2470-bounds-check-overflow.rs
index b4e3f24699118..86558c228c5ba 100644
--- a/src/test/run-fail/bug-2470-bounds-check-overflow.rs
+++ b/src/test/ui/array-slice-vec/bug-2470-bounds-check-overflow.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:index out of bounds
 
 use std::mem;
diff --git a/src/test/run-fail/vec-overrun.rs b/src/test/ui/array-slice-vec/vec-overrun.rs
similarity index 94%
rename from src/test/run-fail/vec-overrun.rs
rename to src/test/ui/array-slice-vec/vec-overrun.rs
index 2be945f736cb7..53f017c0dd224 100644
--- a/src/test/run-fail/vec-overrun.rs
+++ b/src/test/ui/array-slice-vec/vec-overrun.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:index out of bounds: the len is 1 but the index is 2
 
 
diff --git a/src/test/run-fail/binop-fail-3.rs b/src/test/ui/binop/binop-fail-3.rs
similarity index 93%
rename from src/test/run-fail/binop-fail-3.rs
rename to src/test/ui/binop/binop-fail-3.rs
index a7696fffda0c2..d1be62deb0026 100644
--- a/src/test/run-fail/binop-fail-3.rs
+++ b/src/test/ui/binop/binop-fail-3.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:quux
 fn foo() -> ! {
     panic!("quux");
diff --git a/src/test/ui/binop/binop-fail-3.stderr b/src/test/ui/binop/binop-fail-3.stderr
new file mode 100644
index 0000000000000..cc5f9ea9189fb
--- /dev/null
+++ b/src/test/ui/binop/binop-fail-3.stderr
@@ -0,0 +1,8 @@
+warning: lint `resolve_trait_on_defaulted_unit` has been removed: `converted into hard error, see https://github.com/rust-lang/rust/issues/48950`
+  --> $DIR/binop-fail-3.rs:7:9
+   |
+LL | #[allow(resolve_trait_on_defaulted_unit)]
+   |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: `#[warn(renamed_and_removed_lints)]` on by default
+
diff --git a/src/test/run-fail/binop-panic.rs b/src/test/ui/binop/binop-panic.rs
similarity index 92%
rename from src/test/run-fail/binop-panic.rs
rename to src/test/ui/binop/binop-panic.rs
index dba5cecc67e11..86f63103fedfc 100644
--- a/src/test/run-fail/binop-panic.rs
+++ b/src/test/ui/binop/binop-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:quux
 fn my_err(s: String) -> ! {
     println!("{}", s);
diff --git a/src/test/run-fail/borrowck-local-borrow.rs b/src/test/ui/borrowck/borrowck-local-borrow.rs
similarity index 92%
rename from src/test/run-fail/borrowck-local-borrow.rs
rename to src/test/ui/borrowck/borrowck-local-borrow.rs
index d07f76b6252dc..c2b59ecce8674 100644
--- a/src/test/run-fail/borrowck-local-borrow.rs
+++ b/src/test/ui/borrowck/borrowck-local-borrow.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:panic 1
 
 // revisions: migrate mir
diff --git a/src/test/run-fail/bug-811.rs b/src/test/ui/bug-811.rs
similarity index 96%
rename from src/test/run-fail/bug-811.rs
rename to src/test/ui/bug-811.rs
index e36ec0f59010b..7736399d3858f 100644
--- a/src/test/run-fail/bug-811.rs
+++ b/src/test/ui/bug-811.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:quux
 
 use std::marker::PhantomData;
diff --git a/src/test/ui/bug-811.stderr b/src/test/ui/bug-811.stderr
new file mode 100644
index 0000000000000..2fb329e316b00
--- /dev/null
+++ b/src/test/ui/bug-811.stderr
@@ -0,0 +1,20 @@
+warning: type `task_id` should have an upper camel case name
+  --> $DIR/bug-811.rs:10:6
+   |
+LL | type task_id = isize;
+   |      ^^^^^^^ help: convert the identifier to upper camel case: `TaskId`
+   |
+   = note: `#[warn(non_camel_case_types)]` on by default
+
+warning: type `port_id` should have an upper camel case name
+  --> $DIR/bug-811.rs:11:6
+   |
+LL | type port_id = isize;
+   |      ^^^^^^^ help: convert the identifier to upper camel case: `PortId`
+
+warning: type `chan_t` should have an upper camel case name
+  --> $DIR/bug-811.rs:13:8
+   |
+LL | struct chan_t<T> {
+   |        ^^^^^^ help: convert the identifier to upper camel case: `ChanT`
+
diff --git a/src/test/run-fail/diverging-closure.rs b/src/test/ui/closures/diverging-closure.rs
similarity index 89%
rename from src/test/run-fail/diverging-closure.rs
rename to src/test/ui/closures/diverging-closure.rs
index a92e07a21fe4f..de7b68ef68495 100644
--- a/src/test/run-fail/diverging-closure.rs
+++ b/src/test/ui/closures/diverging-closure.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:oops
 
 fn main() {
diff --git a/src/test/run-fail/while-body-panics.rs b/src/test/ui/for-loop-while/while-body-panics.rs
similarity index 92%
rename from src/test/run-fail/while-body-panics.rs
rename to src/test/ui/for-loop-while/while-body-panics.rs
index 76acb4ba42de4..060ecdf1078e7 100644
--- a/src/test/run-fail/while-body-panics.rs
+++ b/src/test/ui/for-loop-while/while-body-panics.rs
@@ -1,5 +1,6 @@
 #![allow(while_true)]
 
+// run-fail
 // error-pattern:quux
 fn main() {
     let _x: isize = {
diff --git a/src/test/run-fail/while-panic.rs b/src/test/ui/for-loop-while/while-panic.rs
similarity index 93%
rename from src/test/run-fail/while-panic.rs
rename to src/test/ui/for-loop-while/while-panic.rs
index a0827591729f7..0d58c441a41b5 100644
--- a/src/test/run-fail/while-panic.rs
+++ b/src/test/ui/for-loop-while/while-panic.rs
@@ -1,5 +1,6 @@
 #![allow(while_true)]
 
+// run-fail
 // error-pattern:giraffe
 fn main() {
     panic!({
diff --git a/src/test/run-fail/generator-resume-after-panic.rs b/src/test/ui/generator/generator-resume-after-panic.rs
similarity index 97%
rename from src/test/run-fail/generator-resume-after-panic.rs
rename to src/test/ui/generator/generator-resume-after-panic.rs
index 910b4903bf6a3..c69f46b95b6b8 100644
--- a/src/test/run-fail/generator-resume-after-panic.rs
+++ b/src/test/ui/generator/generator-resume-after-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:generator resumed after panicking
 
 // Test that we get the correct message for resuming a panicked generator.
diff --git a/src/test/run-fail/hashmap-capacity-overflow.rs b/src/test/ui/hashmap/hashmap-capacity-overflow.rs
similarity index 95%
rename from src/test/run-fail/hashmap-capacity-overflow.rs
rename to src/test/ui/hashmap/hashmap-capacity-overflow.rs
index 038f2756ff322..0e904b7b6a470 100644
--- a/src/test/run-fail/hashmap-capacity-overflow.rs
+++ b/src/test/ui/hashmap/hashmap-capacity-overflow.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:capacity overflow
 
 use std::collections::hash_map::HashMap;
diff --git a/src/test/ui/hashmap-iter-value-lifetime.nll.stderr b/src/test/ui/hashmap/hashmap-iter-value-lifetime.nll.stderr
similarity index 100%
rename from src/test/ui/hashmap-iter-value-lifetime.nll.stderr
rename to src/test/ui/hashmap/hashmap-iter-value-lifetime.nll.stderr
diff --git a/src/test/ui/hashmap-iter-value-lifetime.rs b/src/test/ui/hashmap/hashmap-iter-value-lifetime.rs
similarity index 100%
rename from src/test/ui/hashmap-iter-value-lifetime.rs
rename to src/test/ui/hashmap/hashmap-iter-value-lifetime.rs
diff --git a/src/test/ui/hashmap-iter-value-lifetime.stderr b/src/test/ui/hashmap/hashmap-iter-value-lifetime.stderr
similarity index 100%
rename from src/test/ui/hashmap-iter-value-lifetime.stderr
rename to src/test/ui/hashmap/hashmap-iter-value-lifetime.stderr
diff --git a/src/test/ui/hashmap-lifetimes.nll.stderr b/src/test/ui/hashmap/hashmap-lifetimes.nll.stderr
similarity index 100%
rename from src/test/ui/hashmap-lifetimes.nll.stderr
rename to src/test/ui/hashmap/hashmap-lifetimes.nll.stderr
diff --git a/src/test/ui/hashmap-lifetimes.rs b/src/test/ui/hashmap/hashmap-lifetimes.rs
similarity index 100%
rename from src/test/ui/hashmap-lifetimes.rs
rename to src/test/ui/hashmap/hashmap-lifetimes.rs
diff --git a/src/test/ui/hashmap-lifetimes.stderr b/src/test/ui/hashmap/hashmap-lifetimes.stderr
similarity index 100%
rename from src/test/ui/hashmap-lifetimes.stderr
rename to src/test/ui/hashmap/hashmap-lifetimes.stderr
diff --git a/src/test/ui/hashmap-memory.rs b/src/test/ui/hashmap/hashmap-memory.rs
similarity index 100%
rename from src/test/ui/hashmap-memory.rs
rename to src/test/ui/hashmap/hashmap-memory.rs
diff --git a/src/test/run-fail/issue-12920.rs b/src/test/ui/issues/issue-12920.rs
similarity index 88%
rename from src/test/run-fail/issue-12920.rs
rename to src/test/ui/issues/issue-12920.rs
index 0819e992d1378..85d199f6d82d6 100644
--- a/src/test/run-fail/issue-12920.rs
+++ b/src/test/ui/issues/issue-12920.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:explicit panic
 
 pub fn main() {
diff --git a/src/test/run-fail/issue-13202.rs b/src/test/ui/issues/issue-13202.rs
similarity index 89%
rename from src/test/run-fail/issue-13202.rs
rename to src/test/ui/issues/issue-13202.rs
index cf3a6b3d986f5..511273bae9de5 100644
--- a/src/test/run-fail/issue-13202.rs
+++ b/src/test/ui/issues/issue-13202.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:bad input
 
 fn main() {
diff --git a/src/test/run-fail/issue-18576.rs b/src/test/ui/issues/issue-18576.rs
similarity index 95%
rename from src/test/run-fail/issue-18576.rs
rename to src/test/ui/issues/issue-18576.rs
index ca9d1e5f5e7de..3345b5e99f959 100644
--- a/src/test/run-fail/issue-18576.rs
+++ b/src/test/ui/issues/issue-18576.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:stop
 
 // #18576
diff --git a/src/test/run-fail/issue-20971.rs b/src/test/ui/issues/issue-20971.rs
similarity index 96%
rename from src/test/run-fail/issue-20971.rs
rename to src/test/ui/issues/issue-20971.rs
index 6c2de783c0166..6623a9d2f4d54 100644
--- a/src/test/run-fail/issue-20971.rs
+++ b/src/test/ui/issues/issue-20971.rs
@@ -1,5 +1,6 @@
 // Regression test for Issue #20971.
 
+// run-fail
 // error-pattern:Hello, world!
 
 pub trait Parser {
diff --git a/src/test/ui/issues/issue-20971.stderr b/src/test/ui/issues/issue-20971.stderr
new file mode 100644
index 0000000000000..68530a9cd4002
--- /dev/null
+++ b/src/test/ui/issues/issue-20971.stderr
@@ -0,0 +1,8 @@
+warning: trait objects without an explicit `dyn` are deprecated
+  --> $DIR/issue-20971.rs:16:22
+   |
+LL | pub fn many() -> Box<Parser<Input = <() as Parser>::Input> + 'static> {
+   |                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use `dyn`: `dyn Parser<Input = <() as Parser>::Input> + 'static`
+   |
+   = note: `#[warn(bare_trait_objects)]` on by default
+
diff --git a/src/test/run-fail/issue-23354-2.rs b/src/test/ui/issues/issue-23354-2.rs
similarity index 93%
rename from src/test/run-fail/issue-23354-2.rs
rename to src/test/ui/issues/issue-23354-2.rs
index 8f7baff56dc55..1a3ed10306072 100644
--- a/src/test/run-fail/issue-23354-2.rs
+++ b/src/test/ui/issues/issue-23354-2.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:panic evaluated
 
 #[allow(unused_variables)]
diff --git a/src/test/run-fail/issue-23354.rs b/src/test/ui/issues/issue-23354.rs
similarity index 90%
rename from src/test/run-fail/issue-23354.rs
rename to src/test/ui/issues/issue-23354.rs
index 4c2fb022a6bf6..77b7dbf99dac1 100644
--- a/src/test/run-fail/issue-23354.rs
+++ b/src/test/ui/issues/issue-23354.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:panic evaluated
 
 #[allow(unused_variables)]
diff --git a/src/test/run-fail/issue-2444.rs b/src/test/ui/issues/issue-2444.rs
similarity index 92%
rename from src/test/run-fail/issue-2444.rs
rename to src/test/ui/issues/issue-2444.rs
index 17f89e4d20d3e..8a88e00a689d3 100644
--- a/src/test/run-fail/issue-2444.rs
+++ b/src/test/ui/issues/issue-2444.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:explicit panic
 
 use std::sync::Arc;
diff --git a/src/test/ui/issues/issue-2444.stderr b/src/test/ui/issues/issue-2444.stderr
new file mode 100644
index 0000000000000..23be60d4c1015
--- /dev/null
+++ b/src/test/ui/issues/issue-2444.stderr
@@ -0,0 +1,14 @@
+warning: type `e` should have an upper camel case name
+  --> $DIR/issue-2444.rs:6:6
+   |
+LL | enum e<T> {
+   |      ^ help: convert the identifier to upper camel case: `E`
+   |
+   = note: `#[warn(non_camel_case_types)]` on by default
+
+warning: variant `ee` should have an upper camel case name
+  --> $DIR/issue-2444.rs:7:5
+   |
+LL |     ee(Arc<T>),
+   |     ^^ help: convert the identifier to upper camel case: `Ee`
+
diff --git a/src/test/run-fail/issue-2761.rs b/src/test/ui/issues/issue-2761.rs
similarity index 87%
rename from src/test/run-fail/issue-2761.rs
rename to src/test/ui/issues/issue-2761.rs
index 84d90930d2d23..437566459250f 100644
--- a/src/test/run-fail/issue-2761.rs
+++ b/src/test/ui/issues/issue-2761.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:custom message
 
 fn main() {
diff --git a/src/test/run-fail/issue-28934.rs b/src/test/ui/issues/issue-28934.rs
similarity index 98%
rename from src/test/run-fail/issue-28934.rs
rename to src/test/ui/issues/issue-28934.rs
index 5915372b6920f..fcf91d74fbe57 100644
--- a/src/test/run-fail/issue-28934.rs
+++ b/src/test/ui/issues/issue-28934.rs
@@ -1,6 +1,7 @@
 // Regression test: issue had to do with "givens" in region inference,
 // which were not being considered during the contraction phase.
 
+// run-fail
 // error-pattern:explicit panic
 
 struct Parser<'i: 't, 't>(&'i u8, &'t u8);
diff --git a/src/test/run-fail/issue-29798.rs b/src/test/ui/issues/issue-29798.rs
similarity index 92%
rename from src/test/run-fail/issue-29798.rs
rename to src/test/ui/issues/issue-29798.rs
index b06aa5fc728d9..31b08f2164a4a 100644
--- a/src/test/run-fail/issue-29798.rs
+++ b/src/test/ui/issues/issue-29798.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:index out of bounds: the len is 5 but the index is 5
 
 const fn test(x: usize) -> i32 {
diff --git a/src/test/run-fail/issue-3029.rs b/src/test/ui/issues/issue-3029.rs
similarity index 94%
rename from src/test/run-fail/issue-3029.rs
rename to src/test/ui/issues/issue-3029.rs
index face808b68ff3..b6a656fa65d35 100644
--- a/src/test/run-fail/issue-3029.rs
+++ b/src/test/ui/issues/issue-3029.rs
@@ -3,6 +3,7 @@
 #![allow(unused_variables)]
 
 
+// run-fail
 // error-pattern:so long
 fn main() {
     let mut x = Vec::new();
diff --git a/src/test/run-fail/issue-30380.rs b/src/test/ui/issues/issue-30380.rs
similarity index 98%
rename from src/test/run-fail/issue-30380.rs
rename to src/test/ui/issues/issue-30380.rs
index 036071a89c7a4..34bd6c1b0e561 100644
--- a/src/test/run-fail/issue-30380.rs
+++ b/src/test/ui/issues/issue-30380.rs
@@ -1,6 +1,7 @@
 // check that panics in destructors during assignment do not leave
 // destroyed values lying around for other destructors to observe.
 
+// run-fail
 // error-pattern:panicking destructors ftw!
 
 struct Observer<'a>(&'a mut FilledOnDrop);
diff --git a/src/test/run-fail/issue-44216-add-instant.rs b/src/test/ui/issues/issue-44216-add-instant.rs
similarity index 93%
rename from src/test/run-fail/issue-44216-add-instant.rs
rename to src/test/ui/issues/issue-44216-add-instant.rs
index 76ad0a3d41bf8..b5f48e8cedc56 100644
--- a/src/test/run-fail/issue-44216-add-instant.rs
+++ b/src/test/ui/issues/issue-44216-add-instant.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:overflow
 
 use std::time::{Instant, Duration};
diff --git a/src/test/run-fail/issue-44216-add-system-time.rs b/src/test/ui/issues/issue-44216-add-system-time.rs
similarity index 93%
rename from src/test/run-fail/issue-44216-add-system-time.rs
rename to src/test/ui/issues/issue-44216-add-system-time.rs
index aa861f7d5993e..da28433dde9a1 100644
--- a/src/test/run-fail/issue-44216-add-system-time.rs
+++ b/src/test/ui/issues/issue-44216-add-system-time.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:overflow
 
 use std::time::{Duration, SystemTime};
diff --git a/src/test/run-fail/issue-44216-sub-instant.rs b/src/test/ui/issues/issue-44216-sub-instant.rs
similarity index 93%
rename from src/test/run-fail/issue-44216-sub-instant.rs
rename to src/test/ui/issues/issue-44216-sub-instant.rs
index 8bc1f47ae2d96..954cf45591f03 100644
--- a/src/test/run-fail/issue-44216-sub-instant.rs
+++ b/src/test/ui/issues/issue-44216-sub-instant.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:overflow
 
 use std::time::{Instant, Duration};
diff --git a/src/test/run-fail/issue-44216-sub-system-time.rs b/src/test/ui/issues/issue-44216-sub-system-time.rs
similarity index 93%
rename from src/test/run-fail/issue-44216-sub-system-time.rs
rename to src/test/ui/issues/issue-44216-sub-system-time.rs
index 37ab0e7c3f99f..e024e231565b4 100644
--- a/src/test/run-fail/issue-44216-sub-system-time.rs
+++ b/src/test/ui/issues/issue-44216-sub-system-time.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:overflow
 
 use std::time::{Duration, SystemTime};
diff --git a/src/test/run-fail/issue-51345.rs b/src/test/ui/issues/issue-51345-2.rs
similarity index 92%
rename from src/test/run-fail/issue-51345.rs
rename to src/test/ui/issues/issue-51345-2.rs
index c62f98ea78d1e..4abdba6176a2b 100644
--- a/src/test/run-fail/issue-51345.rs
+++ b/src/test/ui/issues/issue-51345-2.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern: thread 'main' panicked at 'explicit panic'
 
 fn main() {
diff --git a/src/test/run-fail/issue-6458-1.rs b/src/test/ui/issues/issue-6458-1.rs
similarity index 87%
rename from src/test/run-fail/issue-6458-1.rs
rename to src/test/ui/issues/issue-6458-1.rs
index 550bb2b832f44..16c479a6a5cb5 100644
--- a/src/test/run-fail/issue-6458-1.rs
+++ b/src/test/ui/issues/issue-6458-1.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:explicit panic
 
 fn foo<T>(t: T) {}
diff --git a/src/test/run-fail/issue-948.rs b/src/test/ui/issues/issue-948.rs
similarity index 94%
rename from src/test/run-fail/issue-948.rs
rename to src/test/ui/issues/issue-948.rs
index 8f1c6587f030a..ab0cee71929f4 100644
--- a/src/test/run-fail/issue-948.rs
+++ b/src/test/ui/issues/issue-948.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:beep boop
 
 #![allow(unused_variables)]
diff --git a/src/test/run-fail/assert-as-macro.rs b/src/test/ui/macros/assert-as-macro.rs
similarity index 86%
rename from src/test/run-fail/assert-as-macro.rs
rename to src/test/ui/macros/assert-as-macro.rs
index f715e21f781bd..bc51b673606e5 100644
--- a/src/test/run-fail/assert-as-macro.rs
+++ b/src/test/ui/macros/assert-as-macro.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:assertion failed: 1 == 2
 
 fn main() {
diff --git a/src/test/run-fail/assert-eq-macro-panic.rs b/src/test/ui/macros/assert-eq-macro-panic.rs
similarity index 92%
rename from src/test/run-fail/assert-eq-macro-panic.rs
rename to src/test/ui/macros/assert-eq-macro-panic.rs
index 863fec12d7475..bd4eb78de9fc1 100644
--- a/src/test/run-fail/assert-eq-macro-panic.rs
+++ b/src/test/ui/macros/assert-eq-macro-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:assertion failed: `(left == right)`
 // error-pattern: left: `14`
 // error-pattern:right: `15`
diff --git a/src/test/run-fail/assert-macro-explicit.rs b/src/test/ui/macros/assert-macro-explicit.rs
similarity index 88%
rename from src/test/run-fail/assert-macro-explicit.rs
rename to src/test/ui/macros/assert-macro-explicit.rs
index 3689323c999d6..da13c06d575e7 100644
--- a/src/test/run-fail/assert-macro-explicit.rs
+++ b/src/test/ui/macros/assert-macro-explicit.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:panicked at 'assertion failed: false'
 
 fn main() {
diff --git a/src/test/run-fail/assert-macro-fmt.rs b/src/test/ui/macros/assert-macro-fmt.rs
similarity index 91%
rename from src/test/run-fail/assert-macro-fmt.rs
rename to src/test/ui/macros/assert-macro-fmt.rs
index 9fbfb085c2fa5..3b173156d7a49 100644
--- a/src/test/run-fail/assert-macro-fmt.rs
+++ b/src/test/ui/macros/assert-macro-fmt.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:panicked at 'test-assert-fmt 42 rust'
 
 fn main() {
diff --git a/src/test/run-fail/assert-macro-owned.rs b/src/test/ui/macros/assert-macro-owned.rs
similarity index 90%
rename from src/test/run-fail/assert-macro-owned.rs
rename to src/test/ui/macros/assert-macro-owned.rs
index bd58d35eb719f..c231ceb46e91c 100644
--- a/src/test/run-fail/assert-macro-owned.rs
+++ b/src/test/ui/macros/assert-macro-owned.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:panicked at 'test-assert-owned'
 
 fn main() {
diff --git a/src/test/run-fail/assert-macro-static.rs b/src/test/ui/macros/assert-macro-static.rs
similarity index 89%
rename from src/test/run-fail/assert-macro-static.rs
rename to src/test/ui/macros/assert-macro-static.rs
index 650aaeab4f66f..3c988ba4469ba 100644
--- a/src/test/run-fail/assert-macro-static.rs
+++ b/src/test/ui/macros/assert-macro-static.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:panicked at 'test-assert-static'
 
 fn main() {
diff --git a/src/test/run-fail/assert-ne-macro-panic.rs b/src/test/ui/macros/assert-ne-macro-panic.rs
similarity index 92%
rename from src/test/run-fail/assert-ne-macro-panic.rs
rename to src/test/ui/macros/assert-ne-macro-panic.rs
index f55ef2b3ff5ca..0e505e58e2b58 100644
--- a/src/test/run-fail/assert-ne-macro-panic.rs
+++ b/src/test/ui/macros/assert-ne-macro-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:assertion failed: `(left != right)`
 // error-pattern: left: `14`
 // error-pattern:right: `14`
diff --git a/src/test/run-fail/unimplemented-macro-panic.rs b/src/test/ui/macros/unimplemented-macro-panic.rs
similarity index 85%
rename from src/test/run-fail/unimplemented-macro-panic.rs
rename to src/test/ui/macros/unimplemented-macro-panic.rs
index 2a848281e4f22..60227f7c93c55 100644
--- a/src/test/run-fail/unimplemented-macro-panic.rs
+++ b/src/test/ui/macros/unimplemented-macro-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:not yet implemented
 fn main() {
     unimplemented!()
diff --git a/src/test/run-fail/unreachable-fmt-msg.rs b/src/test/ui/macros/unreachable-fmt-msg.rs
similarity index 91%
rename from src/test/run-fail/unreachable-fmt-msg.rs
rename to src/test/ui/macros/unreachable-fmt-msg.rs
index ac2a52163b4de..b00937ce4ff90 100644
--- a/src/test/run-fail/unreachable-fmt-msg.rs
+++ b/src/test/ui/macros/unreachable-fmt-msg.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:internal error: entered unreachable code: 6 is not prime
 fn main() {
     unreachable!("{} is not {}", 6u32, "prime");
diff --git a/src/test/run-fail/unreachable-macro-panic.rs b/src/test/ui/macros/unreachable-macro-panic.rs
similarity index 88%
rename from src/test/run-fail/unreachable-macro-panic.rs
rename to src/test/ui/macros/unreachable-macro-panic.rs
index 597a01447228d..f8f2f3f50d790 100644
--- a/src/test/run-fail/unreachable-macro-panic.rs
+++ b/src/test/ui/macros/unreachable-macro-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:internal error: entered unreachable code
 fn main() {
     unreachable!()
diff --git a/src/test/run-fail/unreachable-static-msg.rs b/src/test/ui/macros/unreachable-static-msg.rs
similarity index 89%
rename from src/test/run-fail/unreachable-static-msg.rs
rename to src/test/ui/macros/unreachable-static-msg.rs
index 40a2881cc5714..87993d65a14ea 100644
--- a/src/test/run-fail/unreachable-static-msg.rs
+++ b/src/test/ui/macros/unreachable-static-msg.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:internal error: entered unreachable code: uhoh
 fn main() {
     unreachable!("uhoh")
diff --git a/src/test/run-fail/unreachable.rs b/src/test/ui/macros/unreachable.rs
similarity index 88%
rename from src/test/run-fail/unreachable.rs
rename to src/test/ui/macros/unreachable.rs
index 597a01447228d..f8f2f3f50d790 100644
--- a/src/test/run-fail/unreachable.rs
+++ b/src/test/ui/macros/unreachable.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:internal error: entered unreachable code
 fn main() {
     unreachable!()
diff --git a/src/test/run-fail/match-bot-panic.rs b/src/test/ui/match/match-bot-panic.rs
similarity index 95%
rename from src/test/run-fail/match-bot-panic.rs
rename to src/test/ui/match/match-bot-panic.rs
index f4da8c4e43fb6..8b147cb5ab688 100644
--- a/src/test/run-fail/match-bot-panic.rs
+++ b/src/test/ui/match/match-bot-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:explicit panic
 
 #![allow(unreachable_code)]
diff --git a/src/test/run-fail/match-disc-bot.rs b/src/test/ui/match/match-disc-bot.rs
similarity index 93%
rename from src/test/run-fail/match-disc-bot.rs
rename to src/test/ui/match/match-disc-bot.rs
index a9312fbb1fb35..dc48c583ca01c 100644
--- a/src/test/run-fail/match-disc-bot.rs
+++ b/src/test/ui/match/match-disc-bot.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:quux
 fn f() -> ! {
     panic!("quux")
diff --git a/src/test/run-fail/match-wildcards.rs b/src/test/ui/match/match-wildcards.rs
similarity index 96%
rename from src/test/run-fail/match-wildcards.rs
rename to src/test/ui/match/match-wildcards.rs
index 7a65ad5255896..e1cda3509b305 100644
--- a/src/test/run-fail/match-wildcards.rs
+++ b/src/test/ui/match/match-wildcards.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:squirrelcupcake
 fn cmp() -> isize {
     match (Some('a'), None::<char>) {
diff --git a/src/test/run-fail/meta-revision-bad.rs b/src/test/ui/meta-revision-bad.rs
similarity index 96%
rename from src/test/run-fail/meta-revision-bad.rs
rename to src/test/ui/meta-revision-bad.rs
index 17f6398b73554..d28f6c9ea0fd4 100644
--- a/src/test/run-fail/meta-revision-bad.rs
+++ b/src/test/ui/meta-revision-bad.rs
@@ -1,3 +1,4 @@
+// run-fail
 // Meta test for compiletest: check that when we give the wrong error
 // patterns, the test fails.
 
diff --git a/src/test/run-fail/meta-revision-ok.rs b/src/test/ui/meta-revision-ok.rs
similarity index 96%
rename from src/test/run-fail/meta-revision-ok.rs
rename to src/test/ui/meta-revision-ok.rs
index 8693ee5f4ef96..c3b943b3283d4 100644
--- a/src/test/run-fail/meta-revision-ok.rs
+++ b/src/test/ui/meta-revision-ok.rs
@@ -1,3 +1,4 @@
+// run-fail
 // Meta test for compiletest: check that when we give the right error
 // patterns, the test passes. See all `meta-revision-bad.rs`.
 
diff --git a/src/test/run-fail/mir_codegen_calls_converging_drops.rs b/src/test/ui/mir/mir_codegen_calls_converging_drops.rs
similarity index 97%
rename from src/test/run-fail/mir_codegen_calls_converging_drops.rs
rename to src/test/ui/mir/mir_codegen_calls_converging_drops.rs
index ee0dc98ce6819..7b31c1aa12e3f 100644
--- a/src/test/run-fail/mir_codegen_calls_converging_drops.rs
+++ b/src/test/ui/mir/mir_codegen_calls_converging_drops.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:converging_fn called
 // error-pattern:0 dropped
 // error-pattern:exit
diff --git a/src/test/run-fail/mir_codegen_calls_converging_drops_2.rs b/src/test/ui/mir/mir_codegen_calls_converging_drops_2.rs
similarity index 97%
rename from src/test/run-fail/mir_codegen_calls_converging_drops_2.rs
rename to src/test/ui/mir/mir_codegen_calls_converging_drops_2.rs
index ee2c25ce8565e..f8117887c9038 100644
--- a/src/test/run-fail/mir_codegen_calls_converging_drops_2.rs
+++ b/src/test/ui/mir/mir_codegen_calls_converging_drops_2.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:complex called
 // error-pattern:dropped
 // error-pattern:exit
diff --git a/src/test/run-fail/mir_codegen_calls_diverging.rs b/src/test/ui/mir/mir_codegen_calls_diverging.rs
similarity index 92%
rename from src/test/run-fail/mir_codegen_calls_diverging.rs
rename to src/test/ui/mir/mir_codegen_calls_diverging.rs
index dceae0a4e4a03..96630da4d49a7 100644
--- a/src/test/run-fail/mir_codegen_calls_diverging.rs
+++ b/src/test/ui/mir/mir_codegen_calls_diverging.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:diverging_fn called
 
 fn diverging_fn() -> ! {
diff --git a/src/test/run-fail/mir_codegen_calls_diverging_drops.rs b/src/test/ui/mir/mir_codegen_calls_diverging_drops.rs
similarity index 96%
rename from src/test/run-fail/mir_codegen_calls_diverging_drops.rs
rename to src/test/ui/mir/mir_codegen_calls_diverging_drops.rs
index 187e526f7c092..96a03a0d6a711 100644
--- a/src/test/run-fail/mir_codegen_calls_diverging_drops.rs
+++ b/src/test/ui/mir/mir_codegen_calls_diverging_drops.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:diverging_fn called
 // error-pattern:0 dropped
 
diff --git a/src/test/run-fail/mir_codegen_no_landing_pads.rs b/src/test/ui/mir/mir_codegen_no_landing_pads.rs
similarity index 97%
rename from src/test/run-fail/mir_codegen_no_landing_pads.rs
rename to src/test/ui/mir/mir_codegen_no_landing_pads.rs
index f3384dc45f3d2..37f2d47bb0e55 100644
--- a/src/test/run-fail/mir_codegen_no_landing_pads.rs
+++ b/src/test/ui/mir/mir_codegen_no_landing_pads.rs
@@ -1,3 +1,4 @@
+// run-fail
 // compile-flags: -Z no-landing-pads -C codegen-units=1
 // error-pattern:converging_fn called
 // ignore-cloudabi no std::process
diff --git a/src/test/run-fail/mir_codegen_no_landing_pads_diverging.rs b/src/test/ui/mir/mir_codegen_no_landing_pads_diverging.rs
similarity index 97%
rename from src/test/run-fail/mir_codegen_no_landing_pads_diverging.rs
rename to src/test/ui/mir/mir_codegen_no_landing_pads_diverging.rs
index 08f6d578bb2e0..091fefb6188e5 100644
--- a/src/test/run-fail/mir_codegen_no_landing_pads_diverging.rs
+++ b/src/test/ui/mir/mir_codegen_no_landing_pads_diverging.rs
@@ -1,3 +1,4 @@
+// run-fail
 // compile-flags: -Z no-landing-pads -C codegen-units=1
 // error-pattern:diverging_fn called
 // ignore-cloudabi no std::process
diff --git a/src/test/run-fail/mir_drop_panics.rs b/src/test/ui/mir/mir_drop_panics.rs
similarity index 96%
rename from src/test/run-fail/mir_drop_panics.rs
rename to src/test/ui/mir/mir_drop_panics.rs
index bda555b926288..da6d0b6a346ac 100644
--- a/src/test/run-fail/mir_drop_panics.rs
+++ b/src/test/ui/mir/mir_drop_panics.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:panic 1
 // error-pattern:drop 2
 
diff --git a/src/test/run-fail/mir_dynamic_drops_1.rs b/src/test/ui/mir/mir_dynamic_drops_1.rs
similarity index 98%
rename from src/test/run-fail/mir_dynamic_drops_1.rs
rename to src/test/ui/mir/mir_dynamic_drops_1.rs
index db8d0af29db2c..524f13d754dfa 100644
--- a/src/test/run-fail/mir_dynamic_drops_1.rs
+++ b/src/test/ui/mir/mir_dynamic_drops_1.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:drop 1
 // error-pattern:drop 2
 // ignore-cloudabi no std::process
diff --git a/src/test/run-fail/mir_dynamic_drops_2.rs b/src/test/ui/mir/mir_dynamic_drops_2.rs
similarity index 97%
rename from src/test/run-fail/mir_dynamic_drops_2.rs
rename to src/test/ui/mir/mir_dynamic_drops_2.rs
index 21d3a042b1e31..8415b99bcf946 100644
--- a/src/test/run-fail/mir_dynamic_drops_2.rs
+++ b/src/test/ui/mir/mir_dynamic_drops_2.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:drop 1
 // ignore-cloudabi no std::process
 
diff --git a/src/test/run-fail/mir_dynamic_drops_3.rs b/src/test/ui/mir/mir_dynamic_drops_3.rs
similarity index 98%
rename from src/test/run-fail/mir_dynamic_drops_3.rs
rename to src/test/ui/mir/mir_dynamic_drops_3.rs
index b90499686823a..18914fdb03d7e 100644
--- a/src/test/run-fail/mir_dynamic_drops_3.rs
+++ b/src/test/ui/mir/mir_dynamic_drops_3.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:unwind happens
 // error-pattern:drop 3
 // error-pattern:drop 2
diff --git a/src/test/run-fail/mir_indexing_oob_1.rs b/src/test/ui/mir/mir_indexing_oob_1.rs
similarity index 93%
rename from src/test/run-fail/mir_indexing_oob_1.rs
rename to src/test/ui/mir/mir_indexing_oob_1.rs
index 0ae0320b124bc..252ff87dca84f 100644
--- a/src/test/run-fail/mir_indexing_oob_1.rs
+++ b/src/test/ui/mir/mir_indexing_oob_1.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:index out of bounds: the len is 5 but the index is 10
 
 const C: [u32; 5] = [0; 5];
diff --git a/src/test/run-fail/mir_indexing_oob_2.rs b/src/test/ui/mir/mir_indexing_oob_2.rs
similarity index 94%
rename from src/test/run-fail/mir_indexing_oob_2.rs
rename to src/test/ui/mir/mir_indexing_oob_2.rs
index a7a1177260c31..4b8171b098166 100644
--- a/src/test/run-fail/mir_indexing_oob_2.rs
+++ b/src/test/ui/mir/mir_indexing_oob_2.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:index out of bounds: the len is 5 but the index is 10
 
 const C: &'static [u8; 5] = b"hello";
diff --git a/src/test/run-fail/mir_indexing_oob_3.rs b/src/test/ui/mir/mir_indexing_oob_3.rs
similarity index 93%
rename from src/test/run-fail/mir_indexing_oob_3.rs
rename to src/test/ui/mir/mir_indexing_oob_3.rs
index 188460fff7832..0397a872c0aca 100644
--- a/src/test/run-fail/mir_indexing_oob_3.rs
+++ b/src/test/ui/mir/mir_indexing_oob_3.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:index out of bounds: the len is 5 but the index is 10
 
 const C: &'static [u8; 5] = b"hello";
diff --git a/src/test/run-fail/return-never-coerce.rs b/src/test/ui/never_type/return-never-coerce.rs
similarity index 95%
rename from src/test/run-fail/return-never-coerce.rs
rename to src/test/ui/never_type/return-never-coerce.rs
index 18182ff0f9d47..fa0c78c2cf3f0 100644
--- a/src/test/run-fail/return-never-coerce.rs
+++ b/src/test/ui/never_type/return-never-coerce.rs
@@ -1,5 +1,6 @@
 // Test that ! coerces to other types.
 
+// run-fail
 // error-pattern:aah!
 
 fn call_another_fn<T, F: FnOnce() -> T>(f: F) -> T {
diff --git a/src/test/run-fail/divide-by-zero.rs b/src/test/ui/numbers-arithmetic/divide-by-zero.rs
similarity index 88%
rename from src/test/run-fail/divide-by-zero.rs
rename to src/test/ui/numbers-arithmetic/divide-by-zero.rs
index fdb3f4842e50a..aa9483f306026 100644
--- a/src/test/run-fail/divide-by-zero.rs
+++ b/src/test/ui/numbers-arithmetic/divide-by-zero.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:attempt to divide by zero
 
 fn main() {
diff --git a/src/test/run-fail/mod-zero.rs b/src/test/ui/numbers-arithmetic/mod-zero.rs
similarity index 91%
rename from src/test/run-fail/mod-zero.rs
rename to src/test/ui/numbers-arithmetic/mod-zero.rs
index ac2959fcd3853..c31281aa0d51f 100644
--- a/src/test/run-fail/mod-zero.rs
+++ b/src/test/ui/numbers-arithmetic/mod-zero.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:attempt to calculate the remainder with a divisor of zero
 
 fn main() {
diff --git a/src/test/run-fail/overflowing-add.rs b/src/test/ui/numbers-arithmetic/overflowing-add.rs
similarity index 93%
rename from src/test/run-fail/overflowing-add.rs
rename to src/test/ui/numbers-arithmetic/overflowing-add.rs
index 24602aced9e42..0c21209e788e4 100644
--- a/src/test/run-fail/overflowing-add.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-add.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to add with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/run-fail/overflowing-lsh-1.rs b/src/test/ui/numbers-arithmetic/overflowing-lsh-1.rs
similarity index 94%
rename from src/test/run-fail/overflowing-lsh-1.rs
rename to src/test/ui/numbers-arithmetic/overflowing-lsh-1.rs
index 37fbf01e487dc..22ed6a75ece46 100644
--- a/src/test/run-fail/overflowing-lsh-1.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-lsh-1.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to shift left with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/ui/numbers-arithmetic/overflowing-lsh-1.stderr b/src/test/ui/numbers-arithmetic/overflowing-lsh-1.stderr
new file mode 100644
index 0000000000000..a536c6885b22e
--- /dev/null
+++ b/src/test/ui/numbers-arithmetic/overflowing-lsh-1.stderr
@@ -0,0 +1,12 @@
+warning: attempt to shift left with overflow
+  --> $DIR/overflowing-lsh-1.rs:9:14
+   |
+LL |     let _x = 1_i32 << 32;
+   |              ^^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/overflowing-lsh-1.rs:6:9
+   |
+LL | #![warn(const_err)]
+   |         ^^^^^^^^^
+
diff --git a/src/test/run-fail/overflowing-lsh-2.rs b/src/test/ui/numbers-arithmetic/overflowing-lsh-2.rs
similarity index 94%
rename from src/test/run-fail/overflowing-lsh-2.rs
rename to src/test/ui/numbers-arithmetic/overflowing-lsh-2.rs
index 7b0b37dfed043..4cc783cf3f959 100644
--- a/src/test/run-fail/overflowing-lsh-2.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-lsh-2.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to shift left with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/ui/numbers-arithmetic/overflowing-lsh-2.stderr b/src/test/ui/numbers-arithmetic/overflowing-lsh-2.stderr
new file mode 100644
index 0000000000000..c609aad79ec39
--- /dev/null
+++ b/src/test/ui/numbers-arithmetic/overflowing-lsh-2.stderr
@@ -0,0 +1,12 @@
+warning: attempt to shift left with overflow
+  --> $DIR/overflowing-lsh-2.rs:9:14
+   |
+LL |     let _x = 1 << -1;
+   |              ^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/overflowing-lsh-2.rs:6:9
+   |
+LL | #![warn(const_err)]
+   |         ^^^^^^^^^
+
diff --git a/src/test/run-fail/overflowing-lsh-3.rs b/src/test/ui/numbers-arithmetic/overflowing-lsh-3.rs
similarity index 94%
rename from src/test/run-fail/overflowing-lsh-3.rs
rename to src/test/ui/numbers-arithmetic/overflowing-lsh-3.rs
index 1768a8e6d3138..cd9f55160ab11 100644
--- a/src/test/run-fail/overflowing-lsh-3.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-lsh-3.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to shift left with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/ui/numbers-arithmetic/overflowing-lsh-3.stderr b/src/test/ui/numbers-arithmetic/overflowing-lsh-3.stderr
new file mode 100644
index 0000000000000..32a5e155a5826
--- /dev/null
+++ b/src/test/ui/numbers-arithmetic/overflowing-lsh-3.stderr
@@ -0,0 +1,12 @@
+warning: attempt to shift left with overflow
+  --> $DIR/overflowing-lsh-3.rs:9:14
+   |
+LL |     let _x = 1_u64 << 64;
+   |              ^^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/overflowing-lsh-3.rs:6:9
+   |
+LL | #![warn(const_err)]
+   |         ^^^^^^^^^
+
diff --git a/src/test/run-fail/overflowing-lsh-4.rs b/src/test/ui/numbers-arithmetic/overflowing-lsh-4.rs
similarity index 98%
rename from src/test/run-fail/overflowing-lsh-4.rs
rename to src/test/ui/numbers-arithmetic/overflowing-lsh-4.rs
index ec304b4144e0f..e42dd852505f2 100644
--- a/src/test/run-fail/overflowing-lsh-4.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-lsh-4.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to shift left with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/ui/numbers-arithmetic/overflowing-lsh-4.stderr b/src/test/ui/numbers-arithmetic/overflowing-lsh-4.stderr
new file mode 100644
index 0000000000000..279bb8c02a77a
--- /dev/null
+++ b/src/test/ui/numbers-arithmetic/overflowing-lsh-4.stderr
@@ -0,0 +1,12 @@
+warning: attempt to shift left with overflow
+  --> $DIR/overflowing-lsh-4.rs:13:13
+   |
+LL |     let x = 1_i8 << 17;
+   |             ^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/overflowing-lsh-4.rs:9:9
+   |
+LL | #![warn(const_err)]
+   |         ^^^^^^^^^
+
diff --git a/src/test/run-fail/overflowing-mul.rs b/src/test/ui/numbers-arithmetic/overflowing-mul.rs
similarity index 93%
rename from src/test/run-fail/overflowing-mul.rs
rename to src/test/ui/numbers-arithmetic/overflowing-mul.rs
index 48110365a81df..76bab113fa1dc 100644
--- a/src/test/run-fail/overflowing-mul.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-mul.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to multiply with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/run-fail/overflowing-neg.rs b/src/test/ui/numbers-arithmetic/overflowing-neg.rs
similarity index 93%
rename from src/test/run-fail/overflowing-neg.rs
rename to src/test/ui/numbers-arithmetic/overflowing-neg.rs
index c4afd74241eda..495809b748512 100644
--- a/src/test/run-fail/overflowing-neg.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-neg.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to negate with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/run-fail/overflowing-pow-signed.rs b/src/test/ui/numbers-arithmetic/overflowing-pow-signed.rs
similarity index 93%
rename from src/test/run-fail/overflowing-pow-signed.rs
rename to src/test/ui/numbers-arithmetic/overflowing-pow-signed.rs
index c539c685faf9e..a855ef0ec0663 100644
--- a/src/test/run-fail/overflowing-pow-signed.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-pow-signed.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to multiply with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/run-fail/overflowing-pow-unsigned.rs b/src/test/ui/numbers-arithmetic/overflowing-pow-unsigned.rs
similarity index 93%
rename from src/test/run-fail/overflowing-pow-unsigned.rs
rename to src/test/ui/numbers-arithmetic/overflowing-pow-unsigned.rs
index 1d4fa3b5c7eb8..26a2b2c4b8a42 100644
--- a/src/test/run-fail/overflowing-pow-unsigned.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-pow-unsigned.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to multiply with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/run-fail/overflowing-rsh-1.rs b/src/test/ui/numbers-arithmetic/overflowing-rsh-1.rs
similarity index 94%
rename from src/test/run-fail/overflowing-rsh-1.rs
rename to src/test/ui/numbers-arithmetic/overflowing-rsh-1.rs
index 14514540c06e1..4d727f101e924 100644
--- a/src/test/run-fail/overflowing-rsh-1.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-rsh-1.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-1.stderr b/src/test/ui/numbers-arithmetic/overflowing-rsh-1.stderr
new file mode 100644
index 0000000000000..5ef6e595555c6
--- /dev/null
+++ b/src/test/ui/numbers-arithmetic/overflowing-rsh-1.stderr
@@ -0,0 +1,12 @@
+warning: attempt to shift right with overflow
+  --> $DIR/overflowing-rsh-1.rs:9:14
+   |
+LL |     let _x = -1_i32 >> 32;
+   |              ^^^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/overflowing-rsh-1.rs:6:9
+   |
+LL | #![warn(const_err)]
+   |         ^^^^^^^^^
+
diff --git a/src/test/run-fail/overflowing-rsh-2.rs b/src/test/ui/numbers-arithmetic/overflowing-rsh-2.rs
similarity index 94%
rename from src/test/run-fail/overflowing-rsh-2.rs
rename to src/test/ui/numbers-arithmetic/overflowing-rsh-2.rs
index 83dcbd13d2ad8..2afc8e5ca5e6f 100644
--- a/src/test/run-fail/overflowing-rsh-2.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-rsh-2.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-2.stderr b/src/test/ui/numbers-arithmetic/overflowing-rsh-2.stderr
new file mode 100644
index 0000000000000..b23f2a43e1f87
--- /dev/null
+++ b/src/test/ui/numbers-arithmetic/overflowing-rsh-2.stderr
@@ -0,0 +1,12 @@
+warning: attempt to shift right with overflow
+  --> $DIR/overflowing-rsh-2.rs:9:14
+   |
+LL |     let _x = -1_i32 >> -1;
+   |              ^^^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/overflowing-rsh-2.rs:6:9
+   |
+LL | #![warn(const_err)]
+   |         ^^^^^^^^^
+
diff --git a/src/test/run-fail/overflowing-rsh-3.rs b/src/test/ui/numbers-arithmetic/overflowing-rsh-3.rs
similarity index 94%
rename from src/test/run-fail/overflowing-rsh-3.rs
rename to src/test/ui/numbers-arithmetic/overflowing-rsh-3.rs
index 3521c0506591c..1ea35ce237d5f 100644
--- a/src/test/run-fail/overflowing-rsh-3.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-rsh-3.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-3.stderr b/src/test/ui/numbers-arithmetic/overflowing-rsh-3.stderr
new file mode 100644
index 0000000000000..87042bc94b4be
--- /dev/null
+++ b/src/test/ui/numbers-arithmetic/overflowing-rsh-3.stderr
@@ -0,0 +1,12 @@
+warning: attempt to shift right with overflow
+  --> $DIR/overflowing-rsh-3.rs:9:14
+   |
+LL |     let _x = -1_i64 >> 64;
+   |              ^^^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/overflowing-rsh-3.rs:6:9
+   |
+LL | #![warn(const_err)]
+   |         ^^^^^^^^^
+
diff --git a/src/test/run-fail/overflowing-rsh-4.rs b/src/test/ui/numbers-arithmetic/overflowing-rsh-4.rs
similarity index 98%
rename from src/test/run-fail/overflowing-rsh-4.rs
rename to src/test/ui/numbers-arithmetic/overflowing-rsh-4.rs
index ed1191849e57c..89002e559d619 100644
--- a/src/test/run-fail/overflowing-rsh-4.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-rsh-4.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-4.stderr b/src/test/ui/numbers-arithmetic/overflowing-rsh-4.stderr
new file mode 100644
index 0000000000000..feb274d161e2a
--- /dev/null
+++ b/src/test/ui/numbers-arithmetic/overflowing-rsh-4.stderr
@@ -0,0 +1,12 @@
+warning: attempt to shift right with overflow
+  --> $DIR/overflowing-rsh-4.rs:13:13
+   |
+LL |     let x = 2_i8 >> 17;
+   |             ^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/overflowing-rsh-4.rs:9:9
+   |
+LL | #![warn(const_err)]
+   |         ^^^^^^^^^
+
diff --git a/src/test/run-fail/overflowing-rsh-5.rs b/src/test/ui/numbers-arithmetic/overflowing-rsh-5.rs
similarity index 94%
rename from src/test/run-fail/overflowing-rsh-5.rs
rename to src/test/ui/numbers-arithmetic/overflowing-rsh-5.rs
index 58dfc5710ae4e..7c35d5563ba0f 100644
--- a/src/test/run-fail/overflowing-rsh-5.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-rsh-5.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-5.stderr b/src/test/ui/numbers-arithmetic/overflowing-rsh-5.stderr
new file mode 100644
index 0000000000000..a533cb65072a9
--- /dev/null
+++ b/src/test/ui/numbers-arithmetic/overflowing-rsh-5.stderr
@@ -0,0 +1,12 @@
+warning: attempt to shift right with overflow
+  --> $DIR/overflowing-rsh-5.rs:9:14
+   |
+LL |     let _n = 1i64 >> [64][0];
+   |              ^^^^^^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/overflowing-rsh-5.rs:6:9
+   |
+LL | #![warn(const_err)]
+   |         ^^^^^^^^^
+
diff --git a/src/test/run-fail/overflowing-rsh-6.rs b/src/test/ui/numbers-arithmetic/overflowing-rsh-6.rs
similarity index 95%
rename from src/test/run-fail/overflowing-rsh-6.rs
rename to src/test/ui/numbers-arithmetic/overflowing-rsh-6.rs
index c2fec5e4860af..6f14be0503482 100644
--- a/src/test/run-fail/overflowing-rsh-6.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-rsh-6.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to shift right with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/ui/numbers-arithmetic/overflowing-rsh-6.stderr b/src/test/ui/numbers-arithmetic/overflowing-rsh-6.stderr
new file mode 100644
index 0000000000000..65f8b201a18a8
--- /dev/null
+++ b/src/test/ui/numbers-arithmetic/overflowing-rsh-6.stderr
@@ -0,0 +1,20 @@
+warning: the feature `const_indexing` has been stable since 1.26.0 and no longer requires an attribute to enable
+  --> $DIR/overflowing-rsh-6.rs:7:12
+   |
+LL | #![feature(const_indexing)]
+   |            ^^^^^^^^^^^^^^
+   |
+   = note: `#[warn(stable_features)]` on by default
+
+warning: attempt to shift right with overflow
+  --> $DIR/overflowing-rsh-6.rs:10:14
+   |
+LL |     let _n = 1i64 >> [64][0];
+   |              ^^^^^^^^^^^^^^^
+   |
+note: lint level defined here
+  --> $DIR/overflowing-rsh-6.rs:6:9
+   |
+LL | #![warn(const_err)]
+   |         ^^^^^^^^^
+
diff --git a/src/test/run-fail/overflowing-sub.rs b/src/test/ui/numbers-arithmetic/overflowing-sub.rs
similarity index 93%
rename from src/test/run-fail/overflowing-sub.rs
rename to src/test/ui/numbers-arithmetic/overflowing-sub.rs
index e3b111dd2bba6..97252815b4086 100644
--- a/src/test/run-fail/overflowing-sub.rs
+++ b/src/test/ui/numbers-arithmetic/overflowing-sub.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'attempt to subtract with overflow'
 // compile-flags: -C debug-assertions
 
diff --git a/src/test/run-fail/promoted_div_by_zero.rs b/src/test/ui/numbers-arithmetic/promoted_div_by_zero.rs
similarity index 90%
rename from src/test/run-fail/promoted_div_by_zero.rs
rename to src/test/ui/numbers-arithmetic/promoted_div_by_zero.rs
index 3fe51a19c20bb..158153f9c5576 100644
--- a/src/test/run-fail/promoted_div_by_zero.rs
+++ b/src/test/ui/numbers-arithmetic/promoted_div_by_zero.rs
@@ -1,5 +1,6 @@
 #![allow(const_err)]
 
+// run-fail
 // error-pattern: attempt to divide by zero
 
 fn main() {
diff --git a/src/test/run-fail/promoted_overflow.rs b/src/test/ui/numbers-arithmetic/promoted_overflow.rs
similarity index 92%
rename from src/test/run-fail/promoted_overflow.rs
rename to src/test/ui/numbers-arithmetic/promoted_overflow.rs
index 139bf54095970..ccccc955bebcc 100644
--- a/src/test/run-fail/promoted_overflow.rs
+++ b/src/test/ui/numbers-arithmetic/promoted_overflow.rs
@@ -1,5 +1,6 @@
 #![allow(const_err)]
 
+// run-fail
 // error-pattern: overflow
 // compile-flags: -C overflow-checks=yes
 
diff --git a/src/test/run-fail/args-panic.rs b/src/test/ui/panics/args-panic.rs
similarity index 93%
rename from src/test/run-fail/args-panic.rs
rename to src/test/ui/panics/args-panic.rs
index 9a62652dde1e1..cdf1ef447521e 100644
--- a/src/test/run-fail/args-panic.rs
+++ b/src/test/ui/panics/args-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:meep
 
 #![feature(box_syntax)]
diff --git a/src/test/run-fail/die-macro-expr.rs b/src/test/ui/panics/die-macro-expr.rs
similarity index 86%
rename from src/test/run-fail/die-macro-expr.rs
rename to src/test/ui/panics/die-macro-expr.rs
index 70413f978969c..05f821acdf569 100644
--- a/src/test/run-fail/die-macro-expr.rs
+++ b/src/test/ui/panics/die-macro-expr.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:test
 
 fn main() {
diff --git a/src/test/run-fail/die-macro-pure.rs b/src/test/ui/panics/die-macro-pure.rs
similarity index 86%
rename from src/test/run-fail/die-macro-pure.rs
rename to src/test/ui/panics/die-macro-pure.rs
index cec0742d5035b..1a86a7c22cc55 100644
--- a/src/test/run-fail/die-macro-pure.rs
+++ b/src/test/ui/panics/die-macro-pure.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:test
 
 fn f() {
diff --git a/src/test/run-fail/die-macro.rs b/src/test/ui/panics/die-macro.rs
similarity index 82%
rename from src/test/run-fail/die-macro.rs
rename to src/test/ui/panics/die-macro.rs
index 846b9ea24d3b7..11a3222440df1 100644
--- a/src/test/run-fail/die-macro.rs
+++ b/src/test/ui/panics/die-macro.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:test
 
 fn main() {
diff --git a/src/test/run-fail/doublepanic.rs b/src/test/ui/panics/doublepanic.rs
similarity index 89%
rename from src/test/run-fail/doublepanic.rs
rename to src/test/ui/panics/doublepanic.rs
index 10d303e491e44..ed0f9c457961d 100644
--- a/src/test/run-fail/doublepanic.rs
+++ b/src/test/ui/panics/doublepanic.rs
@@ -1,5 +1,6 @@
 #![allow(unreachable_code)]
 
+// run-fail
 // error-pattern:One
 fn main() {
     panic!("One");
diff --git a/src/test/run-fail/explicit-panic-msg.rs b/src/test/ui/panics/explicit-panic-msg.rs
similarity index 94%
rename from src/test/run-fail/explicit-panic-msg.rs
rename to src/test/ui/panics/explicit-panic-msg.rs
index 35e0518b9be57..80e6ad9c18a88 100644
--- a/src/test/run-fail/explicit-panic-msg.rs
+++ b/src/test/ui/panics/explicit-panic-msg.rs
@@ -1,6 +1,7 @@
 #![allow(unused_assignments)]
 #![allow(unused_variables)]
 
+// run-fail
 // error-pattern:wooooo
 fn main() {
     let mut a = 1;
diff --git a/src/test/run-fail/explicit-panic.rs b/src/test/ui/panics/explicit-panic.rs
similarity index 81%
rename from src/test/run-fail/explicit-panic.rs
rename to src/test/ui/panics/explicit-panic.rs
index 11ea6b4122128..eac27a5a9596f 100644
--- a/src/test/run-fail/explicit-panic.rs
+++ b/src/test/ui/panics/explicit-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:explicit
 fn main() {
     panic!();
diff --git a/src/test/run-fail/expr-fn-panic.rs b/src/test/ui/panics/expr-fn-panic.rs
similarity index 87%
rename from src/test/run-fail/expr-fn-panic.rs
rename to src/test/ui/panics/expr-fn-panic.rs
index 0532c32ec7028..e93439a1d17f9 100644
--- a/src/test/run-fail/expr-fn-panic.rs
+++ b/src/test/ui/panics/expr-fn-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:explicit panic
 
 fn f() -> ! {
diff --git a/src/test/run-fail/expr-if-panic-fn.rs b/src/test/ui/panics/expr-if-panic-fn.rs
similarity index 93%
rename from src/test/run-fail/expr-if-panic-fn.rs
rename to src/test/ui/panics/expr-if-panic-fn.rs
index 660b1396e38a9..7ddd4bc5e0f45 100644
--- a/src/test/run-fail/expr-if-panic-fn.rs
+++ b/src/test/ui/panics/expr-if-panic-fn.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:explicit panic
 
 fn f() -> ! {
diff --git a/src/test/run-fail/expr-if-panic.rs b/src/test/ui/panics/expr-if-panic.rs
similarity index 92%
rename from src/test/run-fail/expr-if-panic.rs
rename to src/test/ui/panics/expr-if-panic.rs
index 36aaf459a56ee..4ab73dc736a3a 100644
--- a/src/test/run-fail/expr-if-panic.rs
+++ b/src/test/ui/panics/expr-if-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:explicit panic
 
 fn main() {
diff --git a/src/test/run-fail/expr-match-panic-fn.rs b/src/test/ui/panics/expr-match-panic-fn.rs
similarity index 94%
rename from src/test/run-fail/expr-match-panic-fn.rs
rename to src/test/ui/panics/expr-match-panic-fn.rs
index 120df61b4bfe6..c5bd7382f9f21 100644
--- a/src/test/run-fail/expr-match-panic-fn.rs
+++ b/src/test/ui/panics/expr-match-panic-fn.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:explicit panic
 
 fn f() -> ! {
diff --git a/src/test/run-fail/expr-match-panic.rs b/src/test/ui/panics/expr-match-panic.rs
similarity index 91%
rename from src/test/run-fail/expr-match-panic.rs
rename to src/test/ui/panics/expr-match-panic.rs
index b2f0179a08323..76144314fad21 100644
--- a/src/test/run-fail/expr-match-panic.rs
+++ b/src/test/ui/panics/expr-match-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:explicit panic
 
 fn main() {
diff --git a/src/test/run-fail/fmt-panic.rs b/src/test/ui/panics/fmt-panic.rs
similarity index 90%
rename from src/test/run-fail/fmt-panic.rs
rename to src/test/ui/panics/fmt-panic.rs
index 5749991914c02..8024f7b6166d6 100644
--- a/src/test/run-fail/fmt-panic.rs
+++ b/src/test/ui/panics/fmt-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:meh
 
 fn main() {
diff --git a/src/test/run-fail/for-each-loop-panic.rs b/src/test/ui/panics/for-each-loop-panic.rs
similarity index 89%
rename from src/test/run-fail/for-each-loop-panic.rs
rename to src/test/ui/panics/for-each-loop-panic.rs
index d24e81e152c3c..1d0dbe176aef8 100644
--- a/src/test/run-fail/for-each-loop-panic.rs
+++ b/src/test/ui/panics/for-each-loop-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:moop
 
 fn main() {
diff --git a/src/test/run-fail/glob-use-std.rs b/src/test/ui/panics/glob-use-std.rs
similarity index 89%
rename from src/test/run-fail/glob-use-std.rs
rename to src/test/ui/panics/glob-use-std.rs
index d19a782986b16..b6a49b70e651d 100644
--- a/src/test/run-fail/glob-use-std.rs
+++ b/src/test/ui/panics/glob-use-std.rs
@@ -1,3 +1,4 @@
+// run-fail
 // Issue #7580
 
 // error-pattern:panic works
diff --git a/src/test/run-fail/if-check-panic.rs b/src/test/ui/panics/if-check-panic.rs
similarity index 96%
rename from src/test/run-fail/if-check-panic.rs
rename to src/test/ui/panics/if-check-panic.rs
index f9a4b8fcb38a5..ef69af00e63bb 100644
--- a/src/test/run-fail/if-check-panic.rs
+++ b/src/test/ui/panics/if-check-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:Number is odd
 fn even(x: usize) -> bool {
     if x < 2 {
diff --git a/src/test/run-fail/if-cond-bot.rs b/src/test/ui/panics/if-cond-bot.rs
similarity index 92%
rename from src/test/run-fail/if-cond-bot.rs
rename to src/test/ui/panics/if-cond-bot.rs
index c680cad258f24..5f535ea2829ff 100644
--- a/src/test/run-fail/if-cond-bot.rs
+++ b/src/test/ui/panics/if-cond-bot.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:quux
 fn my_err(s: String) -> ! {
     println!("{}", s);
diff --git a/src/test/run-fail/main-panic.rs b/src/test/ui/panics/main-panic.rs
similarity index 85%
rename from src/test/run-fail/main-panic.rs
rename to src/test/ui/panics/main-panic.rs
index 3a9409562db6a..34bd9f8e0c6f1 100644
--- a/src/test/run-fail/main-panic.rs
+++ b/src/test/ui/panics/main-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at
 
 fn main() {
diff --git a/src/test/run-fail/panic-arg.rs b/src/test/ui/panics/panic-arg.rs
similarity index 89%
rename from src/test/run-fail/panic-arg.rs
rename to src/test/ui/panics/panic-arg.rs
index c164ff94630b1..c4e2090d25abd 100644
--- a/src/test/run-fail/panic-arg.rs
+++ b/src/test/ui/panics/panic-arg.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:woe
 fn f(a: isize) {
     println!("{}", a);
diff --git a/src/test/run-fail/panic-macro-any-wrapped.rs b/src/test/ui/panics/panic-macro-any-wrapped.rs
similarity index 87%
rename from src/test/run-fail/panic-macro-any-wrapped.rs
rename to src/test/ui/panics/panic-macro-any-wrapped.rs
index 83eb39a538f16..85737e947a17d 100644
--- a/src/test/run-fail/panic-macro-any-wrapped.rs
+++ b/src/test/ui/panics/panic-macro-any-wrapped.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:panicked at 'Box<Any>'
 
 fn main() {
diff --git a/src/test/run-fail/panic-macro-any.rs b/src/test/ui/panics/panic-macro-any.rs
similarity index 91%
rename from src/test/run-fail/panic-macro-any.rs
rename to src/test/ui/panics/panic-macro-any.rs
index 72d42e5b799cd..835284a1d9f6c 100644
--- a/src/test/run-fail/panic-macro-any.rs
+++ b/src/test/ui/panics/panic-macro-any.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:panicked at 'Box<Any>'
 
 #![feature(box_syntax)]
diff --git a/src/test/ui/panics/panic-macro-any.stderr b/src/test/ui/panics/panic-macro-any.stderr
new file mode 100644
index 0000000000000..7325fa78ddf83
--- /dev/null
+++ b/src/test/ui/panics/panic-macro-any.stderr
@@ -0,0 +1,8 @@
+warning: trait objects without an explicit `dyn` are deprecated
+  --> $DIR/panic-macro-any.rs:7:27
+   |
+LL |     panic!(box 413 as Box<::std::any::Any + Send>);
+   |                           ^^^^^^^^^^^^^^^^^^^^^^ help: use `dyn`: `dyn ::std::any::Any + Send`
+   |
+   = note: `#[warn(bare_trait_objects)]` on by default
+
diff --git a/src/test/run-fail/panic-macro-explicit.rs b/src/test/ui/panics/panic-macro-explicit.rs
similarity index 86%
rename from src/test/run-fail/panic-macro-explicit.rs
rename to src/test/ui/panics/panic-macro-explicit.rs
index f632034807cd4..f27bdda3f321f 100644
--- a/src/test/run-fail/panic-macro-explicit.rs
+++ b/src/test/ui/panics/panic-macro-explicit.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:panicked at 'explicit panic'
 
 fn main() {
diff --git a/src/test/run-fail/panic-macro-fmt.rs b/src/test/ui/panics/panic-macro-fmt.rs
similarity index 90%
rename from src/test/run-fail/panic-macro-fmt.rs
rename to src/test/ui/panics/panic-macro-fmt.rs
index 658ae56e7e49f..c18d7830d0646 100644
--- a/src/test/run-fail/panic-macro-fmt.rs
+++ b/src/test/ui/panics/panic-macro-fmt.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:panicked at 'test-fail-fmt 42 rust'
 
 fn main() {
diff --git a/src/test/run-fail/panic-macro-owned.rs b/src/test/ui/panics/panic-macro-owned.rs
similarity index 88%
rename from src/test/run-fail/panic-macro-owned.rs
rename to src/test/ui/panics/panic-macro-owned.rs
index 9b935717638bc..fd56cfa3bb8a8 100644
--- a/src/test/run-fail/panic-macro-owned.rs
+++ b/src/test/ui/panics/panic-macro-owned.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:panicked at 'test-fail-owned'
 
 fn main() {
diff --git a/src/test/run-fail/panic-macro-static.rs b/src/test/ui/panics/panic-macro-static.rs
similarity index 88%
rename from src/test/run-fail/panic-macro-static.rs
rename to src/test/ui/panics/panic-macro-static.rs
index 31ac488beb234..a78732ed39840 100644
--- a/src/test/run-fail/panic-macro-static.rs
+++ b/src/test/ui/panics/panic-macro-static.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:panicked at 'test-fail-static'
 
 fn main() {
diff --git a/src/test/run-fail/panic-main.rs b/src/test/ui/panics/panic-main.rs
similarity index 82%
rename from src/test/run-fail/panic-main.rs
rename to src/test/ui/panics/panic-main.rs
index 881eb7b5823b7..1b6f76b90f80b 100644
--- a/src/test/run-fail/panic-main.rs
+++ b/src/test/ui/panics/panic-main.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:moop
 fn main() {
     panic!("moop");
diff --git a/src/test/run-fail/panic-parens.rs b/src/test/ui/panics/panic-parens.rs
similarity index 96%
rename from src/test/run-fail/panic-parens.rs
rename to src/test/ui/panics/panic-parens.rs
index e7f98e58c4f39..eaf82ae9c5ec5 100644
--- a/src/test/run-fail/panic-parens.rs
+++ b/src/test/ui/panics/panic-parens.rs
@@ -1,3 +1,4 @@
+// run-fail
 // Fail macros without arguments need to be disambiguated in
 // certain positions
 // error-pattern:oops
diff --git a/src/test/run-fail/panic-set-handler.rs b/src/test/ui/panics/panic-set-handler.rs
similarity index 94%
rename from src/test/run-fail/panic-set-handler.rs
rename to src/test/ui/panics/panic-set-handler.rs
index ea2b152c6c45a..55542e58433c6 100644
--- a/src/test/run-fail/panic-set-handler.rs
+++ b/src/test/ui/panics/panic-set-handler.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:greetings from the panic handler
 
 use std::panic;
diff --git a/src/test/run-fail/panic-set-unset-handler.rs b/src/test/ui/panics/panic-set-unset-handler.rs
similarity index 94%
rename from src/test/run-fail/panic-set-unset-handler.rs
rename to src/test/ui/panics/panic-set-unset-handler.rs
index f8809c2f3889e..6b4c047eaf2de 100644
--- a/src/test/run-fail/panic-set-unset-handler.rs
+++ b/src/test/ui/panics/panic-set-unset-handler.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'foobar'
 
 use std::panic;
diff --git a/src/test/run-fail/panic-take-handler-nop.rs b/src/test/ui/panics/panic-take-handler-nop.rs
similarity index 91%
rename from src/test/run-fail/panic-take-handler-nop.rs
rename to src/test/ui/panics/panic-take-handler-nop.rs
index bb191a38f8473..e519209a5a6d0 100644
--- a/src/test/run-fail/panic-take-handler-nop.rs
+++ b/src/test/ui/panics/panic-take-handler-nop.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'main' panicked at 'foobar'
 
 use std::panic;
diff --git a/src/test/run-fail/panic-task-name-none.rs b/src/test/ui/panics/panic-task-name-none.rs
similarity index 96%
rename from src/test/run-fail/panic-task-name-none.rs
rename to src/test/ui/panics/panic-task-name-none.rs
index c7f504046baed..4e95fb5bdb803 100644
--- a/src/test/run-fail/panic-task-name-none.rs
+++ b/src/test/ui/panics/panic-task-name-none.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread '<unnamed>' panicked at 'test'
 // ignore-emscripten Needs threads
 
diff --git a/src/test/run-fail/panic-task-name-owned.rs b/src/test/ui/panics/panic-task-name-owned.rs
similarity index 97%
rename from src/test/run-fail/panic-task-name-owned.rs
rename to src/test/ui/panics/panic-task-name-owned.rs
index 58f76ff787f9f..f85be7bb8e299 100644
--- a/src/test/run-fail/panic-task-name-owned.rs
+++ b/src/test/ui/panics/panic-task-name-owned.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:thread 'owned name' panicked at 'test'
 // ignore-emscripten Needs threads.
 
diff --git a/src/test/run-fail/panic.rs b/src/test/ui/panics/panic.rs
similarity index 83%
rename from src/test/run-fail/panic.rs
rename to src/test/ui/panics/panic.rs
index 95f20dedad26c..6261fb1ce5701 100644
--- a/src/test/run-fail/panic.rs
+++ b/src/test/ui/panics/panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:1 == 2
 fn main() {
     assert!(1 == 2);
diff --git a/src/test/run-fail/result-get-panic.rs b/src/test/ui/panics/result-get-panic.rs
similarity index 93%
rename from src/test/run-fail/result-get-panic.rs
rename to src/test/ui/panics/result-get-panic.rs
index cddf20ee49df3..41bc13bf085b4 100644
--- a/src/test/run-fail/result-get-panic.rs
+++ b/src/test/ui/panics/result-get-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:called `Result::unwrap()` on an `Err` value
 
 use std::result::Result::Err;
diff --git a/src/test/run-fail/unique-panic.rs b/src/test/ui/panics/unique-panic.rs
similarity index 84%
rename from src/test/run-fail/unique-panic.rs
rename to src/test/ui/panics/unique-panic.rs
index adefd796af492..22e0d63d5946f 100644
--- a/src/test/run-fail/unique-panic.rs
+++ b/src/test/ui/panics/unique-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern: panic
 
 fn main() {
diff --git a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
similarity index 95%
rename from src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
rename to src/test/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
index 796729ac4cc28..724ce50904182 100644
--- a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
+++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:returned Box<dyn Error> from main()
 // failure-status: 1
 
diff --git a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-never.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-for-never.rs
similarity index 85%
rename from src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-never.rs
rename to src/test/ui/rfc-1937-termination-trait/termination-trait-for-never.rs
index cb37b8e067090..d5b6b5016d4c6 100644
--- a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-never.rs
+++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-for-never.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:oh, dear
 
 fn main() -> ! {
diff --git a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs
similarity index 95%
rename from src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs
rename to src/test/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs
index 2f3a73a30ad95..a99480e57abde 100644
--- a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs
+++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-for-result-box-error_err.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:returned Box<Error> from main()
 // failure-status: 1
 
diff --git a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-str.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-for-str.rs
similarity index 92%
rename from src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-str.rs
rename to src/test/ui/rfc-1937-termination-trait/termination-trait-for-str.rs
index bd6fa8af93513..c78477e4eee2d 100644
--- a/src/test/run-fail/rfc-1937-termination-trait/termination-trait-for-str.rs
+++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-for-str.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern: An error message for you
 // failure-status: 1
 
diff --git a/src/test/run-fail/rhs-type.rs b/src/test/ui/rhs-type.rs
similarity index 95%
rename from src/test/run-fail/rhs-type.rs
rename to src/test/ui/rhs-type.rs
index 6efbeadd70421..7b59329c20f4e 100644
--- a/src/test/run-fail/rhs-type.rs
+++ b/src/test/ui/rhs-type.rs
@@ -1,3 +1,4 @@
+// run-fail
 // Tests that codegen treats the rhs of pth's decl
 // as a _|_-typed thing, not a str-typed thing
 // error-pattern:bye
diff --git a/src/test/run-fail/str-overrun.rs b/src/test/ui/str/str-overrun.rs
similarity index 94%
rename from src/test/run-fail/str-overrun.rs
rename to src/test/ui/str/str-overrun.rs
index e566308a08767..f23c7314e3181 100644
--- a/src/test/run-fail/str-overrun.rs
+++ b/src/test/ui/str/str-overrun.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:index out of bounds: the len is 5 but the index is 5
 fn main() {
     let s: String = "hello".to_string();
diff --git a/src/test/run-fail/run-unexported-tests.rs b/src/test/ui/test-attrs/run-unexported-tests.rs
similarity index 94%
rename from src/test/run-fail/run-unexported-tests.rs
rename to src/test/ui/test-attrs/run-unexported-tests.rs
index 11e100e716eb4..2bff37e40c499 100644
--- a/src/test/run-fail/run-unexported-tests.rs
+++ b/src/test/ui/test-attrs/run-unexported-tests.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:ran an unexported test
 // compile-flags:--test
 // check-stdout
diff --git a/src/test/run-fail/test-panic.rs b/src/test/ui/test-attrs/test-panic.rs
similarity index 92%
rename from src/test/run-fail/test-panic.rs
rename to src/test/ui/test-attrs/test-panic.rs
index 92f5146b710f2..6217f279b5aea 100644
--- a/src/test/run-fail/test-panic.rs
+++ b/src/test/ui/test-attrs/test-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // check-stdout
 // error-pattern:thread 'test_foo' panicked at
 // compile-flags: --test
diff --git a/src/test/run-fail/test-should-fail-bad-message.rs b/src/test/ui/test-attrs/test-should-fail-bad-message.rs
similarity index 94%
rename from src/test/run-fail/test-should-fail-bad-message.rs
rename to src/test/ui/test-attrs/test-should-fail-bad-message.rs
index 3c69bb07d3b18..413d0b8d942db 100644
--- a/src/test/run-fail/test-should-fail-bad-message.rs
+++ b/src/test/ui/test-attrs/test-should-fail-bad-message.rs
@@ -1,3 +1,4 @@
+// run-fail
 // check-stdout
 // error-pattern:thread 'test_foo' panicked at
 // compile-flags: --test
diff --git a/src/test/run-fail/test-should-panic-bad-message.rs b/src/test/ui/test-attrs/test-should-panic-bad-message.rs
similarity index 92%
rename from src/test/run-fail/test-should-panic-bad-message.rs
rename to src/test/ui/test-attrs/test-should-panic-bad-message.rs
index b73d4d7377a34..3c8a736337f7b 100644
--- a/src/test/run-fail/test-should-panic-bad-message.rs
+++ b/src/test/ui/test-attrs/test-should-panic-bad-message.rs
@@ -1,5 +1,6 @@
 // compile-flags: --test
 
+// run-fail
 // error-pattern:panicked at 'bar'
 // check-stdout
 #[test]
diff --git a/src/test/run-fail/test-should-panic-no-message.rs b/src/test/ui/test-attrs/test-should-panic-no-message.rs
similarity index 93%
rename from src/test/run-fail/test-should-panic-no-message.rs
rename to src/test/ui/test-attrs/test-should-panic-no-message.rs
index b18389ec7440e..dbf7b44c43926 100644
--- a/src/test/run-fail/test-should-panic-no-message.rs
+++ b/src/test/ui/test-attrs/test-should-panic-no-message.rs
@@ -1,5 +1,6 @@
 // compile-flags: --test
 
+// run-fail
 // error-pattern:panicked at 'explicit panic'
 // check-stdout
 #[test]
diff --git a/src/test/run-fail/test-tasks-invalid-value.rs b/src/test/ui/test-attrs/test-tasks-invalid-value.rs
similarity index 95%
rename from src/test/run-fail/test-tasks-invalid-value.rs
rename to src/test/ui/test-attrs/test-tasks-invalid-value.rs
index 2dae1b4592c0f..6411421429c4c 100644
--- a/src/test/run-fail/test-tasks-invalid-value.rs
+++ b/src/test/ui/test-attrs/test-tasks-invalid-value.rs
@@ -1,6 +1,7 @@
 // This checks that RUST_TEST_THREADS not being 1, 2, ... is detected
 // properly.
 
+// run-fail
 // error-pattern:should be a positive integer
 // compile-flags: --test
 // exec-env:RUST_TEST_THREADS=foo
diff --git a/src/test/run-fail/task-spawn-barefn.rs b/src/test/ui/threads-sendsync/task-spawn-barefn.rs
similarity index 97%
rename from src/test/run-fail/task-spawn-barefn.rs
rename to src/test/ui/threads-sendsync/task-spawn-barefn.rs
index 497c5ea71804f..e5b899e0af967 100644
--- a/src/test/run-fail/task-spawn-barefn.rs
+++ b/src/test/ui/threads-sendsync/task-spawn-barefn.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:Ensure that the child thread runs by panicking
 // ignore-emscripten Needs threads.
 
diff --git a/src/test/run-fail/tls-exit-status.rs b/src/test/ui/tls-exit-status.rs
similarity index 93%
rename from src/test/run-fail/tls-exit-status.rs
rename to src/test/ui/tls-exit-status.rs
index f15fd4f6894f7..973bb9c4f0c6f 100644
--- a/src/test/run-fail/tls-exit-status.rs
+++ b/src/test/ui/tls-exit-status.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:nonzero
 // exec-env:RUST_NEWRT=1
 // ignore-cloudabi no std::env
diff --git a/src/test/run-fail/dst-raw-slice.rs b/src/test/ui/unsafe/dst-raw-slice.rs
similarity index 93%
rename from src/test/run-fail/dst-raw-slice.rs
rename to src/test/ui/unsafe/dst-raw-slice.rs
index 561b1fb42ed06..b8bb6dc599f65 100644
--- a/src/test/run-fail/dst-raw-slice.rs
+++ b/src/test/ui/unsafe/dst-raw-slice.rs
@@ -1,4 +1,5 @@
 // Test bounds checking for DST raw slices
+// run-fail
 // error-pattern:index out of bounds
 
 fn main() {
diff --git a/src/test/run-fail/unwind-interleaved.rs b/src/test/ui/unwind-interleaved.rs
similarity index 91%
rename from src/test/run-fail/unwind-interleaved.rs
rename to src/test/ui/unwind-interleaved.rs
index c163678ae9873..a61d4f06b374f 100644
--- a/src/test/run-fail/unwind-interleaved.rs
+++ b/src/test/ui/unwind-interleaved.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:fail
 
 fn a() {}
diff --git a/src/test/run-fail/unwind-rec.rs b/src/test/ui/unwind-rec.rs
similarity index 92%
rename from src/test/run-fail/unwind-rec.rs
rename to src/test/ui/unwind-rec.rs
index 83ac19ff4a533..912082e735f94 100644
--- a/src/test/run-fail/unwind-rec.rs
+++ b/src/test/ui/unwind-rec.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:fail
 
 
diff --git a/src/test/run-fail/unwind-rec2.rs b/src/test/ui/unwind-rec2.rs
similarity index 95%
rename from src/test/run-fail/unwind-rec2.rs
rename to src/test/ui/unwind-rec2.rs
index 4dfc282b6c0f5..6c37d1d040a86 100644
--- a/src/test/run-fail/unwind-rec2.rs
+++ b/src/test/ui/unwind-rec2.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:fail
 
 
diff --git a/src/test/run-fail/unwind-unique.rs b/src/test/ui/unwind-unique-panic.rs
similarity index 89%
rename from src/test/run-fail/unwind-unique.rs
rename to src/test/ui/unwind-unique-panic.rs
index 7b761faad9534..ffb424b2d3cee 100644
--- a/src/test/run-fail/unwind-unique.rs
+++ b/src/test/ui/unwind-unique-panic.rs
@@ -1,3 +1,4 @@
+// run-fail
 // error-pattern:fail
 
 fn failfn() {