diff --git a/tests/rustdoc-ui/issue-102467.rs b/tests/rustdoc-ui/associated-constant-not-allowed-102467.rs
similarity index 100%
rename from tests/rustdoc-ui/issue-102467.rs
rename to tests/rustdoc-ui/associated-constant-not-allowed-102467.rs
diff --git a/tests/rustdoc-ui/issue-102467.stderr b/tests/rustdoc-ui/associated-constant-not-allowed-102467.stderr
similarity index 87%
rename from tests/rustdoc-ui/issue-102467.stderr
rename to tests/rustdoc-ui/associated-constant-not-allowed-102467.stderr
index 5fcdba782e7eb..5c8f08afe7a5a 100644
--- a/tests/rustdoc-ui/issue-102467.stderr
+++ b/tests/rustdoc-ui/associated-constant-not-allowed-102467.stderr
@@ -1,5 +1,5 @@
 error[E0229]: associated item constraints are not allowed here
-  --> $DIR/issue-102467.rs:7:17
+  --> $DIR/associated-constant-not-allowed-102467.rs:7:17
    |
 LL |     type A: S<C<X = 0i32> = 34>;
    |                 ^^^^^^^^ associated item constraint not allowed here
@@ -11,7 +11,7 @@ LL +     type A: S<C = 34>;
    |
 
 error[E0229]: associated item constraints are not allowed here
-  --> $DIR/issue-102467.rs:7:17
+  --> $DIR/associated-constant-not-allowed-102467.rs:7:17
    |
 LL |     type A: S<C<X = 0i32> = 34>;
    |                 ^^^^^^^^ associated item constraint not allowed here
diff --git a/tests/rustdoc-ui/issue-110629-private-type-cycle.rs b/tests/rustdoc-ui/private-type-cycle-110629.rs
similarity index 83%
rename from tests/rustdoc-ui/issue-110629-private-type-cycle.rs
rename to tests/rustdoc-ui/private-type-cycle-110629.rs
index b31b9d03e7cb3..fecb0239a3c22 100644
--- a/tests/rustdoc-ui/issue-110629-private-type-cycle.rs
+++ b/tests/rustdoc-ui/private-type-cycle-110629.rs
@@ -1,4 +1,5 @@
 //@ check-pass
+// https://github.com/rust-lang/rust/issues/110629
 
 #![feature(type_alias_impl_trait)]
 
diff --git a/tests/rustdoc-ui/issue-110629-private-type-cycle-dyn.rs b/tests/rustdoc-ui/private-type-cycle-dyn-110629.rs
similarity index 83%
rename from tests/rustdoc-ui/issue-110629-private-type-cycle-dyn.rs
rename to tests/rustdoc-ui/private-type-cycle-dyn-110629.rs
index c920a815fda75..91bf64cdc567d 100644
--- a/tests/rustdoc-ui/issue-110629-private-type-cycle-dyn.rs
+++ b/tests/rustdoc-ui/private-type-cycle-dyn-110629.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/110629
+
 type Bar<'a, 'b> = Box<dyn PartialEq<Bar<'a, 'b>>>;
 //~^ ERROR cycle detected when expanding type alias
 
diff --git a/tests/rustdoc-ui/issue-110629-private-type-cycle-dyn.stderr b/tests/rustdoc-ui/private-type-cycle-dyn-110629.stderr
similarity index 88%
rename from tests/rustdoc-ui/issue-110629-private-type-cycle-dyn.stderr
rename to tests/rustdoc-ui/private-type-cycle-dyn-110629.stderr
index 9394b019e11e0..6ee7e4b781c5b 100644
--- a/tests/rustdoc-ui/issue-110629-private-type-cycle-dyn.stderr
+++ b/tests/rustdoc-ui/private-type-cycle-dyn-110629.stderr
@@ -1,5 +1,5 @@
 error[E0391]: cycle detected when expanding type alias `Bar`
-  --> $DIR/issue-110629-private-type-cycle-dyn.rs:1:38
+  --> $DIR/private-type-cycle-dyn-110629.rs:3:38
    |
 LL | type Bar<'a, 'b> = Box<dyn PartialEq<Bar<'a, 'b>>>;
    |                                      ^^^^^^^^^^^
@@ -9,7 +9,7 @@ LL | type Bar<'a, 'b> = Box<dyn PartialEq<Bar<'a, 'b>>>;
    = help: consider using a struct, enum, or union instead to break the cycle
    = help: see <https://doc.rust-lang.org/reference/types.html#recursive-types> for more information
 note: cycle used when checking that `Bar` is well-formed
