diff --git a/src/doc/rustc-dev-guide/src/tests/compiletest.md b/src/doc/rustc-dev-guide/src/tests/compiletest.md
index 36dc71a3ac0cc..f18a660a47adb 100644
--- a/src/doc/rustc-dev-guide/src/tests/compiletest.md
+++ b/src/doc/rustc-dev-guide/src/tests/compiletest.md
@@ -96,10 +96,11 @@ The following test suites are available, with links for more information:
 | [`rustdoc-json`][rustdoc-json-tests] | Check JSON output of `rustdoc`                                           |
 | `rustdoc-ui`                         | Check terminal output of `rustdoc` ([see also](ui.md))                   |
 
-Some rustdoc-specific tests can also be found in `ui/rustdoc/`.
+`ui/rustdoc/` also contains some rustdoc-specific tests.
 These tests ensure that certain lints that are emitted as part of executing rustdoc
 are also run when executing rustc.
-Run-make tests pertaining to rustdoc are typically named `run-make/rustdoc-*/`.
+
+`run-make/rustdoc/` contains run-make tests pertaining to rustdoc.
 
 [rustdoc-html-tests]: ../rustdoc-internals/rustdoc-html-test-suite.md
 [rustdoc-gui-tests]: ../rustdoc-internals/rustdoc-gui-test-suite.md
