diff --git a/tests/rustdoc/issue-102154.rs b/tests/rustdoc-ui/ice-assoc-type-loop-102154.rs
similarity index 73%
rename from tests/rustdoc/issue-102154.rs
rename to tests/rustdoc-ui/ice-assoc-type-loop-102154.rs
index b36f270806ff3..68e22ce6ea154 100644
--- a/tests/rustdoc/issue-102154.rs
+++ b/tests/rustdoc-ui/ice-assoc-type-loop-102154.rs
@@ -1,3 +1,6 @@
+//@ check-pass
+// https://github.com/rust-lang/rust/issues/102154
+
 trait A<Y, N> {
     type B;
 }
diff --git a/tests/rustdoc/issue-100620.rs b/tests/rustdoc-ui/ice-method-where-clause-circular-100620.rs
similarity index 79%
rename from tests/rustdoc/issue-100620.rs
rename to tests/rustdoc-ui/ice-method-where-clause-circular-100620.rs
index 097666eb515d1..e12b214410bc2 100644
--- a/tests/rustdoc/issue-100620.rs
+++ b/tests/rustdoc-ui/ice-method-where-clause-circular-100620.rs
@@ -1,3 +1,6 @@
+//@ check-pass
+// https://github.com/rust-lang/rust/issues/100620
+
 pub trait Bar<S> {}
 
 pub trait Qux<T> {}
diff --git a/tests/rustdoc/issue-100241.rs b/tests/rustdoc-ui/ice-unresolved-import-100241.rs
similarity index 77%
rename from tests/rustdoc/issue-100241.rs
rename to tests/rustdoc-ui/ice-unresolved-import-100241.rs
index e4c613dd2791e..eef4b8355bfd7 100644
--- a/tests/rustdoc/issue-100241.rs
+++ b/tests/rustdoc-ui/ice-unresolved-import-100241.rs
@@ -3,6 +3,8 @@
 // Check that this isn't an ICE
 //@ should-fail
 
