diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt
index b63f4d46139c7..db6008da59b34 100644
--- a/src/tools/tidy/src/issues.txt
+++ b/src/tools/tidy/src/issues.txt
@@ -2442,7 +2442,6 @@ ui/span/issue-42234-unknown-receiver-type.rs
 ui/span/issue-43927-non-ADT-derive.rs
 ui/span/issue-71363.rs
 ui/span/issue-81800.rs
-ui/span/issue28498-reject-ex1.rs
 ui/span/issue28498-reject-lifetime-param.rs
 ui/span/issue28498-reject-passed-to-fn.rs
 ui/span/issue28498-reject-trait-bound.rs
diff --git a/tests/ui/issues/issue-28550.rs b/tests/ui/associated-types/nested-fnonce-output-projection.rs
similarity index 81%
rename from tests/ui/issues/issue-28550.rs
rename to tests/ui/associated-types/nested-fnonce-output-projection.rs
index 31c7057d06f8c..aa03ca10430ac 100644
--- a/tests/ui/issues/issue-28550.rs
+++ b/tests/ui/associated-types/nested-fnonce-output-projection.rs
@@ -1,4 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/28550>.
 //@ run-pass
+
 struct A<F: FnOnce()->T,T>(F::Output);
 struct B<F: FnOnce()->T,T>(A<F,T>);
 
diff --git a/tests/ui/issues/issue-28828.rs b/tests/ui/associated-types/projection-as-type-alias.rs
similarity index 60%
rename from tests/ui/issues/issue-28828.rs
rename to tests/ui/associated-types/projection-as-type-alias.rs
index b5d7385cf28f0..b3e01be818e1f 100644
--- a/tests/ui/issues/issue-28828.rs
+++ b/tests/ui/associated-types/projection-as-type-alias.rs
@@ -1,4 +1,7 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/28828>.
+//! This failed to compile as associated types aliases were not normalized.
 //@ run-pass
+
 pub trait Foo {
     type Out;
 }
diff --git a/tests/ui/issues/issue-28600.rs b/tests/ui/extern/extern-c-method-with-str-param.rs
similarity index 57%
rename from tests/ui/issues/issue-28600.rs
rename to tests/ui/extern/extern-c-method-with-str-param.rs
index a5427b94a57c5..d0fe55bd1d0f1 100644
--- a/tests/ui/issues/issue-28600.rs
+++ b/tests/ui/extern/extern-c-method-with-str-param.rs
@@ -1,5 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/28600>.
+//! pub extern fn with parameter type &str inside struct impl caused ICE.
 //@ build-pass
-// #28600 ICE: pub extern fn with parameter type &str inside struct impl
 
 struct Test;
 
diff --git a/tests/ui/issues/issue-28936.rs b/tests/ui/inference/closure-arg-lifetime-by-ref.rs
similarity index 90%
rename from tests/ui/issues/issue-28936.rs
rename to tests/ui/inference/closure-arg-lifetime-by-ref.rs
index 96503f0711d27..f00a38ea061c8 100644
--- a/tests/ui/issues/issue-28936.rs
+++ b/tests/ui/inference/closure-arg-lifetime-by-ref.rs
@@ -1,4 +1,6 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/28936>.
 //@ check-pass
+
 pub type Session = i32;
 pub struct StreamParser<'a, T> {
     _tokens: T,
diff --git a/tests/ui/issues/issue-28776.rs b/tests/ui/issues/issue-28776.rs
deleted file mode 100644
index e564ebcd110cb..0000000000000
--- a/tests/ui/issues/issue-28776.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-use std::ptr;
-
-fn main() {
-    (&ptr::write)(1 as *mut _, 42);
-    //~^ ERROR E0133
-}
diff --git a/tests/ui/issues/issue-28999.rs b/tests/ui/lifetimes/field-borrow-lifetime-inference.rs
similarity index 62%
rename from tests/ui/issues/issue-28999.rs
rename to tests/ui/lifetimes/field-borrow-lifetime-inference.rs
index 572a0beff61f6..a8582dbd29b62 100644
--- a/tests/ui/issues/issue-28999.rs
+++ b/tests/ui/lifetimes/field-borrow-lifetime-inference.rs
@@ -1,4 +1,7 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/28999>.
+//! `this.v` was not constrained and inferred `'a`.
 //@ check-pass