diff --git a/tests/run-make/rustdoc-determinism/foo.rs b/tests/run-make/rustdoc/auto-create-out-dir/foo.rs
similarity index 100%
rename from tests/run-make/rustdoc-determinism/foo.rs
rename to tests/run-make/rustdoc/auto-create-out-dir/foo.rs
diff --git a/tests/run-make/rustdoc-output-path/rmake.rs b/tests/run-make/rustdoc/auto-create-out-dir/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-output-path/rmake.rs
rename to tests/run-make/rustdoc/auto-create-out-dir/rmake.rs
diff --git a/tests/run-make/rustdoc-cfgspec-parsing/foo.rs b/tests/run-make/rustdoc/cfg-spec-parsing/foo.rs
similarity index 100%
rename from tests/run-make/rustdoc-cfgspec-parsing/foo.rs
rename to tests/run-make/rustdoc/cfg-spec-parsing/foo.rs
diff --git a/tests/run-make/rustdoc-cfgspec-parsing/rmake.rs b/tests/run-make/rustdoc/cfg-spec-parsing/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-cfgspec-parsing/rmake.rs
rename to tests/run-make/rustdoc/cfg-spec-parsing/rmake.rs
diff --git a/tests/run-make/rustdoc-default-output/output-default.stdout b/tests/run-make/rustdoc/default-output/output-default.stdout
similarity index 100%
rename from tests/run-make/rustdoc-default-output/output-default.stdout
rename to tests/run-make/rustdoc/default-output/output-default.stdout
diff --git a/tests/run-make/rustdoc-default-output/rmake.rs b/tests/run-make/rustdoc/default-output/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-default-output/rmake.rs
rename to tests/run-make/rustdoc/default-output/rmake.rs
diff --git a/tests/run-make/rustdoc-dep-info/after.md b/tests/run-make/rustdoc/dep-info/after.md
similarity index 100%
rename from tests/run-make/rustdoc-dep-info/after.md
rename to tests/run-make/rustdoc/dep-info/after.md
diff --git a/tests/run-make/rustdoc-dep-info/bar.rs b/tests/run-make/rustdoc/dep-info/bar.rs
similarity index 100%
rename from tests/run-make/rustdoc-dep-info/bar.rs
rename to tests/run-make/rustdoc/dep-info/bar.rs
diff --git a/tests/run-make/rustdoc-dep-info/before.html b/tests/run-make/rustdoc/dep-info/before.html
similarity index 100%
rename from tests/run-make/rustdoc-dep-info/before.html
rename to tests/run-make/rustdoc/dep-info/before.html
diff --git a/tests/run-make/rustdoc-dep-info/custom_theme.css b/tests/run-make/rustdoc/dep-info/custom_theme.css
similarity index 100%
rename from tests/run-make/rustdoc-dep-info/custom_theme.css
rename to tests/run-make/rustdoc/dep-info/custom_theme.css
diff --git a/tests/run-make/rustdoc-dep-info/doc.md b/tests/run-make/rustdoc/dep-info/doc.md
similarity index 100%
rename from tests/run-make/rustdoc-dep-info/doc.md
rename to tests/run-make/rustdoc/dep-info/doc.md
diff --git a/tests/run-make/rustdoc-dep-info/example.md b/tests/run-make/rustdoc/dep-info/example.md
similarity index 100%
rename from tests/run-make/rustdoc-dep-info/example.md
rename to tests/run-make/rustdoc/dep-info/example.md
diff --git a/tests/run-make/rustdoc-dep-info/extend.css b/tests/run-make/rustdoc/dep-info/extend.css
similarity index 100%
rename from tests/run-make/rustdoc-dep-info/extend.css
rename to tests/run-make/rustdoc/dep-info/extend.css
diff --git a/tests/run-make/rustdoc-dep-info/foo.rs b/tests/run-make/rustdoc/dep-info/foo.rs
similarity index 100%
rename from tests/run-make/rustdoc-dep-info/foo.rs
rename to tests/run-make/rustdoc/dep-info/foo.rs
diff --git a/tests/run-make/rustdoc-dep-info/index-page.md b/tests/run-make/rustdoc/dep-info/index-page.md
similarity index 100%
rename from tests/run-make/rustdoc-dep-info/index-page.md
rename to tests/run-make/rustdoc/dep-info/index-page.md
diff --git a/tests/run-make/rustdoc-dep-info/lib.rs b/tests/run-make/rustdoc/dep-info/lib.rs
similarity index 100%
rename from tests/run-make/rustdoc-dep-info/lib.rs
rename to tests/run-make/rustdoc/dep-info/lib.rs
diff --git a/tests/run-make/rustdoc-dep-info/rmake.rs b/tests/run-make/rustdoc/dep-info/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-dep-info/rmake.rs
rename to tests/run-make/rustdoc/dep-info/rmake.rs
diff --git a/tests/run-make/deref-impl-rustdoc-ice/bar.rs b/tests/run-make/rustdoc/deref-impl/bar.rs
similarity index 100%
rename from tests/run-make/deref-impl-rustdoc-ice/bar.rs
rename to tests/run-make/rustdoc/deref-impl/bar.rs
diff --git a/tests/run-make/deref-impl-rustdoc-ice/baz.rs b/tests/run-make/rustdoc/deref-impl/baz.rs
similarity index 100%
rename from tests/run-make/deref-impl-rustdoc-ice/baz.rs
rename to tests/run-make/rustdoc/deref-impl/baz.rs
diff --git a/tests/run-make/deref-impl-rustdoc-ice/foo.rs b/tests/run-make/rustdoc/deref-impl/foo.rs
similarity index 100%
rename from tests/run-make/deref-impl-rustdoc-ice/foo.rs
rename to tests/run-make/rustdoc/deref-impl/foo.rs
diff --git a/tests/run-make/deref-impl-rustdoc-ice/rmake.rs b/tests/run-make/rustdoc/deref-impl/rmake.rs
similarity index 100%
rename from tests/run-make/deref-impl-rustdoc-ice/rmake.rs
rename to tests/run-make/rustdoc/deref-impl/rmake.rs
diff --git a/tests/run-make/rustdoc-determinism/bar.rs b/tests/run-make/rustdoc/determinism/bar.rs
similarity index 100%
rename from tests/run-make/rustdoc-determinism/bar.rs
rename to tests/run-make/rustdoc/determinism/bar.rs
diff --git a/tests/run-make/rustdoc-io-error/foo.rs b/tests/run-make/rustdoc/determinism/foo.rs
similarity index 100%
rename from tests/run-make/rustdoc-io-error/foo.rs
rename to tests/run-make/rustdoc/determinism/foo.rs
diff --git a/tests/run-make/rustdoc-determinism/rmake.rs b/tests/run-make/rustdoc/determinism/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-determinism/rmake.rs
rename to tests/run-make/rustdoc/determinism/rmake.rs
diff --git a/tests/run-make/doctests-compilation-time-info/rmake.rs b/tests/run-make/rustdoc/doctest/comptime-info/rmake.rs
similarity index 100%
rename from tests/run-make/doctests-compilation-time-info/rmake.rs
rename to tests/run-make/rustdoc/doctest/comptime-info/rmake.rs
diff --git a/tests/run-make/doctests-junit/doctest-2021.xml b/tests/run-make/rustdoc/doctest/junit/doctest-2021.xml
similarity index 100%
rename from tests/run-make/doctests-junit/doctest-2021.xml
rename to tests/run-make/rustdoc/doctest/junit/doctest-2021.xml
diff --git a/tests/run-make/doctests-junit/doctest-2024.xml b/tests/run-make/rustdoc/doctest/junit/doctest-2024.xml
similarity index 100%
rename from tests/run-make/doctests-junit/doctest-2024.xml
rename to tests/run-make/rustdoc/doctest/junit/doctest-2024.xml
diff --git a/tests/run-make/doctests-junit/doctest.rs b/tests/run-make/rustdoc/doctest/junit/doctest.rs
similarity index 100%
rename from tests/run-make/doctests-junit/doctest.rs
rename to tests/run-make/rustdoc/doctest/junit/doctest.rs
diff --git a/tests/run-make/doctests-junit/rmake.rs b/tests/run-make/rustdoc/doctest/junit/rmake.rs
similarity index 100%
rename from tests/run-make/doctests-junit/rmake.rs
rename to tests/run-make/rustdoc/doctest/junit/rmake.rs
diff --git a/tests/run-make/doctests-junit/validate_junit.py b/tests/run-make/rustdoc/doctest/junit/validate_junit.py
similarity index 100%
rename from tests/run-make/doctests-junit/validate_junit.py
rename to tests/run-make/rustdoc/doctest/junit/validate_junit.py
diff --git a/tests/run-make/doctests-keep-binaries-2024/rmake.rs b/tests/run-make/rustdoc/doctest/keep-binaries-2024/rmake.rs
similarity index 100%
rename from tests/run-make/doctests-keep-binaries-2024/rmake.rs
rename to tests/run-make/rustdoc/doctest/keep-binaries-2024/rmake.rs
diff --git a/tests/run-make/doctests-keep-binaries-2024/t.rs b/tests/run-make/rustdoc/doctest/keep-binaries-2024/t.rs
similarity index 100%
rename from tests/run-make/doctests-keep-binaries-2024/t.rs
rename to tests/run-make/rustdoc/doctest/keep-binaries-2024/t.rs
diff --git a/tests/run-make/doctests-keep-binaries/rmake.rs b/tests/run-make/rustdoc/doctest/keep-binaries/rmake.rs
similarity index 100%
rename from tests/run-make/doctests-keep-binaries/rmake.rs
rename to tests/run-make/rustdoc/doctest/keep-binaries/rmake.rs
diff --git a/tests/run-make/doctests-keep-binaries/t.rs b/tests/run-make/rustdoc/doctest/keep-binaries/t.rs
similarity index 100%
rename from tests/run-make/doctests-keep-binaries/t.rs
rename to tests/run-make/rustdoc/doctest/keep-binaries/t.rs
diff --git a/tests/run-make/doctests-merge/doctest-2021.stdout b/tests/run-make/rustdoc/doctest/merge/doctest-2021.stdout
similarity index 100%
rename from tests/run-make/doctests-merge/doctest-2021.stdout
rename to tests/run-make/rustdoc/doctest/merge/doctest-2021.stdout
diff --git a/tests/run-make/doctests-merge/doctest-2024.stdout b/tests/run-make/rustdoc/doctest/merge/doctest-2024.stdout
similarity index 100%
rename from tests/run-make/doctests-merge/doctest-2024.stdout
rename to tests/run-make/rustdoc/doctest/merge/doctest-2024.stdout
diff --git a/tests/run-make/doctests-merge/doctest-standalone.rs b/tests/run-make/rustdoc/doctest/merge/doctest-standalone.rs
similarity index 100%
rename from tests/run-make/doctests-merge/doctest-standalone.rs
rename to tests/run-make/rustdoc/doctest/merge/doctest-standalone.rs
diff --git a/tests/run-make/doctests-merge/doctest-standalone.stdout b/tests/run-make/rustdoc/doctest/merge/doctest-standalone.stdout
similarity index 100%
rename from tests/run-make/doctests-merge/doctest-standalone.stdout
rename to tests/run-make/rustdoc/doctest/merge/doctest-standalone.stdout
diff --git a/tests/run-make/doctests-merge/doctest.rs b/tests/run-make/rustdoc/doctest/merge/doctest.rs
similarity index 100%
rename from tests/run-make/doctests-merge/doctest.rs
rename to tests/run-make/rustdoc/doctest/merge/doctest.rs
diff --git a/tests/run-make/doctests-merge/rmake.rs b/tests/run-make/rustdoc/doctest/merge/rmake.rs
similarity index 100%
rename from tests/run-make/doctests-merge/rmake.rs
rename to tests/run-make/rustdoc/doctest/merge/rmake.rs
diff --git a/tests/run-make/rustdoc-doctest-output-format/file.rs b/tests/run-make/rustdoc/doctest/output-format/file.rs
similarity index 100%
rename from tests/run-make/rustdoc-doctest-output-format/file.rs
rename to tests/run-make/rustdoc/doctest/output-format/file.rs
diff --git a/tests/run-make/rustdoc-doctest-output-format/rmake.rs b/tests/run-make/rustdoc/doctest/output-format/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-doctest-output-format/rmake.rs
rename to tests/run-make/rustdoc/doctest/output-format/rmake.rs
diff --git a/tests/run-make/doctests-runtool/rmake.rs b/tests/run-make/rustdoc/doctest/runtool/rmake.rs
similarity index 100%
rename from tests/run-make/doctests-runtool/rmake.rs
rename to tests/run-make/rustdoc/doctest/runtool/rmake.rs
diff --git a/tests/run-make/doctests-runtool/runtool.rs b/tests/run-make/rustdoc/doctest/runtool/runtool.rs
similarity index 100%
rename from tests/run-make/doctests-runtool/runtool.rs
rename to tests/run-make/rustdoc/doctest/runtool/runtool.rs
diff --git a/tests/run-make/doctests-runtool/t.rs b/tests/run-make/rustdoc/doctest/runtool/t.rs
similarity index 100%
rename from tests/run-make/doctests-runtool/t.rs
rename to tests/run-make/rustdoc/doctest/runtool/t.rs
diff --git a/tests/run-make/rustdoc-tempdir-removal/compile-error.rs b/tests/run-make/rustdoc/doctest/tempdir-removal/compile-error.rs
similarity index 100%
rename from tests/run-make/rustdoc-tempdir-removal/compile-error.rs
rename to tests/run-make/rustdoc/doctest/tempdir-removal/compile-error.rs
diff --git a/tests/run-make/rustdoc-tempdir-removal/rmake.rs b/tests/run-make/rustdoc/doctest/tempdir-removal/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-tempdir-removal/rmake.rs
rename to tests/run-make/rustdoc/doctest/tempdir-removal/rmake.rs
diff --git a/tests/run-make/rustdoc-tempdir-removal/run-error.rs b/tests/run-make/rustdoc/doctest/tempdir-removal/run-error.rs
similarity index 100%
rename from tests/run-make/rustdoc-tempdir-removal/run-error.rs
rename to tests/run-make/rustdoc/doctest/tempdir-removal/run-error.rs
diff --git a/tests/run-make/rustdoc-test-args/foo.rs b/tests/run-make/rustdoc/doctest/test-args/foo.rs
similarity index 100%
rename from tests/run-make/rustdoc-test-args/foo.rs
rename to tests/run-make/rustdoc/doctest/test-args/foo.rs
diff --git a/tests/run-make/rustdoc-test-args/rmake.rs b/tests/run-make/rustdoc/doctest/test-args/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-test-args/rmake.rs
rename to tests/run-make/rustdoc/doctest/test-args/rmake.rs
diff --git a/tests/run-make/rustdoc-test-builder/builder.rs b/tests/run-make/rustdoc/doctest/test-builder/builder.rs
similarity index 100%
rename from tests/run-make/rustdoc-test-builder/builder.rs
rename to tests/run-make/rustdoc/doctest/test-builder/builder.rs
diff --git a/tests/run-make/rustdoc-test-builder/doctest.rs b/tests/run-make/rustdoc/doctest/test-builder/doctest.rs
similarity index 100%
rename from tests/run-make/rustdoc-test-builder/doctest.rs
rename to tests/run-make/rustdoc/doctest/test-builder/doctest.rs
diff --git a/tests/run-make/rustdoc-test-builder/foo.rs b/tests/run-make/rustdoc/doctest/test-builder/foo.rs
similarity index 100%
rename from tests/run-make/rustdoc-test-builder/foo.rs
rename to tests/run-make/rustdoc/doctest/test-builder/foo.rs
diff --git a/tests/run-make/rustdoc-test-builder/rmake.rs b/tests/run-make/rustdoc/doctest/test-builder/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-test-builder/rmake.rs
rename to tests/run-make/rustdoc/doctest/test-builder/rmake.rs
diff --git a/tests/run-make/doctests-test_harness/doctests.rs b/tests/run-make/rustdoc/doctest/test_harness/doctests.rs
similarity index 100%
rename from tests/run-make/doctests-test_harness/doctests.rs
rename to tests/run-make/rustdoc/doctest/test_harness/doctests.rs
diff --git a/tests/run-make/doctests-test_harness/doctests.stdout b/tests/run-make/rustdoc/doctest/test_harness/doctests.stdout
similarity index 100%
rename from tests/run-make/doctests-test_harness/doctests.stdout
rename to tests/run-make/rustdoc/doctest/test_harness/doctests.stdout
diff --git a/tests/run-make/doctests-test_harness/rmake.rs b/tests/run-make/rustdoc/doctest/test_harness/rmake.rs
similarity index 100%
rename from tests/run-make/doctests-test_harness/rmake.rs
rename to tests/run-make/rustdoc/doctest/test_harness/rmake.rs
diff --git a/tests/run-make/doctests-test_harness/runtool.rs b/tests/run-make/rustdoc/doctest/test_harness/runtool.rs
similarity index 100%
rename from tests/run-make/doctests-test_harness/runtool.rs
rename to tests/run-make/rustdoc/doctest/test_harness/runtool.rs
diff --git a/tests/run-make/rustdoc-error-lines/input.rs b/tests/run-make/rustdoc/error-lines/input.rs
similarity index 100%
rename from tests/run-make/rustdoc-error-lines/input.rs
rename to tests/run-make/rustdoc/error-lines/input.rs
diff --git a/tests/run-make/rustdoc-error-lines/rmake.rs b/tests/run-make/rustdoc/error-lines/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-error-lines/rmake.rs
rename to tests/run-make/rustdoc/error-lines/rmake.rs
diff --git a/tests/run-make/rustdoc-shared-flags/rmake.rs b/tests/run-make/rustdoc/flag-namespaces-from-rustc/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-shared-flags/rmake.rs
rename to tests/run-make/rustdoc/flag-namespaces-from-rustc/rmake.rs
diff --git a/tests/run-make/rustdoc-output-path/foo.rs b/tests/run-make/rustdoc/io-error/foo.rs
similarity index 100%
rename from tests/run-make/rustdoc-output-path/foo.rs
rename to tests/run-make/rustdoc/io-error/foo.rs
diff --git a/tests/run-make/rustdoc-io-error/rmake.rs b/tests/run-make/rustdoc/io-error/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-io-error/rmake.rs
rename to tests/run-make/rustdoc/io-error/rmake.rs
diff --git a/tests/run-make/rustdoc-json-external-crate-path/dep.rs b/tests/run-make/rustdoc/json-external-crate-path/dep.rs
similarity index 100%
rename from tests/run-make/rustdoc-json-external-crate-path/dep.rs
rename to tests/run-make/rustdoc/json-external-crate-path/dep.rs
diff --git a/tests/run-make/rustdoc-json-external-crate-path/entry.rs b/tests/run-make/rustdoc/json-external-crate-path/entry.rs
similarity index 100%
rename from tests/run-make/rustdoc-json-external-crate-path/entry.rs
rename to tests/run-make/rustdoc/json-external-crate-path/entry.rs
diff --git a/tests/run-make/rustdoc-json-external-crate-path/rmake.rs b/tests/run-make/rustdoc/json-external-crate-path/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-json-external-crate-path/rmake.rs
rename to tests/run-make/rustdoc/json-external-crate-path/rmake.rs
diff --git a/tests/run-make/rustdoc-json-external-crate-path/trans_dep.rs b/tests/run-make/rustdoc/json-external-crate-path/trans_dep.rs
similarity index 100%
rename from tests/run-make/rustdoc-json-external-crate-path/trans_dep.rs
rename to tests/run-make/rustdoc/json-external-crate-path/trans_dep.rs
diff --git a/tests/run-make/rustdoc-output-stdout/foo.rs b/tests/run-make/rustdoc/json-output-stdout/foo.rs
similarity index 100%
rename from tests/run-make/rustdoc-output-stdout/foo.rs
rename to tests/run-make/rustdoc/json-output-stdout/foo.rs
diff --git a/tests/run-make/rustdoc-output-stdout/rmake.rs b/tests/run-make/rustdoc/json-output-stdout/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-output-stdout/rmake.rs
rename to tests/run-make/rustdoc/json-output-stdout/rmake.rs
diff --git a/tests/run-make/rustdoc-map-file/expected.json b/tests/run-make/rustdoc/map-file/expected.json
similarity index 100%
rename from tests/run-make/rustdoc-map-file/expected.json
rename to tests/run-make/rustdoc/map-file/expected.json
diff --git a/tests/run-make/rustdoc-map-file/foo.rs b/tests/run-make/rustdoc/map-file/foo.rs
similarity index 100%
rename from tests/run-make/rustdoc-map-file/foo.rs
rename to tests/run-make/rustdoc/map-file/foo.rs
diff --git a/tests/run-make/rustdoc-map-file/rmake.rs b/tests/run-make/rustdoc/map-file/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-map-file/rmake.rs
rename to tests/run-make/rustdoc/map-file/rmake.rs
diff --git a/tests/run-make/rustdoc-merge-directory-alias/dep1.rs b/tests/run-make/rustdoc/merge-dir-alias/dep1.rs
similarity index 100%
rename from tests/run-make/rustdoc-merge-directory-alias/dep1.rs
rename to tests/run-make/rustdoc/merge-dir-alias/dep1.rs
diff --git a/tests/run-make/rustdoc-merge-directory-alias/dep2.rs b/tests/run-make/rustdoc/merge-dir-alias/dep2.rs
similarity index 100%
rename from tests/run-make/rustdoc-merge-directory-alias/dep2.rs
rename to tests/run-make/rustdoc/merge-dir-alias/dep2.rs
diff --git a/tests/run-make/rustdoc-merge-directory-alias/dep_missing.rs b/tests/run-make/rustdoc/merge-dir-alias/dep_missing.rs
similarity index 100%
rename from tests/run-make/rustdoc-merge-directory-alias/dep_missing.rs
rename to tests/run-make/rustdoc/merge-dir-alias/dep_missing.rs
diff --git a/tests/run-make/rustdoc-merge-directory-alias/rmake.rs b/tests/run-make/rustdoc/merge-dir-alias/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-merge-directory-alias/rmake.rs
rename to tests/run-make/rustdoc/merge-dir-alias/rmake.rs
diff --git a/tests/run-make/rustdoc-merge-directory/dep1.rs b/tests/run-make/rustdoc/merge-dir/dep1.rs
similarity index 100%
rename from tests/run-make/rustdoc-merge-directory/dep1.rs
rename to tests/run-make/rustdoc/merge-dir/dep1.rs
diff --git a/tests/run-make/rustdoc-merge-directory/dep2.rs b/tests/run-make/rustdoc/merge-dir/dep2.rs
similarity index 100%
rename from tests/run-make/rustdoc-merge-directory/dep2.rs
rename to tests/run-make/rustdoc/merge-dir/dep2.rs
diff --git a/tests/run-make/rustdoc-merge-directory/dep_missing.rs b/tests/run-make/rustdoc/merge-dir/dep_missing.rs
similarity index 100%
rename from tests/run-make/rustdoc-merge-directory/dep_missing.rs
rename to tests/run-make/rustdoc/merge-dir/dep_missing.rs
diff --git a/tests/run-make/rustdoc-merge-directory/rmake.rs b/tests/run-make/rustdoc/merge-dir/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-merge-directory/rmake.rs
rename to tests/run-make/rustdoc/merge-dir/rmake.rs
diff --git a/tests/run-make/rustdoc-merge-no-input-finalize/rmake.rs b/tests/run-make/rustdoc/merge-no-input-finalize/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-merge-no-input-finalize/rmake.rs
rename to tests/run-make/rustdoc/merge-no-input-finalize/rmake.rs
diff --git a/tests/run-make/rustdoc-merge-no-input-finalize/sierra.rs b/tests/run-make/rustdoc/merge-no-input-finalize/sierra.rs
similarity index 100%
rename from tests/run-make/rustdoc-merge-no-input-finalize/sierra.rs
rename to tests/run-make/rustdoc/merge-no-input-finalize/sierra.rs
diff --git a/tests/run-make/rustdoc-with-short-out-dir-option/rmake.rs b/tests/run-make/rustdoc/out-dir-option-short/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-with-short-out-dir-option/rmake.rs
rename to tests/run-make/rustdoc/out-dir-option-short/rmake.rs
diff --git a/tests/run-make/rustdoc-with-out-dir-option/src/lib.rs b/tests/run-make/rustdoc/out-dir-option-short/src/lib.rs
similarity index 100%
rename from tests/run-make/rustdoc-with-out-dir-option/src/lib.rs
rename to tests/run-make/rustdoc/out-dir-option-short/src/lib.rs
diff --git a/tests/run-make/rustdoc-with-out-dir-option/rmake.rs b/tests/run-make/rustdoc/out-dir-option/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-with-out-dir-option/rmake.rs
rename to tests/run-make/rustdoc/out-dir-option/rmake.rs
diff --git a/tests/run-make/rustdoc-with-output-option/src/lib.rs b/tests/run-make/rustdoc/out-dir-option/src/lib.rs
similarity index 100%
rename from tests/run-make/rustdoc-with-output-option/src/lib.rs
rename to tests/run-make/rustdoc/out-dir-option/src/lib.rs
diff --git a/tests/run-make/rustdoc-with-output-option/rmake.rs b/tests/run-make/rustdoc/output-option/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-with-output-option/rmake.rs
rename to tests/run-make/rustdoc/output-option/rmake.rs
diff --git a/tests/run-make/rustdoc-with-short-out-dir-option/src/lib.rs b/tests/run-make/rustdoc/output-option/src/lib.rs
similarity index 100%
rename from tests/run-make/rustdoc-with-short-out-dir-option/src/lib.rs
rename to tests/run-make/rustdoc/output-option/src/lib.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-dep-info/examples/ex.rs b/tests/run-make/rustdoc/scrape-examples/dep-info/examples/ex.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-dep-info/examples/ex.rs
rename to tests/run-make/rustdoc/scrape-examples/dep-info/examples/ex.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-dep-info/rmake.rs b/tests/run-make/rustdoc/scrape-examples/dep-info/rmake.rs
similarity index 90%
rename from tests/run-make/rustdoc-scrape-examples-dep-info/rmake.rs
rename to tests/run-make/rustdoc/scrape-examples/dep-info/rmake.rs
index 5a612fd130052..e64468fe06c8e 100644
--- a/tests/run-make/rustdoc-scrape-examples-dep-info/rmake.rs
+++ b/tests/run-make/rustdoc/scrape-examples/dep-info/rmake.rs
@@ -1,7 +1,7 @@
 //@ needs-target-std
 use run_make_support::{assert_contains, rfs};
 
