diff --git a/tests/ui/issues/issue-50600.rs b/tests/ui/array-slice-vec/closure-in-array-len.rs
similarity index 100%
rename from tests/ui/issues/issue-50600.rs
rename to tests/ui/array-slice-vec/closure-in-array-len.rs
diff --git a/tests/ui/issues/issue-50600.stderr b/tests/ui/array-slice-vec/closure-in-array-len.stderr
similarity index 100%
rename from tests/ui/issues/issue-50600.stderr
rename to tests/ui/array-slice-vec/closure-in-array-len.stderr
diff --git a/tests/ui/issues/issue-51714.rs b/tests/ui/array-slice-vec/return-in-array-len.rs
similarity index 100%
rename from tests/ui/issues/issue-51714.rs
rename to tests/ui/array-slice-vec/return-in-array-len.rs
diff --git a/tests/ui/issues/issue-51714.stderr b/tests/ui/array-slice-vec/return-in-array-len.stderr
similarity index 100%
rename from tests/ui/issues/issue-51714.stderr
rename to tests/ui/array-slice-vec/return-in-array-len.stderr
diff --git a/tests/ui/issues/issue-17503.rs b/tests/ui/array-slice-vec/slice-of-multi-ref.rs
similarity index 100%
rename from tests/ui/issues/issue-17503.rs
rename to tests/ui/array-slice-vec/slice-of-multi-ref.rs
diff --git a/tests/ui/issues/issue-42453.rs b/tests/ui/derives/derive-hygiene-struct-builder.rs
similarity index 100%
rename from tests/ui/issues/issue-42453.rs
rename to tests/ui/derives/derive-hygiene-struct-builder.rs
diff --git a/tests/ui/issues/issue-17361.rs b/tests/ui/dst/unsized-str-mutability.rs
similarity index 100%
rename from tests/ui/issues/issue-17361.rs
rename to tests/ui/dst/unsized-str-mutability.rs
diff --git a/tests/ui/issues/issue-28105.rs b/tests/ui/for-loop-while/break-outside-loop-2.rs
similarity index 100%
rename from tests/ui/issues/issue-28105.rs
rename to tests/ui/for-loop-while/break-outside-loop-2.rs
diff --git a/tests/ui/issues/issue-28105.stderr b/tests/ui/for-loop-while/break-outside-loop-2.stderr
similarity index 100%
rename from tests/ui/issues/issue-28105.stderr
rename to tests/ui/for-loop-while/break-outside-loop-2.stderr
diff --git a/tests/ui/issues/issue-22706.rs b/tests/ui/generics/type-args-on-module-in-bound.rs
similarity index 100%
rename from tests/ui/issues/issue-22706.rs
rename to tests/ui/generics/type-args-on-module-in-bound.rs
diff --git a/tests/ui/issues/issue-22706.stderr b/tests/ui/generics/type-args-on-module-in-bound.stderr
similarity index 100%
rename from tests/ui/issues/issue-22706.stderr
rename to tests/ui/generics/type-args-on-module-in-bound.stderr
diff --git a/tests/ui/issues/issue-28109.rs b/tests/ui/label/undeclared-label-span.rs
similarity index 100%
rename from tests/ui/issues/issue-28109.rs
rename to tests/ui/label/undeclared-label-span.rs
diff --git a/tests/ui/issues/issue-28109.stderr b/tests/ui/label/undeclared-label-span.stderr
similarity index 100%
rename from tests/ui/issues/issue-28109.stderr
rename to tests/ui/label/undeclared-label-span.stderr
diff --git a/tests/ui/issues/issue-43057.rs b/tests/ui/macros/column-macro-collision.rs
similarity index 100%
rename from tests/ui/issues/issue-43057.rs
rename to tests/ui/macros/column-macro-collision.rs
diff --git a/tests/ui/issues/issue-27008.rs b/tests/ui/mismatched_types/array-repeat-unit-struct.rs
similarity index 100%
rename from tests/ui/issues/issue-27008.rs
rename to tests/ui/mismatched_types/array-repeat-unit-struct.rs
diff --git a/tests/ui/issues/issue-27008.stderr b/tests/ui/mismatched_types/array-repeat-unit-struct.stderr
similarity index 100%
rename from tests/ui/issues/issue-27008.stderr
rename to tests/ui/mismatched_types/array-repeat-unit-struct.stderr
diff --git a/tests/ui/issues/issue-24819.rs b/tests/ui/mismatched_types/vec-hashset-type-mismatch.rs
similarity index 100%
rename from tests/ui/issues/issue-24819.rs
rename to tests/ui/mismatched_types/vec-hashset-type-mismatch.rs
diff --git a/tests/ui/issues/issue-24819.stderr b/tests/ui/mismatched_types/vec-hashset-type-mismatch.stderr
similarity index 100%
rename from tests/ui/issues/issue-24819.stderr
rename to tests/ui/mismatched_types/vec-hashset-type-mismatch.stderr
diff --git a/tests/ui/issues/auxiliary/issue-16725.rs b/tests/ui/privacy/auxiliary/private-extern-fn.rs
similarity index 100%
rename from tests/ui/issues/auxiliary/issue-16725.rs
rename to tests/ui/privacy/auxiliary/private-extern-fn.rs
diff --git a/tests/ui/issues/issue-28433.rs b/tests/ui/privacy/privacy-sanity-2.rs
similarity index 100%
rename from tests/ui/issues/issue-28433.rs
rename to tests/ui/privacy/privacy-sanity-2.rs
diff --git a/tests/ui/issues/issue-28433.stderr b/tests/ui/privacy/privacy-sanity-2.stderr
similarity index 100%
rename from tests/ui/issues/issue-28433.stderr
rename to tests/ui/privacy/privacy-sanity-2.stderr
diff --git a/tests/ui/issues/issue-16725.rs b/tests/ui/privacy/private-extern-fn-visibility.rs
similarity index 100%
rename from tests/ui/issues/issue-16725.rs
rename to tests/ui/privacy/private-extern-fn-visibility.rs
diff --git a/tests/ui/issues/issue-16725.stderr b/tests/ui/privacy/private-extern-fn-visibility.stderr
similarity index 100%
rename from tests/ui/issues/issue-16725.stderr
rename to tests/ui/privacy/private-extern-fn-visibility.stderr
diff --git a/tests/ui/issues/issue-22894.rs b/tests/ui/static/static-str-deref-ref.rs
similarity index 100%
rename from tests/ui/issues/issue-22894.rs
rename to tests/ui/static/static-str-deref-ref.rs
diff --git a/tests/ui/issues/issue-22577.rs b/tests/ui/threads-sendsync/std-sync-right-kind-impls-2.rs
similarity index 100%
rename from tests/ui/issues/issue-22577.rs
rename to tests/ui/threads-sendsync/std-sync-right-kind-impls-2.rs