+
 pub struct Xyz<'a, V> {
     pub v: (V, &'a u32),
 }
diff --git a/tests/ui/issues/issue-28498-must-work-ex1.rs b/tests/ui/rfcs/rfc-1238-nonparametric-dropck/must-work-ex1.rs
similarity index 63%
rename from tests/ui/issues/issue-28498-must-work-ex1.rs
rename to tests/ui/rfcs/rfc-1238-nonparametric-dropck/must-work-ex1.rs
index 813cd8645f923..9afd7ddbd88a9 100644
--- a/tests/ui/issues/issue-28498-must-work-ex1.rs
+++ b/tests/ui/rfcs/rfc-1238-nonparametric-dropck/must-work-ex1.rs
@@ -1,8 +1,7 @@
+//! Test for <https://github.com/rust-lang/rust/issues/28498>.
+//! Example taken from RFC 1238 text
+//! <https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md>.
 //@ run-pass
-// Example taken from RFC 1238 text
-
-// https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md
-//     #examples-of-code-that-must-continue-to-work
 
 use std::cell::Cell;
 
diff --git a/tests/ui/issues/issue-28498-must-work-ex2.rs b/tests/ui/rfcs/rfc-1238-nonparametric-dropck/must-work-ex2.rs
similarity index 67%
rename from tests/ui/issues/issue-28498-must-work-ex2.rs
rename to tests/ui/rfcs/rfc-1238-nonparametric-dropck/must-work-ex2.rs
index 98514b1163675..4e8d403672641 100644
--- a/tests/ui/issues/issue-28498-must-work-ex2.rs
+++ b/tests/ui/rfcs/rfc-1238-nonparametric-dropck/must-work-ex2.rs
@@ -1,8 +1,7 @@
+//! Test for <https://github.com/rust-lang/rust/issues/28498>.
+//! Example taken from RFC 1238 text
+//! <https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md>.
 //@ run-pass
-// Example taken from RFC 1238 text
-
-// https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md
-//     #examples-of-code-that-must-continue-to-work
 
 use std::cell::Cell;
 
diff --git a/tests/ui/span/issue28498-reject-ex1.rs b/tests/ui/rfcs/rfc-1238-nonparametric-dropck/reject-ex1.rs
similarity index 76%
rename from tests/ui/span/issue28498-reject-ex1.rs
rename to tests/ui/rfcs/rfc-1238-nonparametric-dropck/reject-ex1.rs
index 4d1b4125503b6..3209a17041f67 100644
--- a/tests/ui/span/issue28498-reject-ex1.rs
+++ b/tests/ui/rfcs/rfc-1238-nonparametric-dropck/reject-ex1.rs
@@ -1,9 +1,7 @@
-// Example taken from RFC 1238 text
-
-// https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md
-//     #examples-of-code-that-will-start-to-be-rejected
-
-// Compare against test/run-pass/issue28498-must-work-ex2.rs
+//! Test for <https://github.com/rust-lang/rust/issues/28498>.
+//! Example taken from RFC 1238 text
+//! <https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md>.
+//! Compare against tests/ui/rfcs/rfc-1238-nonparametric-dropck/must-work-ex2.rs.
 
 use std::cell::Cell;
 
diff --git a/tests/ui/span/issue28498-reject-ex1.stderr b/tests/ui/rfcs/rfc-1238-nonparametric-dropck/reject-ex1.stderr
similarity index 93%
rename from tests/ui/span/issue28498-reject-ex1.stderr
rename to tests/ui/rfcs/rfc-1238-nonparametric-dropck/reject-ex1.stderr
index 7b8af23a6cd7b..6e20f06d7fe4c 100644
--- a/tests/ui/span/issue28498-reject-ex1.stderr
+++ b/tests/ui/rfcs/rfc-1238-nonparametric-dropck/reject-ex1.stderr
@@ -1,5 +1,5 @@
 error[E0713]: borrow may still be in use when destructor runs
-  --> $DIR/issue28498-reject-ex1.rs:34:29
+  --> $DIR/reject-ex1.rs:32:29
    |
 LL |     foo.data[0].1.set(Some(&foo.data[1]));
    |                             ^^^^^^^^
