diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index 18da874dbef2..0966c3d79356 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -276,7 +276,6 @@ ui/auto-traits/issue-23080-2.rs
 ui/auto-traits/issue-23080.rs
 ui/auto-traits/issue-83857-ub.rs
 ui/auto-traits/issue-84075.rs
-ui/auxiliary/issue-16822.rs
 ui/bench/issue-32062.rs
 ui/binding/issue-40402-1.rs
 ui/binding/issue-40402-2.rs
@@ -1368,9 +1367,6 @@ ui/infinite/issue-41731-infinite-macro-println.rs
 ui/intrinsics/issue-28575.rs
 ui/intrinsics/issue-84297-reifying-copy.rs
 ui/invalid/issue-114435-layout-type-err.rs
-ui/issue-15924.rs
-ui/issue-16822.rs
-ui/issues-71798.rs
 ui/issues/auxiliary/issue-11224.rs
 ui/issues/auxiliary/issue-11508.rs
 ui/issues/auxiliary/issue-11529.rs
diff --git a/tests/ui/issues-71798.rs b/tests/ui/async-await/impl-future-escaping-bound-vars-ice.rs
similarity index 100%
rename from tests/ui/issues-71798.rs
rename to tests/ui/async-await/impl-future-escaping-bound-vars-ice.rs
diff --git a/tests/ui/issues-71798.stderr b/tests/ui/async-await/impl-future-escaping-bound-vars-ice.stderr
similarity index 100%
rename from tests/ui/issues-71798.stderr
rename to tests/ui/async-await/impl-future-escaping-bound-vars-ice.stderr
diff --git a/tests/ui/last-use-is-capture.rs b/tests/ui/closures/closure-capture-after-clone.rs
similarity index 100%
rename from tests/ui/last-use-is-capture.rs
rename to tests/ui/closures/closure-capture-after-clone.rs
diff --git a/tests/ui/last-use-in-block.rs b/tests/ui/closures/closure-last-use-move.rs
similarity index 100%
rename from tests/ui/last-use-in-block.rs
rename to tests/ui/closures/closure-last-use-move.rs
diff --git a/tests/ui/last-use-in-cap-clause.rs b/tests/ui/closures/closure-upvar-last-use-analysis.rs
similarity index 100%
rename from tests/ui/last-use-in-cap-clause.rs
rename to tests/ui/closures/closure-upvar-last-use-analysis.rs
diff --git a/tests/ui/auxiliary/issue-16822.rs b/tests/ui/cross-crate/auxiliary/cross-crate-refcell-match.rs
similarity index 100%
rename from tests/ui/auxiliary/issue-16822.rs
rename to tests/ui/cross-crate/auxiliary/cross-crate-refcell-match.rs
diff --git a/tests/ui/auxiliary/kinds_in_metadata.rs b/tests/ui/cross-crate/auxiliary/kinds_in_metadata.rs
similarity index 100%
rename from tests/ui/auxiliary/kinds_in_metadata.rs
rename to tests/ui/cross-crate/auxiliary/kinds_in_metadata.rs
diff --git a/tests/ui/issue-16822.rs b/tests/ui/cross-crate/cross-crate-refcell-match.rs
similarity index 100%
rename from tests/ui/issue-16822.rs
rename to tests/ui/cross-crate/cross-crate-refcell-match.rs
diff --git a/tests/ui/kinds-in-metadata.rs b/tests/ui/cross-crate/metadata-trait-serialization.rs
similarity index 100%
rename from tests/ui/kinds-in-metadata.rs
rename to tests/ui/cross-crate/metadata-trait-serialization.rs
diff --git a/tests/ui/issue-15924.rs b/tests/ui/higher-ranked/higher-ranked-encoding.rs
similarity index 100%
rename from tests/ui/issue-15924.rs
rename to tests/ui/higher-ranked/higher-ranked-encoding.rs
diff --git a/tests/ui/item-name-overload.rs b/tests/ui/modules/mod-same-item-names.rs
similarity index 100%
rename from tests/ui/item-name-overload.rs
rename to tests/ui/modules/mod-same-item-names.rs
diff --git a/tests/ui/kinds-of-primitive-impl.rs b/tests/ui/type/inherent-impl-primitive-types-error.rs
similarity index 100%
rename from tests/ui/kinds-of-primitive-impl.rs
rename to tests/ui/type/inherent-impl-primitive-types-error.rs
diff --git a/tests/ui/kinds-of-primitive-impl.stderr b/tests/ui/type/inherent-impl-primitive-types-error.stderr
similarity index 100%
rename from tests/ui/kinds-of-primitive-impl.stderr
rename to tests/ui/type/inherent-impl-primitive-types-error.stderr