diff --git a/tests/ui/issues/issue-52126-assign-op-invariance.rs b/tests/ui/borrowck/assign-op-invariance-lifetime.rs
similarity index 100%
rename from tests/ui/issues/issue-52126-assign-op-invariance.rs
rename to tests/ui/borrowck/assign-op-invariance-lifetime.rs
diff --git a/tests/ui/issues/issue-52126-assign-op-invariance.stderr b/tests/ui/borrowck/assign-op-invariance-lifetime.stderr
similarity index 100%
rename from tests/ui/issues/issue-52126-assign-op-invariance.stderr
rename to tests/ui/borrowck/assign-op-invariance-lifetime.stderr
diff --git a/tests/ui/issues/issue-21400.rs b/tests/ui/borrowck/borrow-in-match-with-format-string.rs
similarity index 100%
rename from tests/ui/issues/issue-21400.rs
rename to tests/ui/borrowck/borrow-in-match-with-format-string.rs
diff --git a/tests/ui/issues/issue-45697.rs b/tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-off.rs
similarity index 100%
rename from tests/ui/issues/issue-45697.rs
rename to tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-off.rs
diff --git a/tests/ui/issues/issue-45697.stderr b/tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-off.stderr
similarity index 100%
rename from tests/ui/issues/issue-45697.stderr
rename to tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-off.stderr
diff --git a/tests/ui/issues/issue-45697-1.rs b/tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-on.rs
similarity index 100%
rename from tests/ui/issues/issue-45697-1.rs
rename to tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-on.rs
diff --git a/tests/ui/issues/issue-45697-1.stderr b/tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-on.stderr
similarity index 100%
rename from tests/ui/issues/issue-45697-1.stderr
rename to tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-on.stderr
diff --git a/tests/ui/issues/issue-41498.rs b/tests/ui/borrowck/call-and-ref-option-mutate.rs
similarity index 100%
rename from tests/ui/issues/issue-41498.rs
rename to tests/ui/borrowck/call-and-ref-option-mutate.rs
diff --git a/tests/ui/issues/issue-40288.rs b/tests/ui/borrowck/cannot-assign-borrowed-ref-in-slice.rs
similarity index 100%
rename from tests/ui/issues/issue-40288.rs
rename to tests/ui/borrowck/cannot-assign-borrowed-ref-in-slice.rs
diff --git a/tests/ui/issues/issue-40288.stderr b/tests/ui/borrowck/cannot-assign-borrowed-ref-in-slice.stderr
similarity index 100%
rename from tests/ui/issues/issue-40288.stderr
rename to tests/ui/borrowck/cannot-assign-borrowed-ref-in-slice.stderr
diff --git a/tests/ui/issues/issue-41726.rs b/tests/ui/borrowck/cannot-borrow-index-of-hashmap-in-for.rs
similarity index 100%
rename from tests/ui/issues/issue-41726.rs
rename to tests/ui/borrowck/cannot-borrow-index-of-hashmap-in-for.rs
diff --git a/tests/ui/issues/issue-41726.stderr b/tests/ui/borrowck/cannot-borrow-index-of-hashmap-in-for.stderr
similarity index 100%
rename from tests/ui/issues/issue-41726.stderr
rename to tests/ui/borrowck/cannot-borrow-index-of-hashmap-in-for.stderr
diff --git a/tests/ui/issues/issue-44405.rs b/tests/ui/borrowck/cannot-borrow-index-output-mutably.rs
similarity index 100%
rename from tests/ui/issues/issue-44405.rs
rename to tests/ui/borrowck/cannot-borrow-index-output-mutably.rs
diff --git a/tests/ui/issues/issue-44405.stderr b/tests/ui/borrowck/cannot-borrow-index-output-mutably.stderr
similarity index 100%
rename from tests/ui/issues/issue-44405.stderr
rename to tests/ui/borrowck/cannot-borrow-index-output-mutably.stderr
diff --git a/tests/ui/issues/issue-4335.rs b/tests/ui/borrowck/cannot-move-out-of-borrowed-ref-closure.rs
similarity index 100%
rename from tests/ui/issues/issue-4335.rs
rename to tests/ui/borrowck/cannot-move-out-of-borrowed-ref-closure.rs
diff --git a/tests/ui/issues/issue-4335.stderr b/tests/ui/borrowck/cannot-move-out-of-borrowed-ref-closure.stderr
similarity index 100%
rename from tests/ui/issues/issue-4335.stderr
rename to tests/ui/borrowck/cannot-move-out-of-borrowed-ref-closure.stderr
diff --git a/tests/ui/issues/issue-26619.rs b/tests/ui/borrowck/cannot-return-ref-to-fn-param-in-filter-map.rs
similarity index 100%
rename from tests/ui/issues/issue-26619.rs
rename to tests/ui/borrowck/cannot-return-ref-to-fn-param-in-filter-map.rs
diff --git a/tests/ui/issues/issue-26619.stderr b/tests/ui/borrowck/cannot-return-ref-to-fn-param-in-filter-map.stderr
similarity index 100%
rename from tests/ui/issues/issue-26619.stderr
rename to tests/ui/borrowck/cannot-return-ref-to-fn-param-in-filter-map.stderr
diff --git a/tests/ui/issues/issue-27592.rs b/tests/ui/borrowck/cannot-return-ref-to-temporary-format-args.rs
similarity index 100%
rename from tests/ui/issues/issue-27592.rs
rename to tests/ui/borrowck/cannot-return-ref-to-temporary-format-args.rs
diff --git a/tests/ui/issues/issue-27592.stderr b/tests/ui/borrowck/cannot-return-ref-to-temporary-format-args.stderr
similarity index 100%
rename from tests/ui/issues/issue-27592.stderr
rename to tests/ui/borrowck/cannot-return-ref-to-temporary-format-args.stderr
diff --git a/tests/ui/issues/issue-18566.rs b/tests/ui/borrowck/deref-and-mut-borrow-conflict.rs
similarity index 100%
rename from tests/ui/issues/issue-18566.rs
rename to tests/ui/borrowck/deref-and-mut-borrow-conflict.rs
diff --git a/tests/ui/issues/issue-18566.stderr b/tests/ui/borrowck/deref-and-mut-borrow-conflict.stderr
similarity index 100%
rename from tests/ui/issues/issue-18566.stderr
rename to tests/ui/borrowck/deref-and-mut-borrow-conflict.stderr
diff --git a/tests/ui/issues/issue-28971.rs b/tests/ui/borrowck/fnmut-borrow-error-in-closure-match.rs
similarity index 100%
rename from tests/ui/issues/issue-28971.rs
rename to tests/ui/borrowck/fnmut-borrow-error-in-closure-match.rs
diff --git a/tests/ui/issues/issue-28971.stderr b/tests/ui/borrowck/fnmut-borrow-error-in-closure-match.stderr
similarity index 100%
rename from tests/ui/issues/issue-28971.stderr
rename to tests/ui/borrowck/fnmut-borrow-error-in-closure-match.stderr
diff --git a/tests/ui/issues/issue-42106.rs b/tests/ui/borrowck/immutable-borrow-prevents-mut-method.rs
similarity index 100%
rename from tests/ui/issues/issue-42106.rs
rename to tests/ui/borrowck/immutable-borrow-prevents-mut-method.rs
diff --git a/tests/ui/issues/issue-42106.stderr b/tests/ui/borrowck/immutable-borrow-prevents-mut-method.stderr
similarity index 100%
rename from tests/ui/issues/issue-42106.stderr
rename to tests/ui/borrowck/immutable-borrow-prevents-mut-method.stderr
diff --git a/tests/ui/issues/issue-18783.rs b/tests/ui/borrowck/mut-borrow-conflict-in-closures-vec.rs
similarity index 100%
rename from tests/ui/issues/issue-18783.rs
rename to tests/ui/borrowck/mut-borrow-conflict-in-closures-vec.rs
diff --git a/tests/ui/issues/issue-18783.stderr b/tests/ui/borrowck/mut-borrow-conflict-in-closures-vec.stderr
similarity index 100%
rename from tests/ui/issues/issue-18783.stderr
rename to tests/ui/borrowck/mut-borrow-conflict-in-closures-vec.stderr
diff --git a/tests/ui/issues/issue-25579.rs b/tests/ui/borrowck/reborrow-in-loop-match-recursive-enum.rs
similarity index 100%
rename from tests/ui/issues/issue-25579.rs
rename to tests/ui/borrowck/reborrow-in-loop-match-recursive-enum.rs
diff --git a/tests/ui/issues/issue-28839.rs b/tests/ui/borrowck/reborrow-in-match-ref-mut-option.rs
similarity index 100%
rename from tests/ui/issues/issue-28839.rs
rename to tests/ui/borrowck/reborrow-in-match-ref-mut-option.rs
diff --git a/tests/ui/issues/issue-29053.rs b/tests/ui/borrowck/ref-mut-rebind-does-not-affect-outer.rs
similarity index 100%
rename from tests/ui/issues/issue-29053.rs
rename to tests/ui/borrowck/ref-mut-rebind-does-not-affect-outer.rs
diff --git a/tests/ui/issues/issue-47703.rs b/tests/ui/borrowck/self-field-consume-with-drop-type.rs
similarity index 100%
rename from tests/ui/issues/issue-47703.rs
rename to tests/ui/borrowck/self-field-consume-with-drop-type.rs
diff --git a/tests/ui/issues/issue-47703-1.rs b/tests/ui/borrowck/struct-field-move-with-drop-borrow.rs
similarity index 100%
rename from tests/ui/issues/issue-47703-1.rs
rename to tests/ui/borrowck/struct-field-move-with-drop-borrow.rs
diff --git a/tests/ui/issues/issue-47703-tuple.rs b/tests/ui/borrowck/tuple-field-move-with-drop-borrow.rs
similarity index 100%
rename from tests/ui/issues/issue-47703-tuple.rs
rename to tests/ui/borrowck/tuple-field-move-with-drop-borrow.rs
diff --git a/tests/ui/issues/issue-29723.rs b/tests/ui/borrowck/use-moved-value-in-match-guard-drop.rs
similarity index 100%
rename from tests/ui/issues/issue-29723.rs
rename to tests/ui/borrowck/use-moved-value-in-match-guard-drop.rs
diff --git a/tests/ui/issues/issue-29723.stderr b/tests/ui/borrowck/use-moved-value-in-match-guard-drop.stderr
similarity index 100%
rename from tests/ui/issues/issue-29723.stderr
rename to tests/ui/borrowck/use-moved-value-in-match-guard-drop.stderr