diff --git a/tests/ui/issues/issue-2590.rs b/tests/ui/borrowck/cannot-move-out-of-borrowed-field-issue-2590.rs
similarity index 81%
rename from tests/ui/issues/issue-2590.rs
rename to tests/ui/borrowck/cannot-move-out-of-borrowed-field-issue-2590.rs
index a9a0e5ca4ec16..e21438f031871 100644
--- a/tests/ui/issues/issue-2590.rs
+++ b/tests/ui/borrowck/cannot-move-out-of-borrowed-field-issue-2590.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/2590
+
 struct Parser {
     tokens: Vec<isize> ,
 }
diff --git a/tests/ui/borrowck/cannot-move-out-of-borrowed-field.rs b/tests/ui/borrowck/cannot-move-out-of-borrowed-field.rs
new file mode 100644
index 0000000000000..e21438f031871
--- /dev/null
+++ b/tests/ui/borrowck/cannot-move-out-of-borrowed-field.rs
@@ -0,0 +1,17 @@
+// https://github.com/rust-lang/rust/issues/2590
+
+struct Parser {
+    tokens: Vec<isize> ,
+}
+
+trait Parse {
+    fn parse(&self) -> Vec<isize> ;
+}
+
+impl Parse for Parser {
+    fn parse(&self) -> Vec<isize> {
+        self.tokens //~ ERROR cannot move out
+    }
+}
+
+fn main() {}
diff --git a/tests/ui/issues/issue-2590.stderr b/tests/ui/borrowck/cannot-move-out-of-borrowed-field.stderr
similarity index 100%
rename from tests/ui/issues/issue-2590.stderr
rename to tests/ui/borrowck/cannot-move-out-of-borrowed-field.stderr
diff --git a/tests/ui/issues/issue-4335.rs b/tests/ui/borrowck/move-out-of-borrowed-content-in-closure.rs
similarity index 81%
rename from tests/ui/issues/issue-4335.rs
rename to tests/ui/borrowck/move-out-of-borrowed-content-in-closure.rs
index c5914a17cf924..c1d649f74f507 100644
--- a/tests/ui/issues/issue-4335.rs
+++ b/tests/ui/borrowck/move-out-of-borrowed-content-in-closure.rs
@@ -1,3 +1,5 @@
+// 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/move-out-of-borrowed-content-in-closure.stderr
similarity index 100%
rename from tests/ui/issues/issue-4335.stderr
rename to tests/ui/borrowck/move-out-of-borrowed-content-in-closure.stderr
diff --git a/tests/ui/issues/issue-3021-b.rs b/tests/ui/closures/capture-dynamic-environment.rs
similarity index 82%
rename from tests/ui/issues/issue-3021-b.rs
rename to tests/ui/closures/capture-dynamic-environment.rs
index f1630afe1730e..2b6c74aa3972e 100644
--- a/tests/ui/issues/issue-3021-b.rs
+++ b/tests/ui/closures/capture-dynamic-environment.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/3021
+
 fn siphash(k0 : u64) {
 
     struct SipHash {
diff --git a/tests/ui/issues/issue-3021-b.stderr b/tests/ui/closures/capture-dynamic-environment.stderr
similarity index 100%
rename from tests/ui/issues/issue-3021-b.stderr
rename to tests/ui/closures/capture-dynamic-environment.stderr
diff --git a/tests/ui/issues/issue-17252.rs b/tests/ui/consts/const-eval-cycle-detection.rs
similarity index 86%
rename from tests/ui/issues/issue-17252.rs
rename to tests/ui/consts/const-eval-cycle-detection.rs
index dd002bfd187a0..ba99a6c5147c7 100644
--- a/tests/ui/issues/issue-17252.rs
+++ b/tests/ui/consts/const-eval-cycle-detection.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/17252
+
 const FOO: usize = FOO; //~ ERROR E0391
 //@ ignore-parallel-frontend query cycle
 fn main() {
diff --git a/tests/ui/issues/issue-17252.stderr b/tests/ui/consts/const-eval-cycle-detection.stderr
similarity index 100%
rename from tests/ui/issues/issue-17252.stderr
rename to tests/ui/consts/const-eval-cycle-detection.stderr
diff --git a/tests/ui/issues/issue-2150.rs b/tests/ui/lint/unreachable-code-in-loop.rs
similarity index 82%
rename from tests/ui/issues/issue-2150.rs
rename to tests/ui/lint/unreachable-code-in-loop.rs
index baa1dde0fc2e8..151d3f5a6f8da 100644
--- a/tests/ui/issues/issue-2150.rs
+++ b/tests/ui/lint/unreachable-code-in-loop.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/2150
+
 #![deny(unreachable_code)]
 #![allow(unused_variables)]
 #![allow(dead_code)]
diff --git a/tests/ui/issues/issue-2150.stderr b/tests/ui/lint/unreachable-code-in-loop.stderr
similarity index 100%
rename from tests/ui/issues/issue-2150.stderr
rename to tests/ui/lint/unreachable-code-in-loop.stderr
diff --git a/tests/ui/issues/issue-4972.rs b/tests/ui/pattern/box-pattern-trait-object-deref-error.rs
similarity index 85%
rename from tests/ui/issues/issue-4972.rs
rename to tests/ui/pattern/box-pattern-trait-object-deref-error.rs
index 3f1c6f855007c..59ab4aaf61a80 100644
--- a/tests/ui/issues/issue-4972.rs
+++ b/tests/ui/pattern/box-pattern-trait-object-deref-error.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/4972
+
 #![feature(box_patterns)]
 
 trait MyTrait {
diff --git a/tests/ui/issues/issue-5100.stderr b/tests/ui/pattern/box-pattern-trait-object-deref-error.stderr
similarity index 100%
rename from tests/ui/issues/issue-5100.stderr
rename to tests/ui/pattern/box-pattern-trait-object-deref-error.stderr
diff --git a/tests/ui/issues/issue-5100.rs b/tests/ui/pattern/pattern-mismatched-types-diagnostics.rs
similarity index 96%
rename from tests/ui/issues/issue-5100.rs
rename to tests/ui/pattern/pattern-mismatched-types-diagnostics.rs
index e9ae551bb77f4..3b4e57f56557b 100644
--- a/tests/ui/issues/issue-5100.rs
+++ b/tests/ui/pattern/pattern-mismatched-types-diagnostics.rs
@@ -1,4 +1,5 @@
 //@ dont-require-annotations: NOTE
+// https://github.com/rust-lang/rust/issues/5100
 
 #![feature(box_patterns)]
 
diff --git a/tests/ui/issues/issue-4972.stderr b/tests/ui/pattern/pattern-mismatched-types-diagnostics.stderr
similarity index 100%
rename from tests/ui/issues/issue-4972.stderr
rename to tests/ui/pattern/pattern-mismatched-types-diagnostics.stderr
diff --git a/tests/ui/issues/issue-17800.rs b/tests/ui/pattern/tuple-variant-written-as-struct-pattern.rs
similarity index 82%
rename from tests/ui/issues/issue-17800.rs
rename to tests/ui/pattern/tuple-variant-written-as-struct-pattern.rs
index 5254f45d7c2de..95f69d53c09d9 100644
--- a/tests/ui/issues/issue-17800.rs
+++ b/tests/ui/pattern/tuple-variant-written-as-struct-pattern.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/17800
+
 enum MyOption<T> {
     MySome(T),
     MyNone,
diff --git a/tests/ui/issues/issue-17800.stderr b/tests/ui/pattern/tuple-variant-written-as-struct-pattern.stderr
similarity index 100%
rename from tests/ui/issues/issue-17800.stderr
rename to tests/ui/pattern/tuple-variant-written-as-struct-pattern.stderr
diff --git a/tests/ui/issues/issue-3702-2.rs b/tests/ui/traits/method-resolution-multiple-traits.rs
similarity index 89%
rename from tests/ui/issues/issue-3702-2.rs
rename to tests/ui/traits/method-resolution-multiple-traits.rs
index d47f6d248f708..4393e18068e18 100644
--- a/tests/ui/issues/issue-3702-2.rs
+++ b/tests/ui/traits/method-resolution-multiple-traits.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/3702
+
 pub trait ToPrimitive {
     fn to_int(&self) -> isize { 0 }
 }
diff --git a/tests/ui/issues/issue-3702-2.stderr b/tests/ui/traits/method-resolution-multiple-traits.stderr
similarity index 100%
rename from tests/ui/issues/issue-3702-2.stderr
rename to tests/ui/traits/method-resolution-multiple-traits.stderr
diff --git a/tests/ui/issues/issue-4265.rs b/tests/ui/typeck/duplicate-method-definitions-in-impl.rs
similarity index 80%
rename from tests/ui/issues/issue-4265.rs
rename to tests/ui/typeck/duplicate-method-definitions-in-impl.rs
index 99b13283bc972..bee01e60c159b 100644
--- a/tests/ui/issues/issue-4265.rs
+++ b/tests/ui/typeck/duplicate-method-definitions-in-impl.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/4265
+
 struct Foo {
       baz: usize
 }
diff --git a/tests/ui/issues/issue-4265.stderr b/tests/ui/typeck/duplicate-method-definitions-in-impl.stderr
similarity index 100%
rename from tests/ui/issues/issue-4265.stderr
rename to tests/ui/typeck/duplicate-method-definitions-in-impl.stderr
diff --git a/tests/ui/issues/issue-4736.rs b/tests/ui/typeck/tuple-struct-field-constructor-error.rs
similarity index 71%
rename from tests/ui/issues/issue-4736.rs
rename to tests/ui/typeck/tuple-struct-field-constructor-error.rs
index 799d2d4809860..979fd030b3394 100644
--- a/tests/ui/issues/issue-4736.rs
+++ b/tests/ui/typeck/tuple-struct-field-constructor-error.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/4736
+
 struct NonCopyable(());
 
 fn main() {
diff --git a/tests/ui/issues/issue-4736.stderr b/tests/ui/typeck/tuple-struct-field-constructor-error.stderr
similarity index 100%
rename from tests/ui/issues/issue-4736.stderr
rename to tests/ui/typeck/tuple-struct-field-constructor-error.stderr