-#[path = "../rustdoc-scrape-examples-remap/scrape.rs"]
+#[path = "../remap/scrape.rs"]
 mod scrape;
 
 fn main() {
diff --git a/tests/run-make/rustdoc-scrape-examples-dep-info/src/lib.rs b/tests/run-make/rustdoc/scrape-examples/dep-info/src/lib.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-dep-info/src/lib.rs
rename to tests/run-make/rustdoc/scrape-examples/dep-info/src/lib.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-invalid-expr/examples/ex.rs b/tests/run-make/rustdoc/scrape-examples/invalid-expr/examples/ex.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-invalid-expr/examples/ex.rs
rename to tests/run-make/rustdoc/scrape-examples/invalid-expr/examples/ex.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-whitespace/rmake.rs b/tests/run-make/rustdoc/scrape-examples/invalid-expr/rmake.rs
similarity index 58%
rename from tests/run-make/rustdoc-scrape-examples-whitespace/rmake.rs
rename to tests/run-make/rustdoc/scrape-examples/invalid-expr/rmake.rs
index 38943b663c420..e4ae84447eb96 100644
--- a/tests/run-make/rustdoc-scrape-examples-whitespace/rmake.rs
+++ b/tests/run-make/rustdoc/scrape-examples/invalid-expr/rmake.rs
@@ -1,5 +1,5 @@
 //@ needs-target-std
-#[path = "../rustdoc-scrape-examples-remap/scrape.rs"]
+#[path = "../remap/scrape.rs"]
 mod scrape;
 
 fn main() {
diff --git a/tests/run-make/rustdoc-scrape-examples-invalid-expr/src/lib.rs b/tests/run-make/rustdoc/scrape-examples/invalid-expr/src/lib.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-invalid-expr/src/lib.rs
rename to tests/run-make/rustdoc/scrape-examples/invalid-expr/src/lib.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-macros/examples/ex.rs b/tests/run-make/rustdoc/scrape-examples/macros/examples/ex.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-macros/examples/ex.rs
rename to tests/run-make/rustdoc/scrape-examples/macros/examples/ex.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-macros/rmake.rs b/tests/run-make/rustdoc/scrape-examples/macros/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-macros/rmake.rs
rename to tests/run-make/rustdoc/scrape-examples/macros/rmake.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-macros/src/lib.rs b/tests/run-make/rustdoc/scrape-examples/macros/src/lib.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-macros/src/lib.rs
rename to tests/run-make/rustdoc/scrape-examples/macros/src/lib.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-macros/src/proc.rs b/tests/run-make/rustdoc/scrape-examples/macros/src/proc.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-macros/src/proc.rs
rename to tests/run-make/rustdoc/scrape-examples/macros/src/proc.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-multiple/examples/ex.rs b/tests/run-make/rustdoc/scrape-examples/multiple/examples/ex.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-multiple/examples/ex.rs
rename to tests/run-make/rustdoc/scrape-examples/multiple/examples/ex.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-multiple/examples/ex2.rs b/tests/run-make/rustdoc/scrape-examples/multiple/examples/ex2.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-multiple/examples/ex2.rs
rename to tests/run-make/rustdoc/scrape-examples/multiple/examples/ex2.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-invalid-expr/rmake.rs b/tests/run-make/rustdoc/scrape-examples/multiple/rmake.rs
similarity index 58%
rename from tests/run-make/rustdoc-scrape-examples-invalid-expr/rmake.rs
rename to tests/run-make/rustdoc/scrape-examples/multiple/rmake.rs
index 38943b663c420..e4ae84447eb96 100644
--- a/tests/run-make/rustdoc-scrape-examples-invalid-expr/rmake.rs
+++ b/tests/run-make/rustdoc/scrape-examples/multiple/rmake.rs
@@ -1,5 +1,5 @@
 //@ needs-target-std
-#[path = "../rustdoc-scrape-examples-remap/scrape.rs"]
+#[path = "../remap/scrape.rs"]
 mod scrape;
 
 fn main() {
diff --git a/tests/run-make/rustdoc-scrape-examples-multiple/src/lib.rs b/tests/run-make/rustdoc/scrape-examples/multiple/src/lib.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-multiple/src/lib.rs
rename to tests/run-make/rustdoc/scrape-examples/multiple/src/lib.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-ordering/examples/ex1.rs b/tests/run-make/rustdoc/scrape-examples/ordering/examples/ex1.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-ordering/examples/ex1.rs
rename to tests/run-make/rustdoc/scrape-examples/ordering/examples/ex1.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-ordering/examples/ex2.rs b/tests/run-make/rustdoc/scrape-examples/ordering/examples/ex2.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-ordering/examples/ex2.rs
rename to tests/run-make/rustdoc/scrape-examples/ordering/examples/ex2.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-multiple/rmake.rs b/tests/run-make/rustdoc/scrape-examples/ordering/rmake.rs
similarity index 58%
rename from tests/run-make/rustdoc-scrape-examples-multiple/rmake.rs
rename to tests/run-make/rustdoc/scrape-examples/ordering/rmake.rs
index 38943b663c420..e4ae84447eb96 100644
--- a/tests/run-make/rustdoc-scrape-examples-multiple/rmake.rs
+++ b/tests/run-make/rustdoc/scrape-examples/ordering/rmake.rs
@@ -1,5 +1,5 @@
 //@ needs-target-std
-#[path = "../rustdoc-scrape-examples-remap/scrape.rs"]
+#[path = "../remap/scrape.rs"]
 mod scrape;
 
 fn main() {
diff --git a/tests/run-make/rustdoc-scrape-examples-ordering/src/lib.rs b/tests/run-make/rustdoc/scrape-examples/ordering/src/lib.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-ordering/src/lib.rs
rename to tests/run-make/rustdoc/scrape-examples/ordering/src/lib.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-remap/examples/ex.rs b/tests/run-make/rustdoc/scrape-examples/remap/examples/ex.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-remap/examples/ex.rs
rename to tests/run-make/rustdoc/scrape-examples/remap/examples/ex.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-remap/rmake.rs b/tests/run-make/rustdoc/scrape-examples/remap/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-remap/rmake.rs
rename to tests/run-make/rustdoc/scrape-examples/remap/rmake.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-remap/scrape.rs b/tests/run-make/rustdoc/scrape-examples/remap/scrape.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-remap/scrape.rs
rename to tests/run-make/rustdoc/scrape-examples/remap/scrape.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-remap/src/a.rs b/tests/run-make/rustdoc/scrape-examples/remap/src/a.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-remap/src/a.rs
rename to tests/run-make/rustdoc/scrape-examples/remap/src/a.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-remap/src/lib.rs b/tests/run-make/rustdoc/scrape-examples/remap/src/lib.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-remap/src/lib.rs
rename to tests/run-make/rustdoc/scrape-examples/remap/src/lib.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-test/examples/ex.rs b/tests/run-make/rustdoc/scrape-examples/test/examples/ex.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-test/examples/ex.rs
rename to tests/run-make/rustdoc/scrape-examples/test/examples/ex.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-test/rmake.rs b/tests/run-make/rustdoc/scrape-examples/test/rmake.rs
similarity index 63%
rename from tests/run-make/rustdoc-scrape-examples-test/rmake.rs
rename to tests/run-make/rustdoc/scrape-examples/test/rmake.rs
index c0c4df91d517d..88d72df2314de 100644
--- a/tests/run-make/rustdoc-scrape-examples-test/rmake.rs
+++ b/tests/run-make/rustdoc/scrape-examples/test/rmake.rs
@@ -1,5 +1,5 @@
 //@ needs-target-std
-#[path = "../rustdoc-scrape-examples-remap/scrape.rs"]
+#[path = "../remap/scrape.rs"]
 mod scrape;
 
 fn main() {
diff --git a/tests/run-make/rustdoc-scrape-examples-test/src/lib.rs b/tests/run-make/rustdoc/scrape-examples/test/src/lib.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-test/src/lib.rs
rename to tests/run-make/rustdoc/scrape-examples/test/src/lib.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-whitespace/examples/ex.rs b/tests/run-make/rustdoc/scrape-examples/whitespace/examples/ex.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-whitespace/examples/ex.rs
rename to tests/run-make/rustdoc/scrape-examples/whitespace/examples/ex.rs
diff --git a/tests/run-make/rustdoc-scrape-examples-ordering/rmake.rs b/tests/run-make/rustdoc/scrape-examples/whitespace/rmake.rs
similarity index 58%
rename from tests/run-make/rustdoc-scrape-examples-ordering/rmake.rs
rename to tests/run-make/rustdoc/scrape-examples/whitespace/rmake.rs
index 38943b663c420..e4ae84447eb96 100644
--- a/tests/run-make/rustdoc-scrape-examples-ordering/rmake.rs
+++ b/tests/run-make/rustdoc/scrape-examples/whitespace/rmake.rs
@@ -1,5 +1,5 @@
 //@ needs-target-std
-#[path = "../rustdoc-scrape-examples-remap/scrape.rs"]
+#[path = "../remap/scrape.rs"]
 mod scrape;
 
 fn main() {
diff --git a/tests/run-make/rustdoc-scrape-examples-whitespace/src/lib.rs b/tests/run-make/rustdoc/scrape-examples/whitespace/src/lib.rs
similarity index 100%
rename from tests/run-make/rustdoc-scrape-examples-whitespace/src/lib.rs
rename to tests/run-make/rustdoc/scrape-examples/whitespace/src/lib.rs
diff --git a/tests/run-make/rustdoc-search-load-itemtype/bar.rs b/tests/run-make/rustdoc/search-load-itemtype/bar.rs
similarity index 100%
rename from tests/run-make/rustdoc-search-load-itemtype/bar.rs
rename to tests/run-make/rustdoc/search-load-itemtype/bar.rs
diff --git a/tests/run-make/rustdoc-search-load-itemtype/baz.rs b/tests/run-make/rustdoc/search-load-itemtype/baz.rs
similarity index 100%
rename from tests/run-make/rustdoc-search-load-itemtype/baz.rs
rename to tests/run-make/rustdoc/search-load-itemtype/baz.rs
diff --git a/tests/run-make/rustdoc-search-load-itemtype/foo.rs b/tests/run-make/rustdoc/search-load-itemtype/foo.rs
similarity index 100%
rename from tests/run-make/rustdoc-search-load-itemtype/foo.rs
rename to tests/run-make/rustdoc/search-load-itemtype/foo.rs
diff --git a/tests/run-make/rustdoc-search-load-itemtype/rmake.rs b/tests/run-make/rustdoc/search-load-itemtype/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-search-load-itemtype/rmake.rs
rename to tests/run-make/rustdoc/search-load-itemtype/rmake.rs
diff --git a/tests/run-make/stdin-rustdoc/rmake.rs b/tests/run-make/rustdoc/stdin/rmake.rs
similarity index 100%
rename from tests/run-make/stdin-rustdoc/rmake.rs
rename to tests/run-make/rustdoc/stdin/rmake.rs
diff --git a/tests/run-make/rustdoc-target-modifiers/c.rs b/tests/run-make/rustdoc/target-modifiers/c.rs
similarity index 100%
rename from tests/run-make/rustdoc-target-modifiers/c.rs
rename to tests/run-make/rustdoc/target-modifiers/c.rs
diff --git a/tests/run-make/rustdoc-target-modifiers/d.rs b/tests/run-make/rustdoc/target-modifiers/d.rs
similarity index 100%
rename from tests/run-make/rustdoc-target-modifiers/d.rs
rename to tests/run-make/rustdoc/target-modifiers/d.rs
diff --git a/tests/run-make/rustdoc-target-modifiers/rmake.rs b/tests/run-make/rustdoc/target-modifiers/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-target-modifiers/rmake.rs
rename to tests/run-make/rustdoc/target-modifiers/rmake.rs
diff --git a/tests/run-make/rustdoc-target-spec-json-path/dummy_core.rs b/tests/run-make/rustdoc/target-spec-json-path/dummy_core.rs
similarity index 100%
rename from tests/run-make/rustdoc-target-spec-json-path/dummy_core.rs
rename to tests/run-make/rustdoc/target-spec-json-path/dummy_core.rs
diff --git a/tests/run-make/rustdoc-target-spec-json-path/my_crate.rs b/tests/run-make/rustdoc/target-spec-json-path/my_crate.rs
similarity index 100%
rename from tests/run-make/rustdoc-target-spec-json-path/my_crate.rs
rename to tests/run-make/rustdoc/target-spec-json-path/my_crate.rs
diff --git a/tests/run-make/rustdoc-target-spec-json-path/rmake.rs b/tests/run-make/rustdoc/target-spec-json-path/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-target-spec-json-path/rmake.rs
rename to tests/run-make/rustdoc/target-spec-json-path/rmake.rs
diff --git a/tests/run-make/rustdoc-target-spec-json-path/target.json b/tests/run-make/rustdoc/target-spec-json-path/target.json
similarity index 100%
rename from tests/run-make/rustdoc-target-spec-json-path/target.json
rename to tests/run-make/rustdoc/target-spec-json-path/target.json
diff --git a/tests/run-make/rustdoc-themes/foo.rs b/tests/run-make/rustdoc/themes/foo.rs
similarity index 100%
rename from tests/run-make/rustdoc-themes/foo.rs
rename to tests/run-make/rustdoc/themes/foo.rs
diff --git a/tests/run-make/rustdoc-themes/rmake.rs b/tests/run-make/rustdoc/themes/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-themes/rmake.rs
rename to tests/run-make/rustdoc/themes/rmake.rs
diff --git a/tests/run-make/rustdoc-verify-output-files/rmake.rs b/tests/run-make/rustdoc/verify-output-files/rmake.rs
similarity index 100%
rename from tests/run-make/rustdoc-verify-output-files/rmake.rs
rename to tests/run-make/rustdoc/verify-output-files/rmake.rs
diff --git a/tests/run-make/rustdoc-verify-output-files/src/lib.rs b/tests/run-make/rustdoc/verify-output-files/src/lib.rs
similarity index 100%
rename from tests/run-make/rustdoc-verify-output-files/src/lib.rs
rename to tests/run-make/rustdoc/verify-output-files/src/lib.rs