-  --> $DIR/issue-110629-private-type-cycle-dyn.rs:1:1
+  --> $DIR/private-type-cycle-dyn-110629.rs:3:1
    |
 LL | type Bar<'a, 'b> = Box<dyn PartialEq<Bar<'a, 'b>>>;
    | ^^^^^^^^^^^^^^^^
diff --git a/tests/rustdoc/issue-108931-anonymous-reexport.rs b/tests/rustdoc/anonymous-reexport-108931.rs
similarity index 92%
rename from tests/rustdoc/issue-108931-anonymous-reexport.rs
rename to tests/rustdoc/anonymous-reexport-108931.rs
index 300ee3baf053f..f4cc7f1239628 100644
--- a/tests/rustdoc/issue-108931-anonymous-reexport.rs
+++ b/tests/rustdoc/anonymous-reexport-108931.rs
@@ -1,4 +1,5 @@
 // Ensuring that anonymous re-exports are always inlined.
+// https://github.com/rust-lang/rust/issues/108931
 
 #![crate_name = "foo"]
 
diff --git a/tests/rustdoc/issue-109695-crate-doc-hidden.rs b/tests/rustdoc/crate-doc-hidden-109695.rs
similarity index 78%
rename from tests/rustdoc/issue-109695-crate-doc-hidden.rs
rename to tests/rustdoc/crate-doc-hidden-109695.rs
index 8dc077d15657e..fc8361ab2976b 100644
--- a/tests/rustdoc/issue-109695-crate-doc-hidden.rs
+++ b/tests/rustdoc/crate-doc-hidden-109695.rs
@@ -1,5 +1,6 @@
 // This test ensures that even if the crate module is `#[doc(hidden)]`, the file
 // is generated.
+// https://github.com/rust-lang/rust/issues/109695
 
 //@ has 'foo/index.html'
 //@ has 'foo/all.html'
diff --git a/tests/rustdoc/deref/issue-100679-sidebar-links-deref.rs b/tests/rustdoc/deref/sidebar-links-deref-100679.rs
similarity index 93%
rename from tests/rustdoc/deref/issue-100679-sidebar-links-deref.rs
rename to tests/rustdoc/deref/sidebar-links-deref-100679.rs
index 44ac08de0b820..d0c37529487eb 100644
--- a/tests/rustdoc/deref/issue-100679-sidebar-links-deref.rs
+++ b/tests/rustdoc/deref/sidebar-links-deref-100679.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/100679
 #![crate_name="foo"]
 
 pub struct Vec;
diff --git a/tests/rustdoc/issue-109449-doc-hidden-reexports.rs b/tests/rustdoc/doc-hidden-reexports-109449.rs
similarity index 100%
rename from tests/rustdoc/issue-109449-doc-hidden-reexports.rs
rename to tests/rustdoc/doc-hidden-reexports-109449.rs
diff --git a/tests/rustdoc/issue-113982-doc_auto_cfg-reexport-foreign.rs b/tests/rustdoc/doc_auto_cfg-reexport-foreign-113982.rs
similarity index 92%
rename from tests/rustdoc/issue-113982-doc_auto_cfg-reexport-foreign.rs
rename to tests/rustdoc/doc_auto_cfg-reexport-foreign-113982.rs
index c083d9495f43c..76b25127a9c64 100644
--- a/tests/rustdoc/issue-113982-doc_auto_cfg-reexport-foreign.rs
+++ b/tests/rustdoc/doc_auto_cfg-reexport-foreign-113982.rs
@@ -1,5 +1,6 @@
 //@ aux-build: issue-113982-doc_auto_cfg-reexport-foreign.rs
 
+// https://github.com/rust-lang/rust/issues/113982
 #![feature(no_core, doc_auto_cfg)]
 #![no_core]
 #![crate_name = "foo"]
diff --git a/tests/rustdoc/duplicate_impls/issue-33054.rs b/tests/rustdoc/duplicate_impls/sidebar-links-duplicate-impls-33054.rs
similarity index 76%
rename from tests/rustdoc/duplicate_impls/issue-33054.rs
rename to tests/rustdoc/duplicate_impls/sidebar-links-duplicate-impls-33054.rs
index 24ff30668cfac..511a40c38a0a2 100644
--- a/tests/rustdoc/duplicate_impls/issue-33054.rs
+++ b/tests/rustdoc/duplicate_impls/sidebar-links-duplicate-impls-33054.rs
@@ -1,11 +1,13 @@
 // ignore-tidy-linelength
