diff --git a/src/test/ui/issues/issue-29166.rs b/src/test/ui/borrowck/issue-29166.rs
similarity index 100%
rename from src/test/ui/issues/issue-29166.rs
rename to src/test/ui/borrowck/issue-29166.rs
diff --git a/src/test/ui/issues/issue-51301.rs b/src/test/ui/borrowck/issue-51301.rs
similarity index 100%
rename from src/test/ui/issues/issue-51301.rs
rename to src/test/ui/borrowck/issue-51301.rs
diff --git a/src/test/ui/issues/issue-51301.stderr b/src/test/ui/borrowck/issue-51301.stderr
similarity index 100%
rename from src/test/ui/issues/issue-51301.stderr
rename to src/test/ui/borrowck/issue-51301.stderr
diff --git a/src/test/ui/issues/issue-21486.rs b/src/test/ui/drop/issue-21486.rs
similarity index 100%
rename from src/test/ui/issues/issue-21486.rs
rename to src/test/ui/drop/issue-21486.rs
diff --git a/src/test/ui/issues/issue-15221.rs b/src/test/ui/hygiene/issue-15221.rs
similarity index 100%
rename from src/test/ui/issues/issue-15221.rs
rename to src/test/ui/hygiene/issue-15221.rs
diff --git a/src/test/ui/issues/issue-26930.rs b/src/test/ui/imports/issue-26930.rs
similarity index 100%
rename from src/test/ui/issues/issue-26930.rs
rename to src/test/ui/imports/issue-26930.rs
diff --git a/src/test/ui/issues/issue-5353.rs b/src/test/ui/issues/issue-5353.rs
deleted file mode 100644
index 1d6813d5a39bd..0000000000000
--- a/src/test/ui/issues/issue-5353.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// check-pass
-#![allow(dead_code)]
-// pretty-expanded FIXME #23616
-
-const INVALID_ENUM : u32 = 0;
-const INVALID_VALUE : u32 = 1;
-
-fn gl_err_str(err: u32) -> String
-{
-  match err
-  {
-    INVALID_ENUM => { "Invalid enum".to_string() },
-    INVALID_VALUE => { "Invalid value".to_string() },
-    _ => { "Unknown error".to_string() }
-  }
-}
-
-pub fn main() {}
diff --git a/src/test/ui/issues/issue-42954.fixed b/src/test/ui/macros/issue-42954.fixed
similarity index 100%
rename from src/test/ui/issues/issue-42954.fixed
rename to src/test/ui/macros/issue-42954.fixed
diff --git a/src/test/ui/issues/issue-42954.rs b/src/test/ui/macros/issue-42954.rs
similarity index 100%
rename from src/test/ui/issues/issue-42954.rs
rename to src/test/ui/macros/issue-42954.rs
diff --git a/src/test/ui/issues/issue-42954.stderr b/src/test/ui/macros/issue-42954.stderr
similarity index 100%
rename from src/test/ui/issues/issue-42954.stderr
rename to src/test/ui/macros/issue-42954.stderr
diff --git a/src/test/ui/issues/issue-51848.rs b/src/test/ui/macros/issue-51848.rs
similarity index 100%
rename from src/test/ui/issues/issue-51848.rs
rename to src/test/ui/macros/issue-51848.rs
diff --git a/src/test/ui/issues/issue-51848.stderr b/src/test/ui/macros/issue-51848.stderr
similarity index 100%
rename from src/test/ui/issues/issue-51848.stderr
rename to src/test/ui/macros/issue-51848.stderr
diff --git a/src/test/ui/issues/issue-29227.rs b/src/test/ui/mir/issue-29227.rs
similarity index 100%
rename from src/test/ui/issues/issue-29227.rs
rename to src/test/ui/mir/issue-29227.rs
diff --git a/src/test/ui/issues/issue-46845.rs b/src/test/ui/mir/issue-46845.rs
similarity index 100%
rename from src/test/ui/issues/issue-46845.rs
rename to src/test/ui/mir/issue-46845.rs
diff --git a/src/test/ui/issues/issue-77002.rs b/src/test/ui/mir/issue-77002.rs
similarity index 100%
rename from src/test/ui/issues/issue-77002.rs
rename to src/test/ui/mir/issue-77002.rs
diff --git a/src/test/ui/issues/issue-39616.rs b/src/test/ui/parser/issue-39616.rs
similarity index 100%
rename from src/test/ui/issues/issue-39616.rs
rename to src/test/ui/parser/issue-39616.rs
diff --git a/src/test/ui/issues/issue-39616.stderr b/src/test/ui/parser/issue-39616.stderr
similarity index 100%
rename from src/test/ui/issues/issue-39616.stderr
rename to src/test/ui/parser/issue-39616.stderr
diff --git a/src/test/ui/issues/issue-49257.rs b/src/test/ui/parser/issue-49257.rs
similarity index 100%
rename from src/test/ui/issues/issue-49257.rs
rename to src/test/ui/parser/issue-49257.rs
diff --git a/src/test/ui/issues/issue-49257.stderr b/src/test/ui/parser/issue-49257.stderr
similarity index 100%
rename from src/test/ui/issues/issue-49257.stderr
rename to src/test/ui/parser/issue-49257.stderr
diff --git a/src/test/ui/issues/auxiliary/issue-11225-1.rs b/src/test/ui/reachable/auxiliary/issue-11225-1.rs
similarity index 100%
rename from src/test/ui/issues/auxiliary/issue-11225-1.rs
rename to src/test/ui/reachable/auxiliary/issue-11225-1.rs
diff --git a/src/test/ui/issues/auxiliary/issue-11225-2.rs b/src/test/ui/reachable/auxiliary/issue-11225-2.rs
similarity index 100%
rename from src/test/ui/issues/auxiliary/issue-11225-2.rs
rename to src/test/ui/reachable/auxiliary/issue-11225-2.rs
diff --git a/src/test/ui/issues/auxiliary/issue-11225-3.rs b/src/test/ui/reachable/auxiliary/issue-11225-3.rs
similarity index 100%
rename from src/test/ui/issues/auxiliary/issue-11225-3.rs
rename to src/test/ui/reachable/auxiliary/issue-11225-3.rs
diff --git a/src/test/ui/issues/issue-11225-1.rs b/src/test/ui/reachable/issue-11225-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-11225-1.rs
rename to src/test/ui/reachable/issue-11225-1.rs
diff --git a/src/test/ui/issues/issue-11225-2.rs b/src/test/ui/reachable/issue-11225-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-11225-2.rs
rename to src/test/ui/reachable/issue-11225-2.rs
diff --git a/src/test/ui/issues/issue-11225-3.rs b/src/test/ui/reachable/issue-11225-3.rs
similarity index 100%
rename from src/test/ui/issues/issue-11225-3.rs
rename to src/test/ui/reachable/issue-11225-3.rs
diff --git a/src/test/ui/issues/issue-21058.rs b/src/test/ui/stdlib-unit-tests/issue-21058.rs
similarity index 100%
rename from src/test/ui/issues/issue-21058.rs
rename to src/test/ui/stdlib-unit-tests/issue-21058.rs
diff --git a/src/test/ui/issues/issue-38404.rs b/src/test/ui/traits/issue-38404.rs
similarity index 100%
rename from src/test/ui/issues/issue-38404.rs
rename to src/test/ui/traits/issue-38404.rs
diff --git a/src/test/ui/issues/issue-38404.stderr b/src/test/ui/traits/issue-38404.stderr
similarity index 100%
rename from src/test/ui/issues/issue-38404.stderr
rename to src/test/ui/traits/issue-38404.stderr
diff --git a/src/test/ui/issues/issue-50480.rs b/src/test/ui/traits/issue-50480.rs
similarity index 100%
rename from src/test/ui/issues/issue-50480.rs
rename to src/test/ui/traits/issue-50480.rs
diff --git a/src/test/ui/issues/issue-50480.stderr b/src/test/ui/traits/issue-50480.stderr
similarity index 100%
rename from src/test/ui/issues/issue-50480.stderr
rename to src/test/ui/traits/issue-50480.stderr
diff --git a/src/test/ui/issues/issue-37515.rs b/src/test/ui/type-alias/issue-37515.rs
similarity index 100%
rename from src/test/ui/issues/issue-37515.rs
rename to src/test/ui/type-alias/issue-37515.rs
diff --git a/src/test/ui/issues/issue-37515.stderr b/src/test/ui/type-alias/issue-37515.stderr
similarity index 100%
rename from src/test/ui/issues/issue-37515.stderr
rename to src/test/ui/type-alias/issue-37515.stderr
diff --git a/src/test/ui/issues/issue-33575.rs b/src/test/ui/typeck/issue-33575.rs
similarity index 100%
rename from src/test/ui/issues/issue-33575.rs
rename to src/test/ui/typeck/issue-33575.rs
diff --git a/src/test/ui/issues/issue-33575.stderr b/src/test/ui/typeck/issue-33575.stderr
similarity index 100%
rename from src/test/ui/issues/issue-33575.stderr
rename to src/test/ui/typeck/issue-33575.stderr
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index ee326e190ffa2..19e2528bb240a 100644
--- a/src/tools/tidy/src/ui_tests.rs
+++ b/src/tools/tidy/src/ui_tests.rs
@@ -10,7 +10,7 @@ use std::path::Path;
 const ENTRY_LIMIT: usize = 1000;
 // FIXME: The following limits should be reduced eventually.
 const ROOT_ENTRY_LIMIT: usize = 939;
-const ISSUES_ENTRY_LIMIT: usize = 2070;
+const ISSUES_ENTRY_LIMIT: usize = 2040;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     for dir in Walk::new(&path.join("test/ui")) {