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 94%
rename from tests/ui/issues/issue-52126-assign-op-invariance.stderr
rename to tests/ui/borrowck/assign-op-invariance-lifetime.stderr
index dd38a1061baaa..79371ec9019be 100644
--- a/tests/ui/issues/issue-52126-assign-op-invariance.stderr
+++ b/tests/ui/borrowck/assign-op-invariance-lifetime.stderr
@@ -1,5 +1,5 @@
 error[E0597]: `line` does not live long enough
-  --> $DIR/issue-52126-assign-op-invariance.rs:34:28
+  --> $DIR/assign-op-invariance-lifetime.rs:34:28
    |
 LL |     for line in vec!["123456789".to_string(), "12345678".to_string()] {
    |         ---- binding `line` declared here
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 91%
rename from tests/ui/issues/issue-45697.rs
rename to tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-off.rs
index 653924077684b..ef9012eaddd4b 100644
--- a/tests/ui/issues/issue-45697.rs
+++ b/tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-off.rs
@@ -1,3 +1,4 @@
+// Issue link https://github.com/rust-lang/rust/issues/45697
 // Test that assignments to an `&mut` pointer which is found in a
 // borrowed (but otherwise non-aliasable) location is illegal.
 
diff --git a/tests/ui/issues/issue-45697-1.stderr b/tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-off.stderr
similarity index 88%
rename from tests/ui/issues/issue-45697-1.stderr
rename to tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-off.stderr
index 474313398e2bc..b265fc1f76150 100644
--- a/tests/ui/issues/issue-45697-1.stderr
+++ b/tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-off.stderr
@@ -1,5 +1,5 @@
 error[E0503]: cannot use `*y.pointer` because it was mutably borrowed
-  --> $DIR/issue-45697-1.rs:20:9
+  --> $DIR/borrowed-mut-pointer-assign-overflow-off.rs:21:9
    |
 LL |         let z = copy_borrowed_ptr(&mut y);
    |                                   ------ `y` is borrowed here
@@ -10,7 +10,7 @@ LL |         *z.pointer += 1;
    |         --------------- borrow later used here
 
 error[E0506]: cannot assign to `*y.pointer` because it is borrowed
-  --> $DIR/issue-45697-1.rs:20:9
+  --> $DIR/borrowed-mut-pointer-assign-overflow-off.rs:21:9
    |
 LL |         let z = copy_borrowed_ptr(&mut y);
    |                                   ------ `*y.pointer` is borrowed here
diff --git a/tests/ui/issues/issue-45697-1.rs b/tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-on.rs
similarity index 91%
rename from tests/ui/issues/issue-45697-1.rs
rename to tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-on.rs
index 53e5559968969..2b117c56d3787 100644
--- a/tests/ui/issues/issue-45697-1.rs
+++ b/tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-on.rs
@@ -1,3 +1,4 @@
+// Issue link https://github.com/rust-lang/rust/issues/45697
 // Test that assignments to an `&mut` pointer which is found in a
 // borrowed (but otherwise non-aliasable) location is illegal.
 
diff --git a/tests/ui/issues/issue-45697.stderr b/tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-on.stderr
similarity index 88%
rename from tests/ui/issues/issue-45697.stderr
rename to tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-on.stderr
index 7986fd5c9df2e..529023f98b1af 100644
--- a/tests/ui/issues/issue-45697.stderr
+++ b/tests/ui/borrowck/borrowed-mut-pointer-assign-overflow-on.stderr
@@ -1,5 +1,5 @@
 error[E0503]: cannot use `*y.pointer` because it was mutably borrowed
-  --> $DIR/issue-45697.rs:20:9
+  --> $DIR/borrowed-mut-pointer-assign-overflow-on.rs:21:9
    |
 LL |         let z = copy_borrowed_ptr(&mut y);
    |                                   ------ `y` is borrowed here
@@ -10,7 +10,7 @@ LL |         *z.pointer += 1;
    |         --------------- borrow later used here
 
 error[E0506]: cannot assign to `*y.pointer` because it is borrowed
-  --> $DIR/issue-45697.rs:20:9
+  --> $DIR/borrowed-mut-pointer-assign-overflow-on.rs:21:9
    |
 LL |         let z = copy_borrowed_ptr(&mut y);
    |                                   ------ `*y.pointer` is borrowed here
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 85%
rename from tests/ui/issues/issue-40288.rs
rename to tests/ui/borrowck/cannot-assign-borrowed-ref-in-slice.rs
index 60204c1175476..97d2f690b6245 100644
--- a/tests/ui/issues/issue-40288.rs
+++ b/tests/ui/borrowck/cannot-assign-borrowed-ref-in-slice.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/40288
 fn save_ref<'a>(refr: &'a i32, to: &mut [&'a i32]) {
     for val in &mut *to {
         *val = refr;
diff --git a/tests/ui/issues/issue-40288.stderr b/tests/ui/borrowck/cannot-assign-borrowed-ref-in-slice.stderr
similarity index 89%
rename from tests/ui/issues/issue-40288.stderr
rename to tests/ui/borrowck/cannot-assign-borrowed-ref-in-slice.stderr
index 180adcd6e99bc..c4371d9d9cc90 100644
--- a/tests/ui/issues/issue-40288.stderr
+++ b/tests/ui/borrowck/cannot-assign-borrowed-ref-in-slice.stderr
@@ -1,5 +1,5 @@
 error[E0506]: cannot assign to `*refr` because it is borrowed
-  --> $DIR/issue-40288.rs:16:5
+  --> $DIR/cannot-assign-borrowed-ref-in-slice.rs:17:5
    |
 LL |     save_ref(&*refr, &mut out);
    |              ------ `*refr` is borrowed here
diff --git a/tests/ui/issues/issue-41726.rs b/tests/ui/borrowck/cannot-borrow-index-of-hashmap-in-for.rs
similarity index 76%
rename from tests/ui/issues/issue-41726.rs
rename to tests/ui/borrowck/cannot-borrow-index-of-hashmap-in-for.rs
index 39631912c00e7..cd403172704f8 100644
--- a/tests/ui/issues/issue-41726.rs
+++ b/tests/ui/borrowck/cannot-borrow-index-of-hashmap-in-for.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/41726
 use std::collections::HashMap;
 fn main() {
     let things: HashMap<String, Vec<String>> = HashMap::new();
diff --git a/tests/ui/issues/issue-41726.stderr b/tests/ui/borrowck/cannot-borrow-index-of-hashmap-in-for.stderr
similarity index 91%
rename from tests/ui/issues/issue-41726.stderr
rename to tests/ui/borrowck/cannot-borrow-index-of-hashmap-in-for.stderr
index d5123ab679f8b..64dd3a752fd91 100644
--- a/tests/ui/issues/issue-41726.stderr
+++ b/tests/ui/borrowck/cannot-borrow-index-of-hashmap-in-for.stderr
@@ -1,5 +1,5 @@
 error[E0596]: cannot borrow data in an index of `HashMap<String, Vec<String>>` as mutable
-  --> $DIR/issue-41726.rs:5:9
+  --> $DIR/cannot-borrow-index-of-hashmap-in-for.rs:6:9
    |
 LL |         things[src.as_str()].sort();
    |         ^^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable
diff --git a/tests/ui/issues/issue-44405.rs b/tests/ui/borrowck/cannot-borrow-index-output-mutably.rs
similarity index 84%
rename from tests/ui/issues/issue-44405.rs
rename to tests/ui/borrowck/cannot-borrow-index-output-mutably.rs
index d404b9044dd6f..e2391d37734ac 100644
--- a/tests/ui/issues/issue-44405.rs
+++ b/tests/ui/borrowck/cannot-borrow-index-output-mutably.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/44405
 use std::ops::Index;
 
 struct Test;
diff --git a/tests/ui/issues/issue-44405.stderr b/tests/ui/borrowck/cannot-borrow-index-output-mutably.stderr
similarity index 87%
rename from tests/ui/issues/issue-44405.stderr
rename to tests/ui/borrowck/cannot-borrow-index-output-mutably.stderr
index 26d2b385efa28..174a1ad0be54c 100644
--- a/tests/ui/issues/issue-44405.stderr
+++ b/tests/ui/borrowck/cannot-borrow-index-output-mutably.stderr
@@ -1,5 +1,5 @@
 error[E0596]: cannot borrow data in an index of `Container` as mutable
-  --> $DIR/issue-44405.rs:21:5
+  --> $DIR/cannot-borrow-index-output-mutably.rs:22:5
    |
 LL |     container[&mut val].test();
    |     ^^^^^^^^^^^^^^^^^^^ cannot borrow as mutable
diff --git a/tests/ui/issues/issue-4335.rs b/tests/ui/borrowck/cannot-move-out-of-borrowed-ref-closure.rs
similarity index 76%
rename from tests/ui/issues/issue-4335.rs
rename to tests/ui/borrowck/cannot-move-out-of-borrowed-ref-closure.rs
index c5914a17cf924..337ffcfa360b2 100644
--- a/tests/ui/issues/issue-4335.rs
+++ b/tests/ui/borrowck/cannot-move-out-of-borrowed-ref-closure.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/4335
 #![feature(fn_traits)]
 
 fn id<T>(t: T) -> T { t }
diff --git a/tests/ui/issues/issue-4335.stderr b/tests/ui/borrowck/cannot-move-out-of-borrowed-ref-closure.stderr
similarity index 89%
rename from tests/ui/issues/issue-4335.stderr
rename to tests/ui/borrowck/cannot-move-out-of-borrowed-ref-closure.stderr
index d1a64e3dd4620..d2f1dd21794a8 100644
--- a/tests/ui/issues/issue-4335.stderr
+++ b/tests/ui/borrowck/cannot-move-out-of-borrowed-ref-closure.stderr
@@ -1,5 +1,5 @@
 error[E0507]: cannot move out of `*v`, as `v` is a captured variable in an `FnMut` closure
-  --> $DIR/issue-4335.rs:6:20
+  --> $DIR/cannot-move-out-of-borrowed-ref-closure.rs:7:20
    |
 LL | fn f<'r, T>(v: &'r T) -> Box<dyn FnMut() -> T + 'r> {
    |             -  ----- move occurs because `*v` has type `T`, which does not implement the `Copy` trait
@@ -12,7 +12,7 @@ LL |     id(Box::new(|| *v))
    |
    = help: `Fn` and `FnMut` closures require captured values to be able to be consumed multiple times, but `FnOnce` closures may consume them only once
 help: if `T` implemented `Clone`, you could clone the value
-  --> $DIR/issue-4335.rs:5:10
+  --> $DIR/cannot-move-out-of-borrowed-ref-closure.rs:6:10
    |
 LL | fn f<'r, T>(v: &'r T) -> Box<dyn FnMut() -> T + 'r> {
    |          ^ consider constraining this type parameter with `Clone`
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 89%
rename from tests/ui/issues/issue-26619.rs
rename to tests/ui/borrowck/cannot-return-ref-to-fn-param-in-filter-map.rs
index b9d34b0555aee..2553e120edcc7 100644
--- a/tests/ui/issues/issue-26619.rs
+++ b/tests/ui/borrowck/cannot-return-ref-to-fn-param-in-filter-map.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/26619
 pub struct History<'a> { pub _s: &'a str }
 
 impl<'a> History<'a> {
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 90%
rename from tests/ui/issues/issue-26619.stderr
rename to tests/ui/borrowck/cannot-return-ref-to-fn-param-in-filter-map.stderr
index 9175bd2a3032c..4b3df02d852c0 100644
--- a/tests/ui/issues/issue-26619.stderr
+++ b/tests/ui/borrowck/cannot-return-ref-to-fn-param-in-filter-map.stderr
@@ -1,5 +1,5 @@
 error[E0515]: cannot return value referencing function parameter
-  --> $DIR/issue-26619.rs:5:76
+  --> $DIR/cannot-return-ref-to-fn-param-in-filter-map.rs:6:76
    |
 LL |         for s in vec!["1|2".to_string()].into_iter().filter_map(|ref line| self.make_entry(line)) {
    |                                                                  --------  ^^^^^^^^^^^^^^^^^^^^^ returns a value referencing data owned by the current function
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 85%
rename from tests/ui/issues/issue-27592.stderr
rename to tests/ui/borrowck/cannot-return-ref-to-temporary-format-args.stderr
index f1de7b9e569da..ec30560130dad 100644
--- a/tests/ui/issues/issue-27592.stderr
+++ b/tests/ui/borrowck/cannot-return-ref-to-temporary-format-args.stderr
@@ -1,11 +1,11 @@
 error[E0515]: cannot return reference to temporary value
-  --> $DIR/issue-27592.rs:16:14
+  --> $DIR/cannot-return-ref-to-temporary-format-args.rs:16:14
    |
 LL |     write(|| format_args!("{}", String::from("Hello world")));
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ returns a reference to data owned by the current function
 
 error[E0515]: cannot return value referencing temporary value
-  --> $DIR/issue-27592.rs:16:14
+  --> $DIR/cannot-return-ref-to-temporary-format-args.rs:16:14
    |
 LL |     write(|| format_args!("{}", String::from("Hello world")));
    |              ^^^^^^^^^^^^^^^^^^^---------------------------^
diff --git a/tests/ui/issues/issue-18566.rs b/tests/ui/borrowck/deref-and-mut-borrow-conflict.rs
similarity index 85%
rename from tests/ui/issues/issue-18566.rs
rename to tests/ui/borrowck/deref-and-mut-borrow-conflict.rs
index 9da904acf1f2b..387422986be78 100644
--- a/tests/ui/issues/issue-18566.rs
+++ b/tests/ui/borrowck/deref-and-mut-borrow-conflict.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/18566
 use std::ops::Deref;
 
 struct MyPtr<'a>(&'a mut usize);
diff --git a/tests/ui/issues/issue-18566.stderr b/tests/ui/borrowck/deref-and-mut-borrow-conflict.stderr
similarity index 88%
rename from tests/ui/issues/issue-18566.stderr
rename to tests/ui/borrowck/deref-and-mut-borrow-conflict.stderr
index e8ec48b0d2696..8dc6e2901b6e3 100644
--- a/tests/ui/issues/issue-18566.stderr
+++ b/tests/ui/borrowck/deref-and-mut-borrow-conflict.stderr
@@ -1,5 +1,5 @@
 error[E0499]: cannot borrow `*s` as mutable more than once at a time
-  --> $DIR/issue-18566.rs:23:19
+  --> $DIR/deref-and-mut-borrow-conflict.rs:24:19
    |
 LL |     MyPtr(s).poke(s);
    |           -  ---- ^ second mutable borrow occurs here
diff --git a/tests/ui/issues/issue-28971.rs b/tests/ui/borrowck/fnmut-borrow-error-in-closure-match.rs
similarity index 81%
rename from tests/ui/issues/issue-28971.rs
rename to tests/ui/borrowck/fnmut-borrow-error-in-closure-match.rs
index e6a504f52e0cd..4288155202dc3 100644
--- a/tests/ui/issues/issue-28971.rs
+++ b/tests/ui/borrowck/fnmut-borrow-error-in-closure-match.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/28971
 enum Foo {
     Bar(u8)
 }
diff --git a/tests/ui/issues/issue-28971.stderr b/tests/ui/borrowck/fnmut-borrow-error-in-closure-match.stderr
similarity index 89%
rename from tests/ui/issues/issue-28971.stderr
rename to tests/ui/borrowck/fnmut-borrow-error-in-closure-match.stderr
index de3fff0a49e30..925d12fe90f04 100644
--- a/tests/ui/issues/issue-28971.stderr
+++ b/tests/ui/borrowck/fnmut-borrow-error-in-closure-match.stderr
@@ -1,5 +1,5 @@
 error[E0599]: no variant, associated function, or constant named `Baz` found for enum `Foo` in the current scope
-  --> $DIR/issue-28971.rs:7:18
+  --> $DIR/fnmut-borrow-error-in-closure-match.rs:8:18
    |
 LL | enum Foo {
    | -------- variant, associated function, or constant `Baz` not found for this enum
@@ -14,7 +14,7 @@ LL +             Foo::Bar(..) => (),
    |
 
 error[E0596]: cannot borrow `f` as mutable, as it is not declared as mutable
-  --> $DIR/issue-28971.rs:15:5
+  --> $DIR/fnmut-borrow-error-in-closure-match.rs:16:5
    |
 LL |     f();
    |     ^ cannot borrow as mutable
diff --git a/tests/ui/issues/issue-42106.rs b/tests/ui/borrowck/immutable-borrow-prevents-mut-method.rs
similarity index 78%
rename from tests/ui/issues/issue-42106.rs
rename to tests/ui/borrowck/immutable-borrow-prevents-mut-method.rs
index 5e688693bf9ed..9803a72fb4b6a 100644
--- a/tests/ui/issues/issue-42106.rs
+++ b/tests/ui/borrowck/immutable-borrow-prevents-mut-method.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/42106
 fn do_something<T>(collection: &mut Vec<T>) {
     let _a = &collection;
     collection.swap(1, 2); //~ ERROR also borrowed as immutable
diff --git a/tests/ui/issues/issue-42106.stderr b/tests/ui/borrowck/immutable-borrow-prevents-mut-method.stderr
similarity index 89%
rename from tests/ui/issues/issue-42106.stderr
rename to tests/ui/borrowck/immutable-borrow-prevents-mut-method.stderr
index d5919870d9be2..0d9a7a96ed8f4 100644
--- a/tests/ui/issues/issue-42106.stderr
+++ b/tests/ui/borrowck/immutable-borrow-prevents-mut-method.stderr
@@ -1,5 +1,5 @@
 error[E0502]: cannot borrow `*collection` as mutable because it is also borrowed as immutable
-  --> $DIR/issue-42106.rs:3:5
+  --> $DIR/immutable-borrow-prevents-mut-method.rs:4:5
    |
 LL |     let _a = &collection;
    |              ----------- immutable borrow occurs here
diff --git a/tests/ui/issues/issue-18783.rs b/tests/ui/borrowck/mut-borrow-conflict-in-closures-vec.rs
similarity index 90%
rename from tests/ui/issues/issue-18783.rs
rename to tests/ui/borrowck/mut-borrow-conflict-in-closures-vec.rs
index d4851ac14187e..cccf1c4047794 100644
--- a/tests/ui/issues/issue-18783.rs
+++ b/tests/ui/borrowck/mut-borrow-conflict-in-closures-vec.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/18783
 use std::cell::RefCell;
 
 fn main() {
diff --git a/tests/ui/issues/issue-18783.stderr b/tests/ui/borrowck/mut-borrow-conflict-in-closures-vec.stderr
similarity index 92%
rename from tests/ui/issues/issue-18783.stderr
rename to tests/ui/borrowck/mut-borrow-conflict-in-closures-vec.stderr
index cc223ac464c8c..6c99692a79950 100644
--- a/tests/ui/issues/issue-18783.stderr
+++ b/tests/ui/borrowck/mut-borrow-conflict-in-closures-vec.stderr
@@ -1,5 +1,5 @@
 error[E0499]: cannot borrow `y` as mutable more than once at a time
-  --> $DIR/issue-18783.rs:7:21
+  --> $DIR/mut-borrow-conflict-in-closures-vec.rs:8:21
    |
 LL |     c.push(Box::new(|| y = 0));
    |                     -- - first borrow occurs due to use of `y` in closure
@@ -14,7 +14,7 @@ LL | }
    | - first borrow might be used here, when `c` is dropped and runs the destructor for type `RefCell<Vec<Box<dyn FnMut()>>>`
 
 error[E0499]: cannot borrow `y` as mutable more than once at a time
-  --> $DIR/issue-18783.rs:16:29
+  --> $DIR/mut-borrow-conflict-in-closures-vec.rs:17:29
    |
 LL |     Push::push(&c, Box::new(|| y = 0));
    |                             -- - first borrow occurs due to use of `y` in closure
diff --git a/tests/ui/issues/issue-25579.rs b/tests/ui/borrowck/reborrow-in-loop-match-recursive-enum.rs
similarity index 83%
rename from tests/ui/issues/issue-25579.rs
rename to tests/ui/borrowck/reborrow-in-loop-match-recursive-enum.rs
index f4bbb41469e18..77c43ff01fa04 100644
--- a/tests/ui/issues/issue-25579.rs
+++ b/tests/ui/borrowck/reborrow-in-loop-match-recursive-enum.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/25579
 //@ check-pass
 
 enum Sexpression {
diff --git a/tests/ui/issues/issue-28839.rs b/tests/ui/borrowck/reborrow-in-match-ref-mut-option.rs
similarity index 80%
rename from tests/ui/issues/issue-28839.rs
rename to tests/ui/borrowck/reborrow-in-match-ref-mut-option.rs
index 76b0fa2d6e089..001921228d994 100644
--- a/tests/ui/issues/issue-28839.rs
+++ b/tests/ui/borrowck/reborrow-in-match-ref-mut-option.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/28839
 //@ run-pass
 
 pub struct Foo;
diff --git a/tests/ui/issues/issue-29053.rs b/tests/ui/borrowck/ref-mut-rebind-does-not-affect-outer.rs
similarity index 71%
rename from tests/ui/issues/issue-29053.rs
rename to tests/ui/borrowck/ref-mut-rebind-does-not-affect-outer.rs
index 3b61dc1152214..6748442be1306 100644
--- a/tests/ui/issues/issue-29053.rs
+++ b/tests/ui/borrowck/ref-mut-rebind-does-not-affect-outer.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/29053
 //@ run-pass
 fn main() {
     let x: &'static str = "x";
diff --git a/tests/ui/issues/issue-47703.rs b/tests/ui/borrowck/self-field-consume-with-drop-type.rs
similarity index 77%
rename from tests/ui/issues/issue-47703.rs
rename to tests/ui/borrowck/self-field-consume-with-drop-type.rs
index deece30098719..b21c676881229 100644
--- a/tests/ui/issues/issue-47703.rs
+++ b/tests/ui/borrowck/self-field-consume-with-drop-type.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/47703
 //@ check-pass
 
 struct MyStruct<'a> {
diff --git a/tests/ui/issues/issue-47703-1.rs b/tests/ui/borrowck/struct-field-move-with-drop-borrow.rs
similarity index 82%
rename from tests/ui/issues/issue-47703-1.rs
rename to tests/ui/borrowck/struct-field-move-with-drop-borrow.rs
index 9913d1fefe080..3e40e382e5305 100644
--- a/tests/ui/issues/issue-47703-1.rs
+++ b/tests/ui/borrowck/struct-field-move-with-drop-borrow.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/47703
 //@ check-pass
 
 struct AtomicRefMut<'a> {
diff --git a/tests/ui/issues/issue-47703-tuple.rs b/tests/ui/borrowck/tuple-field-move-with-drop-borrow.rs
similarity index 68%
rename from tests/ui/issues/issue-47703-tuple.rs
rename to tests/ui/borrowck/tuple-field-move-with-drop-borrow.rs
index 17a0da8c5f8e0..4b94c32bdd3aa 100644
--- a/tests/ui/issues/issue-47703-tuple.rs
+++ b/tests/ui/borrowck/tuple-field-move-with-drop-borrow.rs
@@ -1,3 +1,4 @@
+//! Regression test for https://github.com/rust-lang/rust/issues/47703
 //@ check-pass
 
 struct WithDrop;
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 92%
rename from tests/ui/issues/issue-29723.stderr
rename to tests/ui/borrowck/use-moved-value-in-match-guard-drop.stderr
index 6a4a8fc453eda..b7aafb07a0c4b 100644
--- a/tests/ui/issues/issue-29723.stderr
+++ b/tests/ui/borrowck/use-moved-value-in-match-guard-drop.stderr
@@ -1,5 +1,5 @@
 error[E0382]: use of moved value: `s`
-  --> $DIR/issue-29723.rs:10:13
+  --> $DIR/use-moved-value-in-match-guard-drop.rs:10:13
    |
 LL |     let s = String::new();
    |         - move occurs because `s` has type `String`, which does not implement the `Copy` trait
@@ -16,7 +16,7 @@ LL |         0 if { drop(s.clone()); false } => String::from("oops"),
    |                      ++++++++
 
 error[E0382]: use of moved value: `s`
-  --> $DIR/issue-29723.rs:18:14
+  --> $DIR/use-moved-value-in-match-guard-drop.rs:18:14
    |
 LL |     let s = String::new();
    |         - move occurs because `s` has type `String`, which does not implement the `Copy` trait