diff --git a/src/test/ui/nullable-pointer-ffi-compat.rs b/src/test/ui/abi/nullable-pointer-ffi-compat.rs
similarity index 100%
rename from src/test/ui/nullable-pointer-ffi-compat.rs
rename to src/test/ui/abi/nullable-pointer-ffi-compat.rs
diff --git a/src/test/ui/issues/issue-76179.rs b/src/test/ui/associated-types/issue-76179.rs
similarity index 100%
rename from src/test/ui/issues/issue-76179.rs
rename to src/test/ui/associated-types/issue-76179.rs
diff --git a/src/test/ui/issue-74047.rs b/src/test/ui/async-await/issue-74047.rs
similarity index 100%
rename from src/test/ui/issue-74047.rs
rename to src/test/ui/async-await/issue-74047.rs
diff --git a/src/test/ui/issue-74047.stderr b/src/test/ui/async-await/issue-74047.stderr
similarity index 100%
rename from src/test/ui/issue-74047.stderr
rename to src/test/ui/async-await/issue-74047.stderr
diff --git a/src/test/ui/issues/issue-42344.rs b/src/test/ui/borrowck/issue-42344.rs
similarity index 100%
rename from src/test/ui/issues/issue-42344.rs
rename to src/test/ui/borrowck/issue-42344.rs
diff --git a/src/test/ui/issues/issue-42344.stderr b/src/test/ui/borrowck/issue-42344.stderr
similarity index 100%
rename from src/test/ui/issues/issue-42344.stderr
rename to src/test/ui/borrowck/issue-42344.stderr
diff --git a/src/test/ui/issues/auxiliary/issue-17718-aux.rs b/src/test/ui/consts/auxiliary/issue-17718-aux.rs
similarity index 100%
rename from src/test/ui/issues/auxiliary/issue-17718-aux.rs
rename to src/test/ui/consts/auxiliary/issue-17718-aux.rs
diff --git a/src/test/ui/issues/issue-17718.rs b/src/test/ui/consts/issue-17718.rs
similarity index 100%
rename from src/test/ui/issues/issue-17718.rs
rename to src/test/ui/consts/issue-17718.rs
diff --git a/src/test/ui/issues/issue-3521.fixed b/src/test/ui/consts/issue-3521.fixed
similarity index 100%
rename from src/test/ui/issues/issue-3521.fixed
rename to src/test/ui/consts/issue-3521.fixed
diff --git a/src/test/ui/issues/issue-3521.rs b/src/test/ui/consts/issue-3521.rs
similarity index 100%
rename from src/test/ui/issues/issue-3521.rs
rename to src/test/ui/consts/issue-3521.rs
diff --git a/src/test/ui/issues/issue-3521.stderr b/src/test/ui/consts/issue-3521.stderr
similarity index 100%
rename from src/test/ui/issues/issue-3521.stderr
rename to src/test/ui/consts/issue-3521.stderr
diff --git a/src/test/ui/issues/issue-2633-2.rs b/src/test/ui/issues/issue-2633-2.rs
deleted file mode 100644
index 02c1a166301eb..0000000000000
--- a/src/test/ui/issues/issue-2633-2.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// run-pass
-// pretty-expanded FIXME #23616
-
-#![feature(box_syntax)]
-
-
-fn a_val(x: Box<isize>, y: Box<isize>) -> isize {
-    *x + *y
-}
-
-pub fn main() {
-    let z: Box<_> = box 22;
-    a_val(z.clone(), z.clone());
-}
diff --git a/src/test/ui/issues/issue-2633.rs b/src/test/ui/issues/issue-2633.rs
deleted file mode 100644
index 7e8cea75fc8db..0000000000000
--- a/src/test/ui/issues/issue-2633.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-// run-pass
-#![allow(dead_code)]
-#![allow(non_camel_case_types)]
-
-#[derive(Copy, Clone)]
-struct cat {
-    meow: extern "Rust" fn(),
-}
-
-fn meow() {
-    println!("meow")
-}
-
-fn cat() -> cat {
-    cat {
-        meow: meow,
-    }
-}
-
-#[derive(Copy, Clone)]
-struct KittyInfo {kitty: cat}
-
-// Code compiles and runs successfully if we add a + before the first arg
-fn nyan(kitty: cat, _kitty_info: KittyInfo) {
-    (kitty.meow)();
-}
-
-pub fn main() {
-    let kitty = cat();
-    nyan(kitty, KittyInfo {kitty: kitty});
-}
diff --git a/src/test/ui/lint-expr-stmt-attrs-for-early-lints.rs b/src/test/ui/lint/lint-expr-stmt-attrs-for-early-lints.rs
similarity index 100%
rename from src/test/ui/lint-expr-stmt-attrs-for-early-lints.rs
rename to src/test/ui/lint/lint-expr-stmt-attrs-for-early-lints.rs
diff --git a/src/test/ui/issues/issue-52992.rs b/src/test/ui/nll/issue-52992.rs
similarity index 100%
rename from src/test/ui/issues/issue-52992.rs
rename to src/test/ui/nll/issue-52992.rs
diff --git a/src/test/ui/issues/issue-7222.rs b/src/test/ui/parser/issue-7222.rs
similarity index 100%
rename from src/test/ui/issues/issue-7222.rs
rename to src/test/ui/parser/issue-7222.rs
diff --git a/src/test/ui/issue-6157.rs b/src/test/ui/regions/issue-6157.rs
similarity index 100%
rename from src/test/ui/issue-6157.rs
rename to src/test/ui/regions/issue-6157.rs
diff --git a/src/test/ui/issues/issue-2330.rs b/src/test/ui/resolve/issue-2330.rs
similarity index 100%
rename from src/test/ui/issues/issue-2330.rs
rename to src/test/ui/resolve/issue-2330.rs
diff --git a/src/test/ui/issues/issue-2330.stderr b/src/test/ui/resolve/issue-2330.stderr
similarity index 100%
rename from src/test/ui/issues/issue-2330.stderr
rename to src/test/ui/resolve/issue-2330.stderr
diff --git a/src/test/ui/issues/issue-15261.rs b/src/test/ui/statics/issue-15261.rs
similarity index 100%
rename from src/test/ui/issues/issue-15261.rs
rename to src/test/ui/statics/issue-15261.rs
diff --git a/src/test/ui/issues/issue-44373-2.rs b/src/test/ui/statics/issue-44373-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-44373-2.rs
rename to src/test/ui/statics/issue-44373-2.rs
diff --git a/src/test/ui/issues/issue-44373.rs b/src/test/ui/statics/issue-44373.rs
similarity index 100%
rename from src/test/ui/issues/issue-44373.rs
rename to src/test/ui/statics/issue-44373.rs
diff --git a/src/test/ui/issues/issue-44373.stderr b/src/test/ui/statics/issue-44373.stderr
similarity index 100%
rename from src/test/ui/issues/issue-44373.stderr
rename to src/test/ui/statics/issue-44373.stderr
diff --git a/src/test/ui/impl-bounds-checking.rs b/src/test/ui/traits/impl-bounds-checking.rs
similarity index 100%
rename from src/test/ui/impl-bounds-checking.rs
rename to src/test/ui/traits/impl-bounds-checking.rs
diff --git a/src/test/ui/impl-bounds-checking.stderr b/src/test/ui/traits/impl-bounds-checking.stderr
similarity index 100%
rename from src/test/ui/impl-bounds-checking.stderr
rename to src/test/ui/traits/impl-bounds-checking.stderr
diff --git a/src/test/ui/issues/issue-28576.rs b/src/test/ui/traits/issue-28576.rs
similarity index 100%
rename from src/test/ui/issues/issue-28576.rs
rename to src/test/ui/traits/issue-28576.rs
diff --git a/src/test/ui/issues/issue-28576.stderr b/src/test/ui/traits/issue-28576.stderr
similarity index 100%
rename from src/test/ui/issues/issue-28576.stderr
rename to src/test/ui/traits/issue-28576.stderr
diff --git a/src/test/ui/issues/issue-33140.rs b/src/test/ui/traits/issue-33140.rs
similarity index 100%
rename from src/test/ui/issues/issue-33140.rs
rename to src/test/ui/traits/issue-33140.rs
diff --git a/src/test/ui/issues/issue-33140.stderr b/src/test/ui/traits/issue-33140.stderr
similarity index 100%
rename from src/test/ui/issues/issue-33140.stderr
rename to src/test/ui/traits/issue-33140.stderr
diff --git a/src/test/ui/issues/issue-33140-traitobject-crate.rs b/src/test/ui/traits/object/issue-33140-traitobject-crate.rs
similarity index 100%
rename from src/test/ui/issues/issue-33140-traitobject-crate.rs
rename to src/test/ui/traits/object/issue-33140-traitobject-crate.rs
diff --git a/src/test/ui/issues/issue-33140-traitobject-crate.stderr b/src/test/ui/traits/object/issue-33140-traitobject-crate.stderr
similarity index 100%
rename from src/test/ui/issues/issue-33140-traitobject-crate.stderr
rename to src/test/ui/traits/object/issue-33140-traitobject-crate.stderr
diff --git a/src/test/ui/try-block.rs b/src/test/ui/try-block/try-block.rs
similarity index 100%
rename from src/test/ui/try-block.rs
rename to src/test/ui/try-block/try-block.rs
diff --git a/src/test/ui/tup.rs b/src/test/ui/tuple/tup.rs
similarity index 100%
rename from src/test/ui/tup.rs
rename to src/test/ui/tuple/tup.rs
diff --git a/src/test/ui/issues/issue-18661.rs b/src/test/ui/unboxed-closures/issue-18661.rs
similarity index 100%
rename from src/test/ui/issues/issue-18661.rs
rename to src/test/ui/unboxed-closures/issue-18661.rs
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 659d5ae03c9d8..c69bdca761181 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -8,7 +8,7 @@ use std::path::Path;
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
 const ROOT_ENTRY_LIMIT: usize = 1418;
-const ISSUES_ENTRY_LIMIT: usize = 2582;
+const ISSUES_ENTRY_LIMIT: usize = 2565;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     let dirs = walkdir::WalkDir::new(&path.join("test/ui"))