diff --git a/src/test/ui/issues/issue-3044.rs b/src/test/ui/fn/issue-3044.rs
similarity index 100%
rename from src/test/ui/issues/issue-3044.rs
rename to src/test/ui/fn/issue-3044.rs
diff --git a/src/test/ui/issues/issue-3044.stderr b/src/test/ui/fn/issue-3044.stderr
similarity index 100%
rename from src/test/ui/issues/issue-3044.stderr
rename to src/test/ui/fn/issue-3044.stderr
diff --git a/src/test/ui/issues/issue-3904.rs b/src/test/ui/fn/issue-3904.rs
similarity index 100%
rename from src/test/ui/issues/issue-3904.rs
rename to src/test/ui/fn/issue-3904.rs
diff --git a/src/test/ui/issues/issue-6470.rs b/src/test/ui/issues/issue-6470.rs
deleted file mode 100644
index 8c6192a59db..00000000000
--- a/src/test/ui/issues/issue-6470.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// build-pass
-#![allow(dead_code)]
-#![allow(improper_ctypes)]
-// pretty-expanded FIXME #23616
-#![allow(non_snake_case)]
-
-pub mod Bar {
-    pub struct Foo {
-        v: isize,
-    }
-
-    extern "C" {
-        pub fn foo(v: *const Foo) -> Foo;
-    }
-}
-
-pub fn main() {}
diff --git a/src/test/ui/issues/issue-36381.rs b/src/test/ui/late-bound-lifetimes/issue-36381.rs
similarity index 100%
rename from src/test/ui/issues/issue-36381.rs
rename to src/test/ui/late-bound-lifetimes/issue-36381.rs
diff --git a/src/test/ui/issues/issue-25385.rs b/src/test/ui/macros/issue-25385.rs
similarity index 100%
rename from src/test/ui/issues/issue-25385.rs
rename to src/test/ui/macros/issue-25385.rs
diff --git a/src/test/ui/issues/issue-25385.stderr b/src/test/ui/macros/issue-25385.stderr
similarity index 100%
rename from src/test/ui/issues/issue-25385.stderr
rename to src/test/ui/macros/issue-25385.stderr
diff --git a/src/test/ui/issues/issue-5530.rs b/src/test/ui/match/issue-5530.rs
similarity index 100%
rename from src/test/ui/issues/issue-5530.rs
rename to src/test/ui/match/issue-5530.rs
diff --git a/src/test/ui/issues/auxiliary/issue-30535.rs b/src/test/ui/resolve/auxiliary/issue-30535.rs
similarity index 100%
rename from src/test/ui/issues/auxiliary/issue-30535.rs
rename to src/test/ui/resolve/auxiliary/issue-30535.rs
diff --git a/src/test/ui/issues/issue-30535.rs b/src/test/ui/resolve/issue-30535.rs
similarity index 100%
rename from src/test/ui/issues/issue-30535.rs
rename to src/test/ui/resolve/issue-30535.rs
diff --git a/src/test/ui/issues/issue-30535.stderr b/src/test/ui/resolve/issue-30535.stderr
similarity index 100%
rename from src/test/ui/issues/issue-30535.stderr
rename to src/test/ui/resolve/issue-30535.stderr
diff --git a/src/test/ui/issues/issue-39559-2.rs b/src/test/ui/resolve/issue-39559-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-39559-2.rs
rename to src/test/ui/resolve/issue-39559-2.rs
diff --git a/src/test/ui/issues/issue-39559-2.stderr b/src/test/ui/resolve/issue-39559-2.stderr
similarity index 100%
rename from src/test/ui/issues/issue-39559-2.stderr
rename to src/test/ui/resolve/issue-39559-2.stderr
diff --git a/src/test/ui/issues/issue-39559.rs b/src/test/ui/resolve/issue-39559.rs
similarity index 100%
rename from src/test/ui/issues/issue-39559.rs
rename to src/test/ui/resolve/issue-39559.rs
diff --git a/src/test/ui/issues/issue-39559.stderr b/src/test/ui/resolve/issue-39559.stderr
similarity index 100%
rename from src/test/ui/issues/issue-39559.stderr
rename to src/test/ui/resolve/issue-39559.stderr
diff --git a/src/test/ui/issues/issue-18118-2.rs b/src/test/ui/static/issue-18118-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-18118-2.rs
rename to src/test/ui/static/issue-18118-2.rs
diff --git a/src/test/ui/issues/issue-18118-2.stderr b/src/test/ui/static/issue-18118-2.stderr
similarity index 100%
rename from src/test/ui/issues/issue-18118-2.stderr
rename to src/test/ui/static/issue-18118-2.stderr
diff --git a/src/test/ui/issues/issue-18118.rs b/src/test/ui/static/issue-18118.rs
similarity index 100%
rename from src/test/ui/issues/issue-18118.rs
rename to src/test/ui/static/issue-18118.rs
diff --git a/src/test/ui/issues/issue-18118.stderr b/src/test/ui/static/issue-18118.stderr
similarity index 100%
rename from src/test/ui/issues/issue-18118.stderr
rename to src/test/ui/static/issue-18118.stderr
diff --git a/src/test/ui/issues/issue-52557.rs b/src/test/ui/test-attrs/issue-52557.rs
similarity index 100%
rename from src/test/ui/issues/issue-52557.rs
rename to src/test/ui/test-attrs/issue-52557.rs
diff --git a/src/test/ui/issues/issue-22375.rs b/src/test/ui/typeck/issue-22375.rs
similarity index 100%
rename from src/test/ui/issues/issue-22375.rs
rename to src/test/ui/typeck/issue-22375.rs
diff --git a/src/tools/tidy/src/ui_tests.rs b/src/tools/tidy/src/ui_tests.rs
index 19e2528bb24..f746bdeffd7 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 = 2040;
+const ISSUES_ENTRY_LIMIT: usize = 2020;
 
 fn check_entries(path: &Path, bad: &mut bool) {
     for dir in Walk::new(&path.join("test/ui")) {