diff --git a/src/test/ui/issues/issue-19081.rs b/src/test/ui/associated-types/issue-19081.rs
similarity index 100%
rename from src/test/ui/issues/issue-19081.rs
rename to src/test/ui/associated-types/issue-19081.rs
diff --git a/src/test/ui/issues/issue-16602-1.rs b/src/test/ui/codegen/issue-16602-1.rs
similarity index 100%
rename from src/test/ui/issues/issue-16602-1.rs
rename to src/test/ui/codegen/issue-16602-1.rs
diff --git a/src/test/ui/issues/issue-16602-2.rs b/src/test/ui/codegen/issue-16602-2.rs
similarity index 100%
rename from src/test/ui/issues/issue-16602-2.rs
rename to src/test/ui/codegen/issue-16602-2.rs
diff --git a/src/test/ui/issues/issue-16602-3.rs b/src/test/ui/codegen/issue-16602-3.rs
similarity index 100%
rename from src/test/ui/issues/issue-16602-3.rs
rename to src/test/ui/codegen/issue-16602-3.rs
diff --git a/src/test/ui/issues/issue-35450.rs b/src/test/ui/macros/issue-35450.rs
similarity index 100%
rename from src/test/ui/issues/issue-35450.rs
rename to src/test/ui/macros/issue-35450.rs
diff --git a/src/test/ui/issues/issue-35450.stderr b/src/test/ui/macros/issue-35450.stderr
similarity index 100%
rename from src/test/ui/issues/issue-35450.stderr
rename to src/test/ui/macros/issue-35450.stderr
diff --git a/src/test/ui/issues/issue-47706-trait.rs b/src/test/ui/mismatched_types/issue-47706-trait.rs
similarity index 100%
rename from src/test/ui/issues/issue-47706-trait.rs
rename to src/test/ui/mismatched_types/issue-47706-trait.rs
diff --git a/src/test/ui/issues/issue-47706-trait.stderr b/src/test/ui/mismatched_types/issue-47706-trait.stderr
similarity index 100%
rename from src/test/ui/issues/issue-47706-trait.stderr
rename to src/test/ui/mismatched_types/issue-47706-trait.stderr
diff --git a/src/test/ui/issues/issue-47706.rs b/src/test/ui/mismatched_types/issue-47706.rs
similarity index 100%
rename from src/test/ui/issues/issue-47706.rs
rename to src/test/ui/mismatched_types/issue-47706.rs
diff --git a/src/test/ui/issues/issue-47706.stderr b/src/test/ui/mismatched_types/issue-47706.stderr
similarity index 100%
rename from src/test/ui/issues/issue-47706.stderr
rename to src/test/ui/mismatched_types/issue-47706.stderr
diff --git a/src/test/ui/issues/issue-52213.nll.stderr b/src/test/ui/nll/issue-52213.nll.stderr
similarity index 100%
rename from src/test/ui/issues/issue-52213.nll.stderr
rename to src/test/ui/nll/issue-52213.nll.stderr
diff --git a/src/test/ui/issues/issue-52213.rs b/src/test/ui/nll/issue-52213.rs
similarity index 100%
rename from src/test/ui/issues/issue-52213.rs
rename to src/test/ui/nll/issue-52213.rs
diff --git a/src/test/ui/issues/issue-52213.stderr b/src/test/ui/nll/issue-52213.stderr
similarity index 100%
rename from src/test/ui/issues/issue-52213.stderr
rename to src/test/ui/nll/issue-52213.stderr
diff --git a/src/test/ui/issues/issue-73427.rs b/src/test/ui/resolve/issue-73427.rs
similarity index 100%
rename from src/test/ui/issues/issue-73427.rs
rename to src/test/ui/resolve/issue-73427.rs
diff --git a/src/test/ui/issues/issue-73427.stderr b/src/test/ui/resolve/issue-73427.stderr
similarity index 100%
rename from src/test/ui/issues/issue-73427.stderr
rename to src/test/ui/resolve/issue-73427.stderr
diff --git a/src/test/ui/issues/issue-37323.rs b/src/test/ui/save-analysis/issue-37323.rs
similarity index 100%
rename from src/test/ui/issues/issue-37323.rs
rename to src/test/ui/save-analysis/issue-37323.rs
diff --git a/src/test/ui/multiple-reprs.rs b/src/test/ui/structs-enums/multiple-reprs.rs
similarity index 100%
rename from src/test/ui/multiple-reprs.rs
rename to src/test/ui/structs-enums/multiple-reprs.rs
diff --git a/src/test/ui/issues/issue-32963.rs b/src/test/ui/traits/issue-32963.rs
similarity index 100%
rename from src/test/ui/issues/issue-32963.rs
rename to src/test/ui/traits/issue-32963.rs
diff --git a/src/test/ui/issues/issue-32963.stderr b/src/test/ui/traits/issue-32963.stderr
similarity index 100%
rename from src/test/ui/issues/issue-32963.stderr
rename to src/test/ui/traits/issue-32963.stderr
diff --git a/src/test/ui/issues/issue-4107.rs b/src/test/ui/traits/issue-4107.rs
similarity index 100%
rename from src/test/ui/issues/issue-4107.rs
rename to src/test/ui/traits/issue-4107.rs