+// https://github.com/rust-lang/rust/issues/100241
+
 mod foo {
     pub use inner::S;
     //~^ ERROR unresolved imports `inner`, `foo::S`
diff --git a/tests/rustdoc/issue-108281.rs b/tests/rustdoc/attributes-inlining-108281.rs
similarity index 100%
rename from tests/rustdoc/issue-108281.rs
rename to tests/rustdoc/attributes-inlining-108281.rs
diff --git a/tests/rustdoc/issue-101743-bold-tag.rs b/tests/rustdoc/bold-tag-101743.rs
similarity index 100%
rename from tests/rustdoc/issue-101743-bold-tag.rs
rename to tests/rustdoc/bold-tag-101743.rs
diff --git a/tests/rustdoc/issue-106421-not-internal.rs b/tests/rustdoc/force-unstable-if-unmarked-106421-not-internal.rs
similarity index 66%
rename from tests/rustdoc/issue-106421-not-internal.rs
rename to tests/rustdoc/force-unstable-if-unmarked-106421-not-internal.rs
index f328a1036ebe9..a85cfa78cdcda 100644
--- a/tests/rustdoc/issue-106421-not-internal.rs
+++ b/tests/rustdoc/force-unstable-if-unmarked-106421-not-internal.rs
@@ -2,7 +2,10 @@
 //@ ignore-cross-compile
 // This is the version where a non-compiler-internal crate inlines a compiler-internal one.
 // In this case, the item shouldn't be documented, because regular users can't get at it.
+// https://github.com/rust-lang/rust/issues/106421
+#![crate_name="bar"]
+
 extern crate foo;
 
-//@ !has issue_106421_not_internal/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
+//@ !has bar/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
 pub use foo::FatalError;
diff --git a/tests/rustdoc/issue-106421.rs b/tests/rustdoc/force-unstable-if-unmarked-106421.rs
similarity index 53%
rename from tests/rustdoc/issue-106421.rs
rename to tests/rustdoc/force-unstable-if-unmarked-106421.rs
index c2064c7109078..aa88a569aef2f 100644
--- a/tests/rustdoc/issue-106421.rs
+++ b/tests/rustdoc/force-unstable-if-unmarked-106421.rs
@@ -1,8 +1,10 @@
 //@ aux-build:issue-106421-force-unstable.rs
 //@ ignore-cross-compile
 //@ compile-flags: -Zforce-unstable-if-unmarked
+// https://github.com/rust-lang/rust/issues/106421
+#![crate_name="bar"]
 
 extern crate foo;
 
-//@ has issue_106421/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
+//@ has bar/struct.FatalError.html '//*[@id="method.raise"]' 'fn raise'
 pub use foo::FatalError;
diff --git a/tests/rustdoc/issue-105952.rs b/tests/rustdoc/ice-associated-const-equality-105952.rs
similarity index 86%
rename from tests/rustdoc/issue-105952.rs
rename to tests/rustdoc/ice-associated-const-equality-105952.rs
index 173efb82f4b98..1bcdfac734290 100644
--- a/tests/rustdoc/issue-105952.rs
+++ b/tests/rustdoc/ice-associated-const-equality-105952.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/105952
 #![crate_name = "foo"]
 
 #![feature(associated_const_equality)]
diff --git a/tests/rustdoc/issue-107995.rs b/tests/rustdoc/ice-intra-doc-links-107995.rs
similarity index 100%
rename from tests/rustdoc/issue-107995.rs
rename to tests/rustdoc/ice-intra-doc-links-107995.rs
diff --git a/tests/rustdoc/issue-100204-inline-impl-through-glob-import.rs b/tests/rustdoc/inline-impl-through-glob-import-100204.rs
similarity index 86%
rename from tests/rustdoc/issue-100204-inline-impl-through-glob-import.rs
rename to tests/rustdoc/inline-impl-through-glob-import-100204.rs
index 7f05e57ec09b0..ba6ed4278716f 100644
--- a/tests/rustdoc/issue-100204-inline-impl-through-glob-import.rs
+++ b/tests/rustdoc/inline-impl-through-glob-import-100204.rs
@@ -2,6 +2,7 @@
 //@ build-aux-docs
 //@ ignore-cross-compile
 
+// https://github.com/rust-lang/rust/issues/100204
 #![crate_name="second"]
 
 extern crate first;
diff --git a/tests/rustdoc/issue-106142.rs b/tests/rustdoc/issue-106142.rs
deleted file mode 100644
index 52adc5dbbf1a1..0000000000000
--- a/tests/rustdoc/issue-106142.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-//@ has 'issue_106142/a/index.html'
-//@ count 'issue_106142/a/index.html' '//ul[@class="item-table"]//li//a' 1
-
-#![allow(rustdoc::broken_intra_doc_links)]
-
-pub mod a {
-    /// [`m`]
-    pub fn f() {}
-
-    #[macro_export]
-    macro_rules! m {
-        () => {};
-    }
-}
diff --git a/tests/rustdoc/issue-108231.rs b/tests/rustdoc/macro-export-crate-root-108231.rs
similarity index 100%
rename from tests/rustdoc/issue-108231.rs
rename to tests/rustdoc/macro-export-crate-root-108231.rs
diff --git a/tests/rustdoc/macro-rules-broken-intra-doc-106142.rs b/tests/rustdoc/macro-rules-broken-intra-doc-106142.rs
new file mode 100644
index 0000000000000..0d146a3c5cd0c
--- /dev/null
+++ b/tests/rustdoc/macro-rules-broken-intra-doc-106142.rs
@@ -0,0 +1,17 @@
+// https://github.com/rust-lang/rust/issues/106142
+#![crate_name="foo"]
+
+//@ has 'foo/a/index.html'
+//@ count 'foo/a/index.html' '//ul[@class="item-table"]//li//a' 1
+
+#![allow(rustdoc::broken_intra_doc_links)]
+
+pub mod a {
+    /// [`m`]
+    pub fn f() {}
+
+    #[macro_export]
+    macro_rules! m {
+        () => {};
+    }
+}
diff --git a/tests/rustdoc/issue-99734-multiple-foreigns-w-same-name.rs b/tests/rustdoc/multiple-foreigns-w-same-name-99734.rs
similarity index 85%
rename from tests/rustdoc/issue-99734-multiple-foreigns-w-same-name.rs
rename to tests/rustdoc/multiple-foreigns-w-same-name-99734.rs
index d7c4f1db320c7..60a2aa388ee10 100644
--- a/tests/rustdoc/issue-99734-multiple-foreigns-w-same-name.rs
+++ b/tests/rustdoc/multiple-foreigns-w-same-name-99734.rs
@@ -2,6 +2,7 @@
 //@ build-aux-docs
 //@ ignore-cross-compile
 
+// https://github.com/rust-lang/rust/issues/99734
 #![crate_name = "foo"]
 
 #[macro_use]
diff --git a/tests/rustdoc/issue-99221-multiple-macro-rules-w-same-name.rs b/tests/rustdoc/multiple-macro-rules-w-same-name-99221.rs
similarity index 84%
rename from tests/rustdoc/issue-99221-multiple-macro-rules-w-same-name.rs
rename to tests/rustdoc/multiple-macro-rules-w-same-name-99221.rs
index e7fb4fb3f0ea3..4a1798a849691 100644
--- a/tests/rustdoc/issue-99221-multiple-macro-rules-w-same-name.rs
+++ b/tests/rustdoc/multiple-macro-rules-w-same-name-99221.rs
@@ -2,6 +2,7 @@
 //@ build-aux-docs
 //@ ignore-cross-compile
 
+// https://github.com/rust-lang/rust/issues/99221
 #![crate_name = "foo"]
 
 #[macro_use]
diff --git a/tests/rustdoc/issue-99734-multiple-mods-w-same-name.rs b/tests/rustdoc/multiple-mods-w-same-name-99734.rs
similarity index 84%
rename from tests/rustdoc/issue-99734-multiple-mods-w-same-name.rs
rename to tests/rustdoc/multiple-mods-w-same-name-99734.rs
index 627cfc0b80b3f..d48464c478f38 100644
--- a/tests/rustdoc/issue-99734-multiple-mods-w-same-name.rs
+++ b/tests/rustdoc/multiple-mods-w-same-name-99734.rs
@@ -2,6 +2,7 @@
 //@ build-aux-docs
 //@ ignore-cross-compile
 
+// https://github.com/rust-lang/rust/issues/99734
 #![crate_name = "foo"]
 
 #[macro_use]
diff --git a/tests/rustdoc/issue-99221-multiple-structs-w-same-name.rs b/tests/rustdoc/multiple-structs-w-same-name-99221.rs
similarity index 84%
rename from tests/rustdoc/issue-99221-multiple-structs-w-same-name.rs
rename to tests/rustdoc/multiple-structs-w-same-name-99221.rs
index 8758342fe0736..4c2f77fec23d7 100644
--- a/tests/rustdoc/issue-99221-multiple-structs-w-same-name.rs
+++ b/tests/rustdoc/multiple-structs-w-same-name-99221.rs
@@ -2,6 +2,7 @@
 //@ build-aux-docs
 //@ ignore-cross-compile
 
+// https://github.com/rust-lang/rust/issues/99221
 #![crate_name = "foo"]
 
 #[macro_use]
diff --git a/tests/rustdoc/issue-105735-overlapping-reexport-2.rs b/tests/rustdoc/overlapping-reexport-105735-2.rs
similarity index 93%
rename from tests/rustdoc/issue-105735-overlapping-reexport-2.rs
rename to tests/rustdoc/overlapping-reexport-105735-2.rs
index 946184c5a0476..9f823ec5923cd 100644
--- a/tests/rustdoc/issue-105735-overlapping-reexport-2.rs
+++ b/tests/rustdoc/overlapping-reexport-105735-2.rs
@@ -1,4 +1,5 @@
 // Regression test to ensure that both `AtomicU8` items are displayed but not the re-export.
+// https://github.com/rust-lang/rust/issues/105735
 
 #![crate_name = "foo"]
 #![no_std]
diff --git a/tests/rustdoc/issue-105735-overlapping-reexport.rs b/tests/rustdoc/overlapping-reexport-105735.rs
similarity index 93%
rename from tests/rustdoc/issue-105735-overlapping-reexport.rs
rename to tests/rustdoc/overlapping-reexport-105735.rs
index 0fd17fd9577c2..2a2d0fa98309e 100644
--- a/tests/rustdoc/issue-105735-overlapping-reexport.rs
+++ b/tests/rustdoc/overlapping-reexport-105735.rs
@@ -1,4 +1,5 @@
 // Regression test to ensure that both `AtomicU8` items are displayed but not the re-export.
+// https://github.com/rust-lang/rust/issues/105735
 
 #![crate_name = "foo"]
 #![no_std]
diff --git a/tests/rustdoc/issue-107350.rs b/tests/rustdoc/pub-use-loop-107350.rs
similarity index 100%
rename from tests/rustdoc/issue-107350.rs
rename to tests/rustdoc/pub-use-loop-107350.rs
diff --git a/tests/rustdoc/issue-108679-reexport-of-reexport.rs b/tests/rustdoc/reexport-of-reexport-108679.rs
similarity index 100%
rename from tests/rustdoc/issue-108679-reexport-of-reexport.rs
rename to tests/rustdoc/reexport-of-reexport-108679.rs