diff --git a/tests/rustdoc/issue-31808.rs b/tests/rustdoc-ui/ice-assoc-const-for-primitive-31808.rs
similarity index 67%
rename from tests/rustdoc/issue-31808.rs
rename to tests/rustdoc-ui/ice-assoc-const-for-primitive-31808.rs
index e55c5bd4f7cee..6e4709403a4d7 100644
--- a/tests/rustdoc/issue-31808.rs
+++ b/tests/rustdoc-ui/ice-assoc-const-for-primitive-31808.rs
@@ -1,5 +1,10 @@
+// check-pass
+
 // Test that associated item impls on primitive types don't crash rustdoc
 
+// https://github.com/rust-lang/rust/issues/31808
+#![crate_name="issue_31808"]
+
 pub trait Foo {
     const BAR: usize;
     type BAZ;
diff --git a/tests/rustdoc/issue-29503.rs b/tests/rustdoc/blanket-impl-29503.rs
similarity index 82%
rename from tests/rustdoc/issue-29503.rs
rename to tests/rustdoc/blanket-impl-29503.rs
index 01ae4438500da..d6a132e1c263d 100644
--- a/tests/rustdoc/issue-29503.rs
+++ b/tests/rustdoc/blanket-impl-29503.rs
@@ -1,3 +1,6 @@
+// https://github.com/rust-lang/rust/issues/29503
+#![crate_name="issue_29503"]
+
 use std::fmt;
 
 // @has issue_29503/trait.MyTrait.html
diff --git a/tests/rustdoc/issue-33302.rs b/tests/rustdoc/const-rendering-macros-33302.rs
similarity index 95%
rename from tests/rustdoc/issue-33302.rs
rename to tests/rustdoc/const-rendering-macros-33302.rs
index a316f3ad99bcf..0f5cb921411e6 100644
--- a/tests/rustdoc/issue-33302.rs
+++ b/tests/rustdoc/const-rendering-macros-33302.rs
@@ -1,3 +1,6 @@
+// https://github.com/rust-lang/rust/issues/33302
+#![crate_name="issue_33302"]
+
 // Ensure constant and array length values are not taken from source
 // code, which wreaks havoc with macros.
 
diff --git a/tests/rustdoc/issue-32890.rs b/tests/rustdoc/disambiguate-anchors-32890.rs
similarity index 80%
rename from tests/rustdoc/issue-32890.rs
rename to tests/rustdoc/disambiguate-anchors-32890.rs
index 970954433ec72..d88601d65d38a 100644
--- a/tests/rustdoc/issue-32890.rs
+++ b/tests/rustdoc/disambiguate-anchors-32890.rs
@@ -1,3 +1,6 @@
+// https://github.com/rust-lang/rust/issues/32890
+#![crate_name="issue_32890"]
+
 // @has issue_32890/struct.Foo.html
 pub struct Foo<T>(T);
 
diff --git a/tests/rustdoc/issue-29449.rs b/tests/rustdoc/disambiguate-anchors-header-29449.rs
similarity index 85%
rename from tests/rustdoc/issue-29449.rs
rename to tests/rustdoc/disambiguate-anchors-header-29449.rs
index 0d829cf6fcffe..38a4954fc1395 100644
--- a/tests/rustdoc/issue-29449.rs
+++ b/tests/rustdoc/disambiguate-anchors-header-29449.rs
@@ -1,3 +1,6 @@
+// https://github.com/rust-lang/rust/issues/29449
+#![crate_name="issue_29449"]
+
 // @has issue_29449/struct.Foo.html
 pub struct Foo;
 
diff --git a/tests/rustdoc/issue-33069.rs b/tests/rustdoc/doc-hidden-trait-implementors-33069.rs
similarity index 68%
rename from tests/rustdoc/issue-33069.rs
rename to tests/rustdoc/doc-hidden-trait-implementors-33069.rs
index 0213a53cab5d7..35570668ea168 100644
--- a/tests/rustdoc/issue-33069.rs
+++ b/tests/rustdoc/doc-hidden-trait-implementors-33069.rs
@@ -1,3 +1,6 @@
+// https://github.com/rust-lang/rust/issues/33069
+#![crate_name="issue_33069"]
+
 pub trait Bar {}
 
 #[doc(hidden)]
diff --git a/tests/rustdoc/issue-30252.rs b/tests/rustdoc/doctest-cfg-feature-30252.rs
similarity index 61%
rename from tests/rustdoc/issue-30252.rs
rename to tests/rustdoc/doctest-cfg-feature-30252.rs
index c3777362a66d9..ceb8076fe352b 100644
--- a/tests/rustdoc/issue-30252.rs
+++ b/tests/rustdoc/doctest-cfg-feature-30252.rs
@@ -1,5 +1,8 @@
 // compile-flags:--test --cfg feature="bar"
 
+// https://github.com/rust-lang/rust/issues/30252
+#![crate_name="issue_30252"]
+
 /// ```rust
 /// assert_eq!(cfg!(feature = "bar"), true);
 /// ```
diff --git a/tests/rustdoc/issue-32556.rs b/tests/rustdoc/doctest-ignore-32556.rs
similarity index 58%
rename from tests/rustdoc/issue-32556.rs
rename to tests/rustdoc/doctest-ignore-32556.rs
index e1cf115099726..99da9358bd6ba 100644
--- a/tests/rustdoc/issue-32556.rs
+++ b/tests/rustdoc/doctest-ignore-32556.rs
@@ -1,3 +1,6 @@
+// https://github.com/rust-lang/rust/issues/32556
+#![crate_name="issue_32556"]
+
 /// Blah blah blah
 /// ```ignore (testing rustdoc's handling of ignore)
 /// bad_assert!();
diff --git a/tests/rustdoc/issue-34025.rs b/tests/rustdoc/hidden-extern-34025.rs
similarity index 82%
rename from tests/rustdoc/issue-34025.rs
rename to tests/rustdoc/hidden-extern-34025.rs
index 9b9f21cb31694..81ccf2a0e5cc3 100644
--- a/tests/rustdoc/issue-34025.rs
+++ b/tests/rustdoc/hidden-extern-34025.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/34025
 #![crate_name = "foo"]
 
 // @!has 'foo/sys/index.html'
diff --git a/tests/rustdoc/issue-33592.rs b/tests/rustdoc/impl-type-parameter-33592.rs
similarity index 85%
rename from tests/rustdoc/issue-33592.rs
rename to tests/rustdoc/impl-type-parameter-33592.rs
index 7a128f0b897ed..77f53710e5e74 100644
--- a/tests/rustdoc/issue-33592.rs
+++ b/tests/rustdoc/impl-type-parameter-33592.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/33592
 #![crate_name = "foo"]
 
 pub trait Foo<T> {}
diff --git a/tests/rustdoc/auxiliary/issue-29584.rs b/tests/rustdoc/inline_cross/auxiliary/issue-29584.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-29584.rs
rename to tests/rustdoc/inline_cross/auxiliary/issue-29584.rs
diff --git a/tests/rustdoc/issue-29584.rs b/tests/rustdoc/inline_cross/doc-hidden-extern-trait-impl-29584.rs
similarity index 68%
rename from tests/rustdoc/issue-29584.rs
rename to tests/rustdoc/inline_cross/doc-hidden-extern-trait-impl-29584.rs
index 4364a9649b57b..b246e94e048d1 100644
--- a/tests/rustdoc/issue-29584.rs
+++ b/tests/rustdoc/inline_cross/doc-hidden-extern-trait-impl-29584.rs
@@ -1,6 +1,9 @@
 // aux-build:issue-29584.rs
 // ignore-cross-compile
 
+// https://github.com/rust-lang/rust/issues/29584
+#![crate_name="issue_29584"]
+
 extern crate issue_29584;
 
 // @has issue_29584/struct.Foo.html
diff --git a/tests/rustdoc/issue-33178.rs b/tests/rustdoc/link-extern-crate-33178.rs
similarity index 85%
rename from tests/rustdoc/issue-33178.rs
rename to tests/rustdoc/link-extern-crate-33178.rs
index ed643f5ae118f..6a63712c4a787 100644
--- a/tests/rustdoc/issue-33178.rs
+++ b/tests/rustdoc/link-extern-crate-33178.rs
@@ -3,6 +3,9 @@
 // build-aux-docs
 // ignore-cross-compile
 
+// https://github.com/rust-lang/rust/issues/33178
+#![crate_name="issue_33178"]
+
 // @has issue_33178/index.html
 // @has - '//a[@title="mod empty"][@href="../empty/index.html"]' empty
 pub extern crate empty;
diff --git a/tests/rustdoc/issue-30109.rs b/tests/rustdoc/link-extern-crate-item-30109.rs
similarity index 79%
rename from tests/rustdoc/issue-30109.rs
rename to tests/rustdoc/link-extern-crate-item-30109.rs
index e9447538ad782..c83234352ad35 100644
--- a/tests/rustdoc/issue-30109.rs
+++ b/tests/rustdoc/link-extern-crate-item-30109.rs
@@ -2,6 +2,9 @@
 // aux-build:issue-30109-1.rs
 // ignore-cross-compile
 
+// https://github.com/rust-lang/rust/issues/30109
+#![crate_name="issue_30109"]
+
 pub mod quux {
     extern crate issue_30109_1 as bar;
     use self::bar::Bar;
diff --git a/tests/rustdoc/issue-33178-1.rs b/tests/rustdoc/link-extern-crate-title-33178.rs
similarity index 74%
rename from tests/rustdoc/issue-33178-1.rs
rename to tests/rustdoc/link-extern-crate-title-33178.rs
index 4dc425346abb2..d2f115a386e9a 100644
--- a/tests/rustdoc/issue-33178-1.rs
+++ b/tests/rustdoc/link-extern-crate-title-33178.rs
@@ -2,6 +2,9 @@
 // aux-build:variant-struct.rs
 // ignore-cross-compile
 
+// https://github.com/rust-lang/rust/issues/33178
+#![crate_name="issue_33178_1"]
+
 // @has issue_33178_1/index.html
 // @!has - //a/@title empty
 pub extern crate empty;
diff --git a/tests/rustdoc/issue-32395.rs b/tests/rustdoc/render-enum-variant-structlike-32395.rs
similarity index 81%
rename from tests/rustdoc/issue-32395.rs
rename to tests/rustdoc/render-enum-variant-structlike-32395.rs
index 5552300f9fe89..2200d8ec63775 100644
--- a/tests/rustdoc/issue-32395.rs
+++ b/tests/rustdoc/render-enum-variant-structlike-32395.rs
@@ -2,6 +2,9 @@
 // build-aux-docs
 // ignore-cross-compile
 
+// https://github.com/rust-lang/rust/issues/32395
+#![crate_name="issue_32395"]
+
 // @has variant_struct/enum.Foo.html
 // @!hasraw - 'pub qux'
 // @!hasraw - 'pub(crate) qux'
diff --git a/tests/rustdoc/issue-34274.rs b/tests/rustdoc/src-links-inlined-34274.rs
similarity index 82%
rename from tests/rustdoc/issue-34274.rs
rename to tests/rustdoc/src-links-inlined-34274.rs
index ce5be84a5491f..a3c9bf7e45c57 100644
--- a/tests/rustdoc/issue-34274.rs
+++ b/tests/rustdoc/src-links-inlined-34274.rs
@@ -2,6 +2,7 @@
 // build-aux-docs
 // ignore-cross-compile
 
+// https://github.com/rust-lang/rust/issues/34274
 #![crate_name = "foo"]
 
 extern crate issue_34274;
diff --git a/tests/rustdoc/issue-32374.rs b/tests/rustdoc/staged-api-deprecated-unstable-32374.rs
similarity index 95%
rename from tests/rustdoc/issue-32374.rs
rename to tests/rustdoc/staged-api-deprecated-unstable-32374.rs
index 985bf03a12159..d282dea907e82 100644
--- a/tests/rustdoc/issue-32374.rs
+++ b/tests/rustdoc/staged-api-deprecated-unstable-32374.rs
@@ -1,6 +1,8 @@
+// https://github.com/rust-lang/rust/issues/32374
 #![feature(staged_api)]
 #![doc(issue_tracker_base_url = "https://issue_url/")]
 #![unstable(feature = "test", issue = "32374")]
+#![crate_name="issue_32374"]
 
 // @matches issue_32374/index.html '//*[@class="item-name"]/span[@class="stab deprecated"]' \
 //      'Deprecated'
diff --git a/tests/rustdoc/issue-31899.rs b/tests/rustdoc/summary-codeblock-31899.rs
similarity index 92%
rename from tests/rustdoc/issue-31899.rs
rename to tests/rustdoc/summary-codeblock-31899.rs
index 3eee374465d2b..c1b33058c9e70 100644
--- a/tests/rustdoc/issue-31899.rs
+++ b/tests/rustdoc/summary-codeblock-31899.rs
@@ -1,3 +1,6 @@
+// https://github.com/rust-lang/rust/issues/31899
+#![crate_name="issue_31899"]
+
 // @has issue_31899/index.html
 // @hasraw - 'Make this line a bit longer.'
 // @!hasraw - 'rust rust-example-rendered'
diff --git a/tests/rustdoc/issue-30366.rs b/tests/rustdoc/summary-reference-link-30366.rs
similarity index 68%
rename from tests/rustdoc/issue-30366.rs
rename to tests/rustdoc/summary-reference-link-30366.rs
index c6274a058b0e5..5b9854c53903a 100644
--- a/tests/rustdoc/issue-30366.rs
+++ b/tests/rustdoc/summary-reference-link-30366.rs
@@ -1,5 +1,8 @@
 // @has issue_30366/index.html '//a/@href' 'http://www.rust-lang.org/'
 
+// https://github.com/rust-lang/rust/issues/30366
+#![crate_name="issue_30366"]
+
 /// Describe it. [Link somewhere][1].
 ///
 /// [1]: http://www.rust-lang.org/
diff --git a/tests/rustdoc/issue-32077-type-alias-impls.rs b/tests/rustdoc/type-alias-impls-32077.rs
similarity index 97%
rename from tests/rustdoc/issue-32077-type-alias-impls.rs
rename to tests/rustdoc/type-alias-impls-32077.rs
index 664b678093e90..7bb763f86afb4 100644
--- a/tests/rustdoc/issue-32077-type-alias-impls.rs
+++ b/tests/rustdoc/type-alias-impls-32077.rs
@@ -1,5 +1,6 @@
 // Regression test for <https://github.com/rust-lang/rust/issues/32077>.
 
+// https://github.com/rust-lang/rust/issues/32077
 #![crate_name = "foo"]
 
 pub struct GenericStruct<T>(T);