+// https://github.com/rust-lang/rust/issues/100679
+#![crate_name="foo"]
 
-//@ has issue_33054/impls/struct.Foo.html
+//@ has foo/impls/struct.Foo.html
 //@ has - '//h3[@class="code-header"]' 'impl Foo'
 //@ has - '//h3[@class="code-header"]' 'impl Bar for Foo'
 //@ count - '//*[@id="trait-implementations-list"]//*[@class="impl"]' 1
 //@ count - '//*[@id="main-content"]/div[@id="implementations-list"]/details/summary/*[@class="impl"]' 1
-//@ has issue_33054/impls/bar/trait.Bar.html
+//@ has foo/impls/bar/trait.Bar.html
 //@ has - '//h3[@class="code-header"]' 'impl Bar for Foo'
 //@ count - '//*[@class="struct"]' 1
 pub mod impls;
diff --git a/tests/rustdoc/issue-118180-empty-tuple-struct.rs b/tests/rustdoc/empty-tuple-struct-118180.rs
similarity index 51%
rename from tests/rustdoc/issue-118180-empty-tuple-struct.rs
rename to tests/rustdoc/empty-tuple-struct-118180.rs
index 2cd1df27b2bf0..614857ad5aeab 100644
--- a/tests/rustdoc/issue-118180-empty-tuple-struct.rs
+++ b/tests/rustdoc/empty-tuple-struct-118180.rs
@@ -1,9 +1,12 @@
-//@ has issue_118180_empty_tuple_struct/enum.Enum.html
+// https://github.com/rust-lang/rust/issues/118180
+#![crate_name="foo"]
+
+//@ has foo/enum.Enum.html
 pub enum Enum {
     //@ has - '//*[@id="variant.Empty"]//h3' 'Empty()'
     Empty(),
 }
 
-//@ has issue_118180_empty_tuple_struct/struct.Empty.html
+//@ has foo/struct.Empty.html
 //@ has - '//pre/code' 'Empty()'
 pub struct Empty();
diff --git a/tests/rustdoc/issue-108925.rs b/tests/rustdoc/enum-non-exhaustive-108925.rs
similarity index 64%
rename from tests/rustdoc/issue-108925.rs
rename to tests/rustdoc/enum-non-exhaustive-108925.rs
index a332771616d4a..ea2462449d2b7 100644
--- a/tests/rustdoc/issue-108925.rs
+++ b/tests/rustdoc/enum-non-exhaustive-108925.rs
@@ -1,4 +1,7 @@
-//@ has issue_108925/enum.MyThing.html
+// https://github.com/rust-lang/rust/issues/108925
+#![crate_name="foo"]
+
+//@ has foo/enum.MyThing.html
 //@ has - '//code' 'Shown'
 //@ !has - '//code' 'NotShown'
 //@ !has - '//code' '// some variants omitted'
diff --git a/tests/rustdoc/issue-111249-file-creation.rs b/tests/rustdoc/file-creation-111249.rs
similarity index 95%
rename from tests/rustdoc/issue-111249-file-creation.rs
rename to tests/rustdoc/file-creation-111249.rs
index 89a25aef97def..a6522d682f191 100644
--- a/tests/rustdoc/issue-111249-file-creation.rs
+++ b/tests/rustdoc/file-creation-111249.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/111249
 #![crate_name = "foo"]
 #![feature(no_core)]
 #![no_core]