diff --git a/tests/ui/issues/issue-28498-ugeh-ex1.rs b/tests/ui/rfcs/rfc-1238-nonparametric-dropck/ugeh-ex1.rs
similarity index 73%
rename from tests/ui/issues/issue-28498-ugeh-ex1.rs
rename to tests/ui/rfcs/rfc-1238-nonparametric-dropck/ugeh-ex1.rs
index f606d2489484a..722523c094329 100644
--- a/tests/ui/issues/issue-28498-ugeh-ex1.rs
+++ b/tests/ui/rfcs/rfc-1238-nonparametric-dropck/ugeh-ex1.rs
@@ -1,10 +1,8 @@
+//! Test for <https://github.com/rust-lang/rust/issues/28498>.
+//! Example taken from RFC 1238 text
+//! <https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md>.
 //@ run-pass
 
-// Example taken from RFC 1238 text
-
-// https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md
-//     #example-of-the-unguarded-escape-hatch
-
 #![feature(dropck_eyepatch)]
 use std::cell::Cell;
 
diff --git a/tests/ui/issues/issue-28472.rs b/tests/ui/span/foreign-item-vis-span.rs
similarity index 55%
rename from tests/ui/issues/issue-28472.rs
rename to tests/ui/span/foreign-item-vis-span.rs
index 6db1f9a5bddf9..839e07ea1b961 100644
--- a/tests/ui/issues/issue-28472.rs
+++ b/tests/ui/span/foreign-item-vis-span.rs
@@ -1,4 +1,5 @@
-// Check that the visibility modifier is included in the span of foreign items.
+//! Regression test for <https://github.com/rust-lang/rust/issues/28472>.
+//! Check that the visibility modifier is included in the span of foreign items.
 
 extern "C" {
   fn foo();
diff --git a/tests/ui/issues/issue-28472.stderr b/tests/ui/span/foreign-item-vis-span.stderr
similarity index 90%
rename from tests/ui/issues/issue-28472.stderr
rename to tests/ui/span/foreign-item-vis-span.stderr
index 051ed25b6c9d9..912a338e4616a 100644
--- a/tests/ui/issues/issue-28472.stderr
+++ b/tests/ui/span/foreign-item-vis-span.stderr
@@ -1,5 +1,5 @@
 error[E0428]: the name `foo` is defined multiple times
-  --> $DIR/issue-28472.rs:6:3
+  --> $DIR/foreign-item-vis-span.rs:7:3
    |
 LL |     fn foo();
    |     --------- previous definition of the value `foo` here
@@ -11,7 +11,7 @@ LL | |   fn foo();
    = note: `foo` must be defined only once in the value namespace of this module
 
 error[E0428]: the name `foo` is defined multiple times
-  --> $DIR/issue-28472.rs:9:3
+  --> $DIR/foreign-item-vis-span.rs:10:3
    |
 LL |     fn foo();
    |     --------- previous definition of the value `foo` here
diff --git a/tests/ui/unsafe/unsafe-fn-called-through-ref.rs b/tests/ui/unsafe/unsafe-fn-called-through-ref.rs
new file mode 100644
index 0000000000000..d5ac06fe32956
--- /dev/null
+++ b/tests/ui/unsafe/unsafe-fn-called-through-ref.rs
@@ -0,0 +1,9 @@
+//! Regression test for <https://github.com/rust-lang/rust/issues/28776>.
+//! Unsafe fn could be called outside of unsafe block through autoderef.
+
+use std::ptr;
+
+fn main() {
+    (&ptr::write)(1 as *mut _, 42);
+    //~^ ERROR E0133
+}
diff --git a/tests/ui/issues/issue-28776.stderr b/tests/ui/unsafe/unsafe-fn-called-through-ref.stderr
similarity index 90%
rename from tests/ui/issues/issue-28776.stderr
rename to tests/ui/unsafe/unsafe-fn-called-through-ref.stderr
index 3db94ee181017..6978839ed1c8b 100644
--- a/tests/ui/issues/issue-28776.stderr
+++ b/tests/ui/unsafe/unsafe-fn-called-through-ref.stderr
@@ -1,5 +1,5 @@
 error[E0133]: call to unsafe function `std::ptr::write` is unsafe and requires unsafe function or block
-  --> $DIR/issue-28776.rs:4:5
+  --> $DIR/unsafe-fn-called-through-ref.rs:7:5
    |
 LL |     (&ptr::write)(1 as *mut _, 42);
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ call to unsafe function