diff --git a/src/ci/citool/src/analysis.rs b/src/ci/citool/src/analysis.rs
index 8ba8f1ab564b2..39b115154f9f4 100644
--- a/src/ci/citool/src/analysis.rs
+++ b/src/ci/citool/src/analysis.rs
@@ -237,7 +237,7 @@ pub fn output_largest_duration_changes(
     println!("# Job duration changes");
     for (index, entry) in changes.into_iter().take(10).enumerate() {
         println!(
-            "{}. {}: {:.1}s -> {:.1}s ({:.1}%)",
+            "{}. {}: {:.1}s -> {:.1}s ({:+.1}%)",
             index + 1,
             format_job_link(job_info_resolver, job_metrics, entry.job),
             entry.before.as_secs_f64(),
diff --git a/tests/rustdoc-ui/deref-generic.rs b/tests/rustdoc-ui/deref/deref-generic.rs
similarity index 100%
rename from tests/rustdoc-ui/deref-generic.rs
rename to tests/rustdoc-ui/deref/deref-generic.rs
diff --git a/tests/rustdoc-ui/ice-blanket-impl-56701.rs b/tests/rustdoc-ui/deref/ice-blanket-impl-56701.rs
similarity index 100%
rename from tests/rustdoc-ui/ice-blanket-impl-56701.rs
rename to tests/rustdoc-ui/deref/ice-blanket-impl-56701.rs
diff --git a/tests/rustdoc-ui/recursive-deref-ice.rs b/tests/rustdoc-ui/deref/recursive-deref-ice.rs
similarity index 100%
rename from tests/rustdoc-ui/recursive-deref-ice.rs
rename to tests/rustdoc-ui/deref/recursive-deref-ice.rs
diff --git a/tests/rustdoc-ui/auxiliary/issue-48414.rs b/tests/rustdoc-ui/intra-doc/auxiliary/issue-48414.rs
similarity index 100%
rename from tests/rustdoc-ui/auxiliary/issue-48414.rs
rename to tests/rustdoc-ui/intra-doc/auxiliary/issue-48414.rs
diff --git a/tests/rustdoc-ui/circular-intra-doc-link-48414.rs b/tests/rustdoc-ui/intra-doc/circular-intra-doc-link-48414.rs
similarity index 100%
rename from tests/rustdoc-ui/circular-intra-doc-link-48414.rs
rename to tests/rustdoc-ui/intra-doc/circular-intra-doc-link-48414.rs
diff --git a/tests/rustdoc-ui/disambiguator-endswith-named-suffix.rs b/tests/rustdoc-ui/intra-doc/disambiguator-endswith-named-suffix.rs
similarity index 100%
rename from tests/rustdoc-ui/disambiguator-endswith-named-suffix.rs
rename to tests/rustdoc-ui/intra-doc/disambiguator-endswith-named-suffix.rs
diff --git a/tests/rustdoc-ui/disambiguator-endswith-named-suffix.stderr b/tests/rustdoc-ui/intra-doc/disambiguator-endswith-named-suffix.stderr
similarity index 100%
rename from tests/rustdoc-ui/disambiguator-endswith-named-suffix.stderr
rename to tests/rustdoc-ui/intra-doc/disambiguator-endswith-named-suffix.stderr
diff --git a/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.rs b/tests/rustdoc-ui/lints/custom_code_classes_in_docs-warning3.rs
similarity index 100%
rename from tests/rustdoc-ui/custom_code_classes_in_docs-warning3.rs
rename to tests/rustdoc-ui/lints/custom_code_classes_in_docs-warning3.rs
diff --git a/tests/rustdoc-ui/custom_code_classes_in_docs-warning3.stderr b/tests/rustdoc-ui/lints/custom_code_classes_in_docs-warning3.stderr
similarity index 100%
rename from tests/rustdoc-ui/custom_code_classes_in_docs-warning3.stderr
rename to tests/rustdoc-ui/lints/custom_code_classes_in_docs-warning3.stderr
diff --git a/tests/rustdoc-ui/diagnostic-width.rs b/tests/rustdoc-ui/lints/diagnostic-width.rs
similarity index 100%
rename from tests/rustdoc-ui/diagnostic-width.rs
rename to tests/rustdoc-ui/lints/diagnostic-width.rs
diff --git a/tests/rustdoc-ui/diagnostic-width.stderr b/tests/rustdoc-ui/lints/diagnostic-width.stderr
similarity index 100%
rename from tests/rustdoc-ui/diagnostic-width.stderr
rename to tests/rustdoc-ui/lints/diagnostic-width.stderr
diff --git a/tests/rustdoc-ui/include-str-bare-urls.rs b/tests/rustdoc-ui/lints/include-str-bare-urls.rs
similarity index 89%
rename from tests/rustdoc-ui/include-str-bare-urls.rs
rename to tests/rustdoc-ui/lints/include-str-bare-urls.rs
index f80e28e8ca700..83539ef62b3dc 100644
--- a/tests/rustdoc-ui/include-str-bare-urls.rs
+++ b/tests/rustdoc-ui/lints/include-str-bare-urls.rs
@@ -12,6 +12,6 @@
 // If the stderr file changes, make sure the warning points at the URL!
 
 #![deny(rustdoc::bare_urls)]
-#![doc=include_str!("auxiliary/include-str-bare-urls.md")]
+#![doc=include_str!("../auxiliary/include-str-bare-urls.md")]
 
 //~? ERROR this URL is not a hyperlink
diff --git a/tests/rustdoc-ui/include-str-bare-urls.stderr b/tests/rustdoc-ui/lints/include-str-bare-urls.stderr
similarity index 91%
rename from tests/rustdoc-ui/include-str-bare-urls.stderr
rename to tests/rustdoc-ui/lints/include-str-bare-urls.stderr
index 53da2411874a5..7771a051fe1b9 100644
--- a/tests/rustdoc-ui/include-str-bare-urls.stderr
+++ b/tests/rustdoc-ui/lints/include-str-bare-urls.stderr
@@ -1,5 +1,5 @@
 error: this URL is not a hyperlink
-  --> $DIR/auxiliary/include-str-bare-urls.md:1:11
+  --> $DIR/../auxiliary/include-str-bare-urls.md:1:11
    |
 LL | HEADS UP! https://example.com MUST SHOW UP IN THE STDERR FILE!
    |           ^^^^^^^^^^^^^^^^^^^
diff --git a/tests/rustdoc-ui/redundant-explicit-links-123677.rs b/tests/rustdoc-ui/lints/redundant-explicit-links-123677.rs
similarity index 100%
rename from tests/rustdoc-ui/redundant-explicit-links-123677.rs
rename to tests/rustdoc-ui/lints/redundant-explicit-links-123677.rs
diff --git a/tests/rustdoc-ui/remap-path-prefix-lint.rs b/tests/rustdoc-ui/lints/remap-path-prefix-lint.rs
similarity index 100%
rename from tests/rustdoc-ui/remap-path-prefix-lint.rs
rename to tests/rustdoc-ui/lints/remap-path-prefix-lint.rs
diff --git a/tests/rustdoc-ui/remap-path-prefix-lint.stderr b/tests/rustdoc-ui/lints/remap-path-prefix-lint.stderr
similarity index 68%
rename from tests/rustdoc-ui/remap-path-prefix-lint.stderr
rename to tests/rustdoc-ui/lints/remap-path-prefix-lint.stderr
index d7c1bb1965d35..e8a88394ffd92 100644
--- a/tests/rustdoc-ui/remap-path-prefix-lint.stderr
+++ b/tests/rustdoc-ui/lints/remap-path-prefix-lint.stderr
@@ -1,11 +1,11 @@
 error: unopened HTML tag `script`
-  --> remapped_path/remap-path-prefix-lint.rs:9:5
+  --> remapped_path/lints/remap-path-prefix-lint.rs:9:5
    |
 LL | /// </script>
    |     ^^^^^^^^^
    |
 note: the lint level is defined here
-  --> remapped_path/remap-path-prefix-lint.rs:7:9
+  --> remapped_path/lints/remap-path-prefix-lint.rs:7:9
    |
 LL | #![deny(rustdoc::invalid_html_tags)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/rustdoc-ui/unescaped_backticks.rs b/tests/rustdoc-ui/lints/unescaped_backticks.rs
similarity index 100%
rename from tests/rustdoc-ui/unescaped_backticks.rs
rename to tests/rustdoc-ui/lints/unescaped_backticks.rs
diff --git a/tests/rustdoc-ui/unescaped_backticks.stderr b/tests/rustdoc-ui/lints/unescaped_backticks.stderr
similarity index 100%
rename from tests/rustdoc-ui/unescaped_backticks.stderr
rename to tests/rustdoc-ui/lints/unescaped_backticks.stderr
diff --git a/tests/rustdoc/duplicate-cfg.rs b/tests/rustdoc/doc-cfg/duplicate-cfg.rs
similarity index 100%
rename from tests/rustdoc/duplicate-cfg.rs
rename to tests/rustdoc/doc-cfg/duplicate-cfg.rs
diff --git a/tests/ui/traits/generic-cow-inference-regression.rs b/tests/ui/traits/generic-cow-inference-regression.rs
index 6fd4715f85bbd..e9dd76d1aea4f 100644
--- a/tests/ui/traits/generic-cow-inference-regression.rs
+++ b/tests/ui/traits/generic-cow-inference-regression.rs
@@ -1,3 +1,5 @@
+//@[new] compile-flags: -Znext-solver
+//@ revisions: old new
 //@ run-pass
 
 // regression test for #147964:
diff --git a/triagebot.toml b/triagebot.toml
index a0d0b1892e4fe..7a4e0bb5f43ba 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -644,7 +644,7 @@ trigger_files = [
 zulip_stream = 245100 # #t-compiler/prioritization/alerts
 topic = "#{number} {title}"
 message_on_add = """\
-@*WG-prioritization/alerts* issue #{number} has been requested for prioritization.
+Issue #{number} has been requested for prioritization.
 
 # [Procedure](https://forge.rust-lang.org/compiler/prioritization.html)
 - Priority?
@@ -738,12 +738,12 @@ message_on_reopen = "PR #{number} has been reopened. Pinging @*T-rustdoc*."
 [notify-zulip."beta-nominated".compiler]
 required_labels = ["T-compiler"]
 zulip_stream = 474880 # #t-compiler/backports
-topic = "#{number}: beta-backport nomination"
+topic = "#{number}: beta-nominated"
 message_on_add = [
     """\
-PR #{number} "{title}" fixes a regression.
-{recipients}, please evaluate nominating this PR for backport.
-The following poll is a vibe-check and not binding.
+PR #{number} "{title}" fixes a regression and has been nominated for backport.
+{recipients}, what do you think about it?
+This topic will help T-compiler getting context about it.
 """,
     """\
 /poll Should #{number} be beta backported?
@@ -757,7 +757,7 @@ message_on_remove = "PR #{number}'s beta-nomination has been removed."
 [notify-zulip."beta-accepted".compiler]
 required_labels = ["T-compiler"]
 zulip_stream = 474880 # #t-compiler/backports
-# Put it in the same thread as beta-nominated.
+# Put it in the same Zulip topic as beta-nominated.
 topic = "#{number}: beta-nominated"
 message_on_add = "PR #{number} has been **accepted** for **beta** backport."