diff --git a/tests/rustdoc/generic-associated-types/issue-94683.rs b/tests/rustdoc/generic-associated-types/gat-elided-lifetime-94683.rs
similarity index 82%
rename from tests/rustdoc/generic-associated-types/issue-94683.rs
rename to tests/rustdoc/generic-associated-types/gat-elided-lifetime-94683.rs
index 19a1e9d448e65..c1cacaf3f1158 100644
--- a/tests/rustdoc/generic-associated-types/issue-94683.rs
+++ b/tests/rustdoc/generic-associated-types/gat-elided-lifetime-94683.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/94683
 #![crate_name = "foo"]
 
 pub trait Trait {
diff --git a/tests/rustdoc/generic-associated-types/issue-109488.rs b/tests/rustdoc/generic-associated-types/gat-linkification-109488.rs
similarity index 84%
rename from tests/rustdoc/generic-associated-types/issue-109488.rs
rename to tests/rustdoc/generic-associated-types/gat-linkification-109488.rs
index 12f8988f52002..be55a10b4033d 100644
--- a/tests/rustdoc/generic-associated-types/issue-109488.rs
+++ b/tests/rustdoc/generic-associated-types/gat-linkification-109488.rs
@@ -1,8 +1,10 @@
 // Make sure that we escape the arguments of the GAT projection even if we fail to compute
 // the href of the corresponding trait (in this case it is private).
 // Further, test that we also linkify the GAT arguments.
+// https://github.com/rust-lang/rust/issues/94683
+#![crate_name="foo"]
 
-//@ has 'issue_109488/type.A.html'
+//@ has 'foo/type.A.html'
 //@ has - '//pre[@class="rust item-decl"]' '<S as Tr>::P<Option<i32>>'
 //@ has - '//pre[@class="rust item-decl"]//a[@class="enum"]/@href' '{{channel}}/core/option/enum.Option.html'
 pub type A = <S as Tr>::P<Option<i32>>;
diff --git a/tests/rustdoc/issue-110422-inner-private.rs b/tests/rustdoc/inner-private-110422.rs
similarity index 100%
rename from tests/rustdoc/issue-110422-inner-private.rs
rename to tests/rustdoc/inner-private-110422.rs
diff --git a/tests/rustdoc/issue-115295-macro-const-display.rs b/tests/rustdoc/macro-const-display-115295.rs
similarity index 96%
rename from tests/rustdoc/issue-115295-macro-const-display.rs
rename to tests/rustdoc/macro-const-display-115295.rs
index 0dadb76ae5cdd..445b47e0b2467 100644
--- a/tests/rustdoc/issue-115295-macro-const-display.rs
+++ b/tests/rustdoc/macro-const-display-115295.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/115295
 #![crate_name = "foo"]
 
 //@ has foo/trait.Trait.html
diff --git a/tests/rustdoc/issue-109258-missing-private-inlining.rs b/tests/rustdoc/missing-private-inlining-109258.rs
similarity index 100%
rename from tests/rustdoc/issue-109258-missing-private-inlining.rs
rename to tests/rustdoc/missing-private-inlining-109258.rs
diff --git a/tests/rustdoc/issue-110629-private-type-cycle.rs b/tests/rustdoc/private-type-cycle-110629.rs
similarity index 80%
rename from tests/rustdoc/issue-110629-private-type-cycle.rs
rename to tests/rustdoc/private-type-cycle-110629.rs
index 22ea721fd440d..e237680969795 100644
--- a/tests/rustdoc/issue-110629-private-type-cycle.rs
+++ b/tests/rustdoc/private-type-cycle-110629.rs
@@ -1,10 +1,12 @@
 //@ compile-flags: --document-private-items
 
+// https://github.com/rust-lang/rust/issues/110629
+#![crate_name="foo"]
 #![feature(type_alias_impl_trait)]
 
 type Bar<'a, 'b> = impl PartialEq<Bar<'a, 'b>> + std::fmt::Debug;
 
-//@ has issue_110629_private_type_cycle/type.Bar.html
+//@ has foo/type.Bar.html
 //@ has - '//pre[@class="rust item-decl"]' \
 //     "pub(crate) type Bar<'a, 'b> = impl PartialEq<Bar<'a, 'b>> + Debug;"
 
diff --git a/tests/rustdoc/issue-111064-reexport-trait-from-hidden-2.rs b/tests/rustdoc/reexport-trait-from-hidden-111064-2.rs
similarity index 93%
rename from tests/rustdoc/issue-111064-reexport-trait-from-hidden-2.rs
rename to tests/rustdoc/reexport-trait-from-hidden-111064-2.rs
index 4b80f508e7f53..2b21f9862b447 100644
--- a/tests/rustdoc/issue-111064-reexport-trait-from-hidden-2.rs
+++ b/tests/rustdoc/reexport-trait-from-hidden-111064-2.rs
@@ -1,3 +1,4 @@
+// Regression test for <https://github.com/rust-lang/rust/issues/111064>.
 #![feature(no_core)]
 #![no_core]
 #![crate_name = "foo"]
diff --git a/tests/rustdoc/issue-111064-reexport-trait-from-hidden.rs b/tests/rustdoc/reexport-trait-from-hidden-111064.rs
similarity index 100%
rename from tests/rustdoc/issue-111064-reexport-trait-from-hidden.rs
rename to tests/rustdoc/reexport-trait-from-hidden-111064.rs