diff --git a/tests/ui/issues/issue-2590.rs b/tests/ui/borrowck/issue-2590.rs
similarity index 100%
rename from tests/ui/issues/issue-2590.rs
rename to tests/ui/borrowck/issue-2590.rs
diff --git a/tests/ui/issues/issue-2590.stderr b/tests/ui/borrowck/issue-2590.stderr
similarity index 100%
rename from tests/ui/issues/issue-2590.stderr
rename to tests/ui/borrowck/issue-2590.stderr
diff --git a/tests/ui/issues/issue-3154.rs b/tests/ui/borrowck/issue-3154.rs
similarity index 100%
rename from tests/ui/issues/issue-3154.rs
rename to tests/ui/borrowck/issue-3154.rs
diff --git a/tests/ui/issues/issue-3154.stderr b/tests/ui/borrowck/issue-3154.stderr
similarity index 100%
rename from tests/ui/issues/issue-3154.stderr
rename to tests/ui/borrowck/issue-3154.stderr
diff --git a/tests/ui/issues/issue-4335.rs b/tests/ui/borrowck/issue-4335.rs
similarity index 100%
rename from tests/ui/issues/issue-4335.rs
rename to tests/ui/borrowck/issue-4335.rs
diff --git a/tests/ui/issues/issue-4335.stderr b/tests/ui/borrowck/issue-4335.stderr
similarity index 100%
rename from tests/ui/issues/issue-4335.stderr
rename to tests/ui/borrowck/issue-4335.stderr
diff --git a/tests/ui/issues/issue-3021-b.rs b/tests/ui/closures/issue-3021-b.rs
similarity index 100%
rename from tests/ui/issues/issue-3021-b.rs
rename to tests/ui/closures/issue-3021-b.rs
diff --git a/tests/ui/issues/issue-3021-b.stderr b/tests/ui/closures/issue-3021-b.stderr
similarity index 100%
rename from tests/ui/issues/issue-3021-b.stderr
rename to tests/ui/closures/issue-3021-b.stderr
diff --git a/tests/ui/issues/issue-17252.rs b/tests/ui/consts/issue-17252.rs
similarity index 100%
rename from tests/ui/issues/issue-17252.rs
rename to tests/ui/consts/issue-17252.rs
diff --git a/tests/ui/issues/issue-17252.stderr b/tests/ui/consts/issue-17252.stderr
similarity index 100%
rename from tests/ui/issues/issue-17252.stderr
rename to tests/ui/consts/issue-17252.stderr
diff --git a/tests/ui/issues/issue-2150.rs b/tests/ui/lint/issue-2150.rs
similarity index 100%
rename from tests/ui/issues/issue-2150.rs
rename to tests/ui/lint/issue-2150.rs
diff --git a/tests/ui/issues/issue-2150.stderr b/tests/ui/lint/issue-2150.stderr
similarity index 100%
rename from tests/ui/issues/issue-2150.stderr
rename to tests/ui/lint/issue-2150.stderr
diff --git a/tests/ui/issues/issue-17800.rs b/tests/ui/pattern/issue-17800.rs
similarity index 100%
rename from tests/ui/issues/issue-17800.rs
rename to tests/ui/pattern/issue-17800.rs
diff --git a/tests/ui/issues/issue-17800.stderr b/tests/ui/pattern/issue-17800.stderr
similarity index 100%
rename from tests/ui/issues/issue-17800.stderr
rename to tests/ui/pattern/issue-17800.stderr
diff --git a/tests/ui/issues/issue-4972.rs b/tests/ui/pattern/issue-4972.rs
similarity index 100%
rename from tests/ui/issues/issue-4972.rs
rename to tests/ui/pattern/issue-4972.rs
diff --git a/tests/ui/issues/issue-4972.stderr b/tests/ui/pattern/issue-4972.stderr
similarity index 100%
rename from tests/ui/issues/issue-4972.stderr
rename to tests/ui/pattern/issue-4972.stderr
diff --git a/tests/ui/issues/issue-5100.rs b/tests/ui/pattern/issue-5100.rs
similarity index 100%
rename from tests/ui/issues/issue-5100.rs
rename to tests/ui/pattern/issue-5100.rs
diff --git a/tests/ui/issues/issue-5100.stderr b/tests/ui/pattern/issue-5100.stderr
similarity index 100%
rename from tests/ui/issues/issue-5100.stderr
rename to tests/ui/pattern/issue-5100.stderr
diff --git a/tests/ui/issues/issue-3702-2.rs b/tests/ui/traits/issue-3702-2.rs
similarity index 100%
rename from tests/ui/issues/issue-3702-2.rs
rename to tests/ui/traits/issue-3702-2.rs
diff --git a/tests/ui/issues/issue-3702-2.stderr b/tests/ui/traits/issue-3702-2.stderr
similarity index 100%
rename from tests/ui/issues/issue-3702-2.stderr
rename to tests/ui/traits/issue-3702-2.stderr
diff --git a/tests/ui/issues/issue-4265.rs b/tests/ui/traits/issue-4265.rs
similarity index 100%
rename from tests/ui/issues/issue-4265.rs
rename to tests/ui/traits/issue-4265.rs
diff --git a/tests/ui/issues/issue-4265.stderr b/tests/ui/traits/issue-4265.stderr
similarity index 100%
rename from tests/ui/issues/issue-4265.stderr
rename to tests/ui/traits/issue-4265.stderr
diff --git a/tests/ui/issues/issue-4736.rs b/tests/ui/typeck/issue-4736.rs
similarity index 100%
rename from tests/ui/issues/issue-4736.rs
rename to tests/ui/typeck/issue-4736.rs
diff --git a/tests/ui/issues/issue-4736.stderr b/tests/ui/typeck/issue-4736.stderr
similarity index 100%
rename from tests/ui/issues/issue-4736.stderr
rename to tests/ui/typeck/issue-4736.stderr