diff --git a/tests/rustdoc/auxiliary/issue-73061.rs b/tests/rustdoc-ui/auxiliary/issue-73061.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-73061.rs
rename to tests/rustdoc-ui/auxiliary/issue-73061.rs
diff --git a/tests/rustdoc/issue-56701.rs b/tests/rustdoc-ui/ice-blanket-impl-56701.rs
similarity index 91%
rename from tests/rustdoc/issue-56701.rs
rename to tests/rustdoc-ui/ice-blanket-impl-56701.rs
index ba00743fcd12e..13b0fc9032a8a 100644
--- a/tests/rustdoc/issue-56701.rs
+++ b/tests/rustdoc-ui/ice-blanket-impl-56701.rs
@@ -1,4 +1,6 @@
+//@ check-pass
 // This shouldn't cause a stack overflow when rustdoc is run
+// https://github.com/rust-lang/rust/issues/56701
 
 use std::ops::Deref;
 use std::ops::DerefMut;
diff --git a/tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs b/tests/rustdoc-ui/ice-cross-crate-opaque-assoc-type-73061.rs
similarity index 71%
rename from tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs
rename to tests/rustdoc-ui/ice-cross-crate-opaque-assoc-type-73061.rs
index e16aeac65cc56..1434bef49e0e4 100644
--- a/tests/rustdoc/issue-73061-cross-crate-opaque-assoc-type.rs
+++ b/tests/rustdoc-ui/ice-cross-crate-opaque-assoc-type-73061.rs
@@ -1,5 +1,6 @@
-// Regression test for ICE #73061
+// Regression test for ICE https://github.com/rust-lang/rust/issues/73061
 
+//@ check-pass
 //@ aux-build:issue-73061.rs
 
 extern crate issue_73061;
diff --git a/tests/rustdoc/issue-78673.rs b/tests/rustdoc/blanket-impl-78673.rs
similarity index 93%
rename from tests/rustdoc/issue-78673.rs
rename to tests/rustdoc/blanket-impl-78673.rs
index d09141c320473..d7ceef2c05772 100644
--- a/tests/rustdoc/issue-78673.rs
+++ b/tests/rustdoc/blanket-impl-78673.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/78673
 #![crate_name = "issue_78673"]
 
 pub trait Something {}
diff --git a/tests/rustdoc/issue-76501.rs b/tests/rustdoc/const-fn-76501.rs
similarity index 57%
rename from tests/rustdoc/issue-76501.rs
rename to tests/rustdoc/const-fn-76501.rs
index 5caea0ec99244..4a7284f98512e 100644
--- a/tests/rustdoc/issue-76501.rs
+++ b/tests/rustdoc/const-fn-76501.rs
@@ -1,4 +1,7 @@
-// @has 'issue_76501/fn.bloop.html' '//pre' 'pub const fn bloop() -> i32'
+// https://github.com/rust-lang/rust/issues/76501
+#![crate_name="foo"]
+
+// @has 'foo/fn.bloop.html' '//pre' 'pub const fn bloop() -> i32'
 /// A useless function that always returns 1.
 pub const fn bloop() -> i32 {
     1
@@ -8,7 +11,7 @@ pub const fn bloop() -> i32 {
 pub struct Struct {}
 
 impl Struct {
-    // @has 'issue_76501/struct.Struct.html' '//*[@class="method"]' \
+    // @has 'foo/struct.Struct.html' '//*[@class="method"]' \
     // 'pub const fn blurp() -> i32'
     /// A useless function that always returns 1.
     pub const fn blurp() -> i32 {
diff --git a/tests/rustdoc/issue-79201.rs b/tests/rustdoc/doc-cfg-inherit-from-module-79201.rs
similarity index 90%
rename from tests/rustdoc/issue-79201.rs
rename to tests/rustdoc/doc-cfg-inherit-from-module-79201.rs
index f95d79cd493ea..76260c4a502b4 100644
--- a/tests/rustdoc/issue-79201.rs
+++ b/tests/rustdoc/doc-cfg-inherit-from-module-79201.rs
@@ -1,6 +1,9 @@
+// https://github.com/rust-lang/rust/issues/79201
+#![crate_name="foo"]
+
 #![feature(doc_cfg)]
 
-// @has 'issue_79201/trait.Foo.html'
+// @has 'foo/trait.Foo.html'
 // @count   - '//*[@class="stab portability"]' 6
 // @matches - '//*[@class="stab portability"]' 'crate feature foo-root'
 // @matches - '//*[@class="stab portability"]' 'crate feature foo-public-mod'
diff --git a/tests/rustdoc/issue-67851-both.rs b/tests/rustdoc/doc-hidden-private-67851-both.rs
similarity index 50%
rename from tests/rustdoc/issue-67851-both.rs
rename to tests/rustdoc/doc-hidden-private-67851-both.rs
index ed59652838e12..e6eb6a68ffdb9 100644
--- a/tests/rustdoc/issue-67851-both.rs
+++ b/tests/rustdoc/doc-hidden-private-67851-both.rs
@@ -1,8 +1,10 @@
 //@ compile-flags: -Zunstable-options --document-private-items --document-hidden-items
+// https://github.com/rust-lang/rust/issues/67851
+#![crate_name="foo"]
 
-// @has issue_67851_both/struct.Hidden.html
+// @has foo/struct.Hidden.html
 #[doc(hidden)]
 pub struct Hidden;
 
-// @has issue_67851_both/struct.Private.html
+// @has foo/struct.Private.html
 struct Private;
diff --git a/tests/rustdoc/doc-hidden-private-67851-hidden.rs b/tests/rustdoc/doc-hidden-private-67851-hidden.rs
new file mode 100644
index 0000000000000..9767f9c84f9f4
--- /dev/null
+++ b/tests/rustdoc/doc-hidden-private-67851-hidden.rs
@@ -0,0 +1,10 @@
+//@ compile-flags: -Zunstable-options --document-hidden-items
+// https://github.com/rust-lang/rust/issues/67851
+#![crate_name="foo"]
+
+// @has foo/struct.Hidden.html
+#[doc(hidden)]
+pub struct Hidden;
+
+// @!has foo/struct.Private.html
+struct Private;
diff --git a/tests/rustdoc/doc-hidden-private-67851-neither.rs b/tests/rustdoc/doc-hidden-private-67851-neither.rs
new file mode 100644
index 0000000000000..6c6e84da43d5e
--- /dev/null
+++ b/tests/rustdoc/doc-hidden-private-67851-neither.rs
@@ -0,0 +1,9 @@
+// https://github.com/rust-lang/rust/issues/67851
+#![crate_name="foo"]
+
+// @!has foo/struct.Hidden.html
+#[doc(hidden)]
+pub struct Hidden;
+
+// @!has foo/struct.Private.html
+struct Private;
diff --git a/tests/rustdoc/doc-hidden-private-67851-private.rs b/tests/rustdoc/doc-hidden-private-67851-private.rs
new file mode 100644
index 0000000000000..4aa39f5b789c1
--- /dev/null
+++ b/tests/rustdoc/doc-hidden-private-67851-private.rs
@@ -0,0 +1,10 @@
+//@ compile-flags: --document-private-items
+// https://github.com/rust-lang/rust/issues/67851
+#![crate_name="foo"]
+
+// @!has foo/struct.Hidden.html
+#[doc(hidden)]
+pub struct Hidden;
+
+// @has foo/struct.Private.html
+struct Private;
diff --git a/tests/rustdoc/issue-60522-duplicated-glob-reexport.rs b/tests/rustdoc/duplicated-glob-reexport-60522.rs
similarity index 100%
rename from tests/rustdoc/issue-60522-duplicated-glob-reexport.rs
rename to tests/rustdoc/duplicated-glob-reexport-60522.rs
diff --git a/tests/rustdoc/issue-74083.rs b/tests/rustdoc/hide-mut-methods-if-no-derefmut-impl-74083.rs
similarity index 74%
rename from tests/rustdoc/issue-74083.rs
rename to tests/rustdoc/hide-mut-methods-if-no-derefmut-impl-74083.rs
index c7f5d7eaa5855..0bed7e2fb628c 100644
--- a/tests/rustdoc/issue-74083.rs
+++ b/tests/rustdoc/hide-mut-methods-if-no-derefmut-impl-74083.rs
@@ -1,3 +1,6 @@
+// https://github.com/rust-lang/rust/issues/74083
+#![crate_name="foo"]
+
 use std::ops::Deref;
 
 pub struct Foo;
@@ -6,7 +9,7 @@ impl Foo {
     pub fn foo(&mut self) {}
 }
 
-// @has issue_74083/struct.Bar.html
+// @has foo/struct.Bar.html
 // @!has - '//div[@class="sidebar-links"]/a[@href="#method.foo"]' 'foo'
 pub struct Bar {
     foo: Foo,
diff --git a/tests/rustdoc/issue-75588.rs b/tests/rustdoc/implementors-unstable-75588.rs
similarity index 91%
rename from tests/rustdoc/issue-75588.rs
rename to tests/rustdoc/implementors-unstable-75588.rs
index 4f790994b419b..befddf6b7889f 100644
--- a/tests/rustdoc/issue-75588.rs
+++ b/tests/rustdoc/implementors-unstable-75588.rs
@@ -2,6 +2,7 @@
 //@ aux-build:real_gimli.rs
 
 // Ensure unstably exported traits have their Implementors sections.
+// https://github.com/rust-lang/rust/issues/75588
 
 #![crate_name = "foo"]
 #![feature(extremely_unstable_foo)]
diff --git a/tests/rustdoc/auxiliary/issue-57180.rs b/tests/rustdoc/inline_cross/auxiliary/issue-57180.rs
similarity index 100%
rename from tests/rustdoc/auxiliary/issue-57180.rs
rename to tests/rustdoc/inline_cross/auxiliary/issue-57180.rs
diff --git a/tests/rustdoc/issue-57180.rs b/tests/rustdoc/inline_cross/ice-import-crate-57180.rs
similarity index 65%
rename from tests/rustdoc/issue-57180.rs
rename to tests/rustdoc/inline_cross/ice-import-crate-57180.rs
index aa6b775839932..264b53cbd9ada 100644
--- a/tests/rustdoc/issue-57180.rs
+++ b/tests/rustdoc/inline_cross/ice-import-crate-57180.rs
@@ -1,4 +1,5 @@
 //@ aux-build:issue-57180.rs
+// https://github.com/rust-lang/rust/issues/57180
 
 extern crate issue_57180;
 use issue_57180::Trait;
diff --git a/tests/rustdoc/issue-72340.rs b/tests/rustdoc/intra-doc-link-method-trait-impl-72340.rs
similarity index 85%
rename from tests/rustdoc/issue-72340.rs
rename to tests/rustdoc/intra-doc-link-method-trait-impl-72340.rs
index 64044cfe94720..880a308f9ab11 100644
--- a/tests/rustdoc/issue-72340.rs
+++ b/tests/rustdoc/intra-doc-link-method-trait-impl-72340.rs
@@ -1,3 +1,5 @@
+// https://github.com/rust-lang/rust/issues/72340
+
 #![crate_name = "foo"]
 
 pub struct Body;
diff --git a/tests/rustdoc/issue-67851-hidden.rs b/tests/rustdoc/issue-67851-hidden.rs
deleted file mode 100644
index 6d532adc06fd8..0000000000000
--- a/tests/rustdoc/issue-67851-hidden.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-//@ compile-flags: -Zunstable-options --document-hidden-items
-
-// @has issue_67851_hidden/struct.Hidden.html
-#[doc(hidden)]
-pub struct Hidden;
-
-// @!has issue_67851_hidden/struct.Private.html
-struct Private;
diff --git a/tests/rustdoc/issue-67851-neither.rs b/tests/rustdoc/issue-67851-neither.rs
deleted file mode 100644
index 4e3cd83285388..0000000000000
--- a/tests/rustdoc/issue-67851-neither.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-// @!has issue_67851_neither/struct.Hidden.html
-#[doc(hidden)]
-pub struct Hidden;
-
-// @!has issue_67851_neither/struct.Private.html
-struct Private;
diff --git a/tests/rustdoc/issue-67851-private.rs b/tests/rustdoc/issue-67851-private.rs
deleted file mode 100644
index ead7ddf397f8f..0000000000000
--- a/tests/rustdoc/issue-67851-private.rs
+++ /dev/null
@@ -1,8 +0,0 @@
-//@ compile-flags: --document-private-items
-
-// @!has issue_67851_private/struct.Hidden.html
-#[doc(hidden)]
-pub struct Hidden;
-
-// @has issue_67851_private/struct.Private.html
-struct Private;
diff --git a/tests/rustdoc/issue-60482.rs b/tests/rustdoc/markdown-60482.rs
similarity index 78%
rename from tests/rustdoc/issue-60482.rs
rename to tests/rustdoc/markdown-60482.rs
index 0fd1daa746d41..e40af12e02258 100644
--- a/tests/rustdoc/issue-60482.rs
+++ b/tests/rustdoc/markdown-60482.rs
@@ -1,4 +1,5 @@
 // This code caused a panic in `pulldown-cmark` 0.4.1.
+// https://github.com/rust-lang/rust/issues/60482
 
 pub const BASIC_UNICODE: bool = true;
 
diff --git a/tests/rustdoc/issue-78701.rs b/tests/rustdoc/sidebar-trait-impl-disambiguate-78701.rs
similarity index 92%
rename from tests/rustdoc/issue-78701.rs
rename to tests/rustdoc/sidebar-trait-impl-disambiguate-78701.rs
index 3f1638d5ffc4e..89b7ccb52229f 100644
--- a/tests/rustdoc/issue-78701.rs
+++ b/tests/rustdoc/sidebar-trait-impl-disambiguate-78701.rs
@@ -1,3 +1,4 @@
+// https://github.com/rust-lang/rust/issues/78701
 #![crate_name = "foo"]
 
 // This test ensures that if a blanket impl has the same ID as another impl, it'll
diff --git a/tests/rustdoc/issue-56822.rs b/tests/rustdoc/synthetic_auto/auto-trait-lifetimes-56822.rs
similarity index 82%
rename from tests/rustdoc/issue-56822.rs
rename to tests/rustdoc/synthetic_auto/auto-trait-lifetimes-56822.rs
index c9a74335702d5..315b20ddd7041 100644
--- a/tests/rustdoc/issue-56822.rs
+++ b/tests/rustdoc/synthetic_auto/auto-trait-lifetimes-56822.rs
@@ -1,3 +1,6 @@
+// https://github.com/rust-lang/rust/issues/56822
+#![crate_name="foo"]
+
 struct Wrapper<T>(T);
 
 trait MyTrait {
@@ -16,7 +19,7 @@ impl<'a, T> MyTrait for Inner<'a, T> {
     type Output = &'a T;
 }
 
-// @has issue_56822/struct.Parser.html
+// @has foo/struct.Parser.html
 // @has - '//*[@id="synthetic-implementations-list"]//*[@class="impl"]//h3[@class="code-header"]' \
 // "impl<'a> Send for Parser<'a>"
 pub struct Parser<'a> {
diff --git a/tests/rustdoc/issue-60726.rs b/tests/rustdoc/synthetic_auto/send-impl-conditional-60726.rs
similarity index 87%
rename from tests/rustdoc/issue-60726.rs
rename to tests/rustdoc/synthetic_auto/send-impl-conditional-60726.rs
index e337e4a4f7ad1..ea10aee58e45c 100644
--- a/tests/rustdoc/issue-60726.rs
+++ b/tests/rustdoc/synthetic_auto/send-impl-conditional-60726.rs
@@ -1,3 +1,6 @@
+// https://github.com/rust-lang/rust/issues/60726
+#![crate_name="foo"]
+
 use std::marker::PhantomData;
 
 pub struct True;
@@ -25,7 +28,7 @@ where
     I:InterfaceType<Send=True>
 {}
 
-// @has issue_60726/struct.IntoIter.html
+// @has foo/struct.IntoIter.html
 // @has - '//*[@id="synthetic-implementations-list"]//*[@class="impl"]//h3[@class="code-header"]' \
 // "impl<T> !Send for IntoIter<T>"
 // @has - '//*[@id="synthetic-implementations-list"]//*[@class="impl"]//h3[@class="code-header"]' \
diff --git a/tests/rustdoc/issue-61592.rs b/tests/rustdoc/underscore-import-61592.rs
similarity index 76%
rename from tests/rustdoc/issue-61592.rs
rename to tests/rustdoc/underscore-import-61592.rs
index 068310fa6a33a..d403f2cc7ab1b 100644
--- a/tests/rustdoc/issue-61592.rs
+++ b/tests/rustdoc/underscore-import-61592.rs
@@ -1,14 +1,16 @@
 //@ aux-build:issue-61592.rs
+// https://github.com/rust-lang/rust/issues/61592
+#![crate_name="bar"]
 
 extern crate foo;
 
-// @has issue_61592/index.html
+// @has bar/index.html
 // @has - '//a[@href="#reexports"]' 'Re-exports'
 // @has - '//code' 'pub use foo::FooTrait as _;'
 // @!has - '//a[@href="trait._.html"]' ''
 pub use foo::FooTrait as _;
 
-// @has issue_61592/index.html
+// @has bar/index.html
 // @has - '//a[@href="#reexports"]' 'Re-exports'
 // @has - '//code' 'pub use foo::FooStruct as _;'
 // @!has - '//a[@href="struct._.html"]' ''