diff --git a/tests/rustdoc-html/async/async-move-doctest.rs b/tests/rustdoc-ui/doctest/async-move-doctest.rs
similarity index 77%
rename from tests/rustdoc-html/async/async-move-doctest.rs
rename to tests/rustdoc-ui/doctest/async-move-doctest.rs
index e18ec353533df..f491a9a04f851 100644
--- a/tests/rustdoc-html/async/async-move-doctest.rs
+++ b/tests/rustdoc-ui/doctest/async-move-doctest.rs
@@ -1,5 +1,7 @@
 //@ compile-flags:--test
+//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
 //@ edition:2018
+//@ check-pass
 
 // Prior to setting the default edition for the doctest pre-parser,
 // this doctest would fail due to a fatal parsing error.
diff --git a/tests/rustdoc-ui/doctest/async-move-doctest.stdout b/tests/rustdoc-ui/doctest/async-move-doctest.stdout
new file mode 100644
index 0000000000000..4790438d4602f
--- /dev/null
+++ b/tests/rustdoc-ui/doctest/async-move-doctest.stdout
@@ -0,0 +1,6 @@
+
+running 1 test
+test $DIR/async-move-doctest.rs - (line 10) ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/rustdoc-html/comment-in-doctest.rs b/tests/rustdoc-ui/doctest/comment-in-doctest.rs
similarity index 89%
rename from tests/rustdoc-html/comment-in-doctest.rs
rename to tests/rustdoc-ui/doctest/comment-in-doctest.rs
index e580aa2bb72c6..2caec5db9c920 100644
--- a/tests/rustdoc-html/comment-in-doctest.rs
+++ b/tests/rustdoc-ui/doctest/comment-in-doctest.rs
@@ -1,4 +1,6 @@
 //@ compile-flags:--test
+//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
+//@ check-pass
 
 // comments, both doc comments and regular ones, used to trick rustdoc's doctest parser into
 // thinking that everything after it was part of the regular program. combined with the librustc_ast
diff --git a/tests/rustdoc-ui/doctest/comment-in-doctest.stdout b/tests/rustdoc-ui/doctest/comment-in-doctest.stdout
new file mode 100644
index 0000000000000..5cb97c53f37fd
--- /dev/null
+++ b/tests/rustdoc-ui/doctest/comment-in-doctest.stdout
@@ -0,0 +1,6 @@
+
+running 1 test
+test $DIR/comment-in-doctest.rs - (line 12) ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/rustdoc-html/demo-allocator-54478.rs b/tests/rustdoc-ui/doctest/demo-allocator-54478.rs
similarity index 93%
rename from tests/rustdoc-html/demo-allocator-54478.rs
rename to tests/rustdoc-ui/doctest/demo-allocator-54478.rs
index 80acfc0ff58a1..073d83e11120e 100644
--- a/tests/rustdoc-html/demo-allocator-54478.rs
+++ b/tests/rustdoc-ui/doctest/demo-allocator-54478.rs
@@ -1,4 +1,9 @@
 // https://github.com/rust-lang/rust/issues/54478
+
+//@ compile-flags:--test
+//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
+//@ check-pass
+
 #![crate_name="foo"]
 
 // Issue #54478: regression test showing that we can demonstrate
@@ -15,8 +20,6 @@
 // decided to change `rustdoc` to behave more like the compiler's
 // default setting, by leaving off `-C prefer-dynamic`.
 
-//@ compile-flags:--test
-
 //! This is a doc comment
 //!
 //! ```rust
diff --git a/tests/rustdoc-ui/doctest/demo-allocator-54478.stdout b/tests/rustdoc-ui/doctest/demo-allocator-54478.stdout
new file mode 100644
index 0000000000000..f32d9a5b7d932
--- /dev/null
+++ b/tests/rustdoc-ui/doctest/demo-allocator-54478.stdout
@@ -0,0 +1,6 @@
+
+running 1 test
+test $DIR/demo-allocator-54478.rs - (line 25) ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/rustdoc-html/doc-cfg/doc-cfg-target-feature.rs b/tests/rustdoc-ui/doctest/doc-cfg-target-feature.rs
similarity index 67%
rename from tests/rustdoc-html/doc-cfg/doc-cfg-target-feature.rs
rename to tests/rustdoc-ui/doctest/doc-cfg-target-feature.rs
index b66e86e36af8b..a55b31d61e3d0 100644
--- a/tests/rustdoc-html/doc-cfg/doc-cfg-target-feature.rs
+++ b/tests/rustdoc-ui/doctest/doc-cfg-target-feature.rs
@@ -1,6 +1,8 @@
 //@ only-x86_64
+//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
+//@ normalize-stdout: "rust_out::main::.+" -> "rust_out::main::$$PATH"
 //@ compile-flags:--test
-//@ should-fail
+//@ failure-status: 101
 
 // #49723: rustdoc didn't add target features when extracting or running doctests
 
diff --git a/tests/rustdoc-ui/doctest/doc-cfg-target-feature.stdout b/tests/rustdoc-ui/doctest/doc-cfg-target-feature.stdout
new file mode 100644
index 0000000000000..6526e9898dd2f
--- /dev/null
+++ b/tests/rustdoc-ui/doctest/doc-cfg-target-feature.stdout
@@ -0,0 +1,39 @@
+
+running 1 test
+test $DIR/doc-cfg-target-feature.rs - foo (line 15) ... FAILED
+
+failures:
+
+---- $DIR/doc-cfg-target-feature.rs - foo (line 15) stdout ----
+warning: the feature `cfg_target_feature` has been stable since 1.27.0 and no longer requires an attribute to enable
+  --> $DIR/doc-cfg-target-feature.rs:15:12
+   |
+LL | #![feature(cfg_target_feature)]
+   |            ^^^^^^^^^^^^^^^^^^
+   |
+   = note: `#[warn(stable_features)]` on by default
+
+warning: 1 warning emitted
+
+Test executable failed (exit status: 101).
+
+stderr:
+
+thread 'main' ($TID) panicked at $DIR/doc-cfg-target-feature.rs:7:1:
+assertion failed: false
+stack backtrace:
+   0: __rustc::rust_begin_unwind
+   1: core::panicking::panic_fmt
+   2: core::panicking::panic
+   3: rust_out::main::$PATH
+   4: rust_out::main
+   5: <fn() as core::ops::function::FnOnce<()>>::call_once
+note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
+
+
+
+failures:
+    $DIR/doc-cfg-target-feature.rs - foo (line 15)
+
+test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/rustdoc-html/doc-test-attr-18199.rs b/tests/rustdoc-ui/doctest/doc-test-attr-18199.rs
similarity index 74%
rename from tests/rustdoc-html/doc-test-attr-18199.rs
rename to tests/rustdoc-ui/doctest/doc-test-attr-18199.rs
index 64016e32eeeb1..8350f244fccac 100644
--- a/tests/rustdoc-html/doc-test-attr-18199.rs
+++ b/tests/rustdoc-ui/doctest/doc-test-attr-18199.rs
@@ -1,6 +1,9 @@
-//@ compile-flags:--test
 // https://github.com/rust-lang/rust/issues/18199
 
+//@ compile-flags:--test
+//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
+//@ check-pass
+
 #![doc(test(attr(feature(staged_api))))]
 
 /// ```
diff --git a/tests/rustdoc-ui/doctest/doc-test-attr-18199.stdout b/tests/rustdoc-ui/doctest/doc-test-attr-18199.stdout
new file mode 100644
index 0000000000000..a182a3b911af6
--- /dev/null
+++ b/tests/rustdoc-ui/doctest/doc-test-attr-18199.stdout
@@ -0,0 +1,6 @@
+
+running 1 test
+test $DIR/doc-test-attr-18199.rs - foo (line 9) ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/rustdoc-html/edition-doctest.rs b/tests/rustdoc-ui/doctest/edition-doctest.rs
similarity index 87%
rename from tests/rustdoc-html/edition-doctest.rs
rename to tests/rustdoc-ui/doctest/edition-doctest.rs
index f43c074f806bd..066475dae7bf0 100644
--- a/tests/rustdoc-html/edition-doctest.rs
+++ b/tests/rustdoc-ui/doctest/edition-doctest.rs
@@ -1,4 +1,6 @@
-//@ compile-flags:--test
+//@ compile-flags:--test --test-args=--test-threads=1
+//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
+//@ check-pass
 
 /// ```rust,edition2018
 /// #![feature(try_blocks)]
diff --git a/tests/rustdoc-ui/doctest/edition-doctest.stdout b/tests/rustdoc-ui/doctest/edition-doctest.stdout
new file mode 100644
index 0000000000000..40d0df0575a76
--- /dev/null
+++ b/tests/rustdoc-ui/doctest/edition-doctest.stdout
@@ -0,0 +1,7 @@
+
+running 2 tests
+test $DIR/edition-doctest.rs - foo (line 24) - compile fail ... ok
+test $DIR/edition-doctest.rs - foo (line 5) ... ok
+
+test result: ok. 2 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/rustdoc-html/edition-flag.rs b/tests/rustdoc-ui/doctest/edition-flag.rs
similarity index 63%
rename from tests/rustdoc-html/edition-flag.rs
rename to tests/rustdoc-ui/doctest/edition-flag.rs
index c57c8d50b2357..51235634dbf4a 100644
--- a/tests/rustdoc-html/edition-flag.rs
+++ b/tests/rustdoc-ui/doctest/edition-flag.rs
@@ -1,5 +1,7 @@
 //@ compile-flags:--test
 //@ edition:2018
+//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
+//@ check-pass
 
 /// ```rust
 /// fn main() {
diff --git a/tests/rustdoc-ui/doctest/edition-flag.stdout b/tests/rustdoc-ui/doctest/edition-flag.stdout
new file mode 100644
index 0000000000000..4833a6dcf9adf
--- /dev/null
+++ b/tests/rustdoc-ui/doctest/edition-flag.stdout
@@ -0,0 +1,6 @@
+
+running 1 test
+test $DIR/edition-flag.rs - main (line 6) ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/rustdoc-html/force-target-feature.rs b/tests/rustdoc-ui/doctest/force-target-feature.rs
similarity index 52%
rename from tests/rustdoc-html/force-target-feature.rs
rename to tests/rustdoc-ui/doctest/force-target-feature.rs
index fa71bbeea2747..f39e7cf3a9094 100644
--- a/tests/rustdoc-html/force-target-feature.rs
+++ b/tests/rustdoc-ui/doctest/force-target-feature.rs
@@ -1,6 +1,10 @@
 //@ only-x86_64
 //@ compile-flags:--test -C target-feature=+avx
-//@ should-fail
+//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
+//@ normalize-stdout: "rust_out::main::.+" -> "rust_out::main::$$PATH"
+//@ failure-status: 101
+
+#![feature(doc_cfg)]
 
 /// (written on a spider's web) Some Struct
 ///
diff --git a/tests/rustdoc-ui/doctest/force-target-feature.stdout b/tests/rustdoc-ui/doctest/force-target-feature.stdout
new file mode 100644
index 0000000000000..fb898dd14b2c9
--- /dev/null
+++ b/tests/rustdoc-ui/doctest/force-target-feature.stdout
@@ -0,0 +1,27 @@
+
+running 1 test
+test $DIR/force-target-feature.rs - SomeStruct (line 11) ... FAILED
+
+failures:
+
+---- $DIR/force-target-feature.rs - SomeStruct (line 11) stdout ----
+Test executable failed (exit status: 101).
+
+stderr:
+
+thread 'main' ($TID) panicked at $DIR/force-target-feature.rs:3:1:
+oh no
+stack backtrace:
+   0: std::panicking::begin_panic::<&str>
+   1: rust_out::main::$PATH
+   2: rust_out::main
+   3: <fn() as core::ops::function::FnOnce<()>>::call_once
+note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.
+
+
+
+failures:
+    $DIR/force-target-feature.rs - SomeStruct (line 11)
+
+test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/rustdoc-html/ice-type-error-19181.rs b/tests/rustdoc-ui/doctest/ice-type-error-19181.rs
similarity index 65%
rename from tests/rustdoc-html/ice-type-error-19181.rs
rename to tests/rustdoc-ui/doctest/ice-type-error-19181.rs
index 02c6404762222..accb9e2cab1f4 100644
--- a/tests/rustdoc-html/ice-type-error-19181.rs
+++ b/tests/rustdoc-ui/doctest/ice-type-error-19181.rs
@@ -1,4 +1,7 @@
 //@ compile-flags:--test
+//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
+//@ check-pass
+
 // https://github.com/rust-lang/rust/issues/19181
 
 // rustdoc should not panic when target crate has compilation errors
diff --git a/tests/rustdoc-ui/doctest/ice-type-error-19181.stdout b/tests/rustdoc-ui/doctest/ice-type-error-19181.stdout
new file mode 100644
index 0000000000000..7326c0a25a069
--- /dev/null
+++ b/tests/rustdoc-ui/doctest/ice-type-error-19181.stdout
@@ -0,0 +1,5 @@
+
+running 0 tests
+
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/rustdoc-html/no-run-still-checks-lints.rs b/tests/rustdoc-ui/doctest/no-run-still-checks-lints.rs
similarity index 55%
rename from tests/rustdoc-html/no-run-still-checks-lints.rs
rename to tests/rustdoc-ui/doctest/no-run-still-checks-lints.rs
index 73e311b72d5e5..cae6331f4723d 100644
--- a/tests/rustdoc-html/no-run-still-checks-lints.rs
+++ b/tests/rustdoc-ui/doctest/no-run-still-checks-lints.rs
@@ -1,5 +1,6 @@
 //@ compile-flags:--test
-//@ should-fail
+//@ failure-status: 101
+//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
 
 #![doc(test(attr(deny(warnings))))]
 
diff --git a/tests/rustdoc-ui/doctest/no-run-still-checks-lints.stdout b/tests/rustdoc-ui/doctest/no-run-still-checks-lints.stdout
new file mode 100644
index 0000000000000..86d1b4d3094b6
--- /dev/null
+++ b/tests/rustdoc-ui/doctest/no-run-still-checks-lints.stdout
@@ -0,0 +1,29 @@
+
+running 1 test
+test $DIR/no-run-still-checks-lints.rs - foo (line 7) - compile ... FAILED
+
+failures:
+
+---- $DIR/no-run-still-checks-lints.rs - foo (line 7) stdout ----
+error: unused variable: `a`
+  --> $DIR/no-run-still-checks-lints.rs:8:5
+   |
+LL | let a = 3;
+   |     ^ help: if this is intentional, prefix it with an underscore: `_a`
+   |
+note: the lint level is defined here
+  --> $DIR/no-run-still-checks-lints.rs:6:9
+   |
+LL | #![deny(warnings)]
+   |         ^^^^^^^^
+   = note: `#[deny(unused_variables)]` implied by `#[deny(warnings)]`
+
+error: aborting due to 1 previous error
+
+Couldn't compile the test.
+
+failures:
+    $DIR/no-run-still-checks-lints.rs - foo (line 7)
+
+test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/rustdoc-html/process-termination.rs b/tests/rustdoc-ui/doctest/process-termination.rs
similarity index 80%
rename from tests/rustdoc-html/process-termination.rs
rename to tests/rustdoc-ui/doctest/process-termination.rs
index 73a86e57424a2..02ac594b3f0d4 100644
--- a/tests/rustdoc-html/process-termination.rs
+++ b/tests/rustdoc-ui/doctest/process-termination.rs
@@ -1,4 +1,6 @@
-//@ compile-flags:--test
+//@ compile-flags:--test --test-args=--test-threads=1
+//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
+//@ check-pass
 
 /// A check of using various process termination strategies
 ///
diff --git a/tests/rustdoc-ui/doctest/process-termination.stdout b/tests/rustdoc-ui/doctest/process-termination.stdout
new file mode 100644
index 0000000000000..3e15b9a5df80a
--- /dev/null
+++ b/tests/rustdoc-ui/doctest/process-termination.stdout
@@ -0,0 +1,8 @@
+
+running 3 tests
+test $DIR/process-termination.rs - check_process_termination (line 16) ... ok
+test $DIR/process-termination.rs - check_process_termination (line 22) ... ok
+test $DIR/process-termination.rs - check_process_termination (line 9) ... ok
+
+test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/rustdoc-html/sanitizer-option.rs b/tests/rustdoc-ui/doctest/sanitizer-option.rs
similarity index 86%
rename from tests/rustdoc-html/sanitizer-option.rs
rename to tests/rustdoc-ui/doctest/sanitizer-option.rs
index 7b0038138f09f..5f29f1b8bac7e 100644
--- a/tests/rustdoc-html/sanitizer-option.rs
+++ b/tests/rustdoc-ui/doctest/sanitizer-option.rs
@@ -1,7 +1,9 @@
 //@ needs-sanitizer-support
 //@ needs-sanitizer-address
 //@ compile-flags: --test -Z sanitizer=address -C unsafe-allow-abi-mismatch=sanitizer
-//
+//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
+//@ check-pass
+
 // #43031: Verify that rustdoc passes `-Z` options to rustc. Use an extern
 // function that is provided by the sanitizer runtime, if flag is not passed
 // correctly, then linking will fail.
diff --git a/tests/rustdoc-ui/doctest/sanitizer-option.stdout b/tests/rustdoc-ui/doctest/sanitizer-option.stdout
new file mode 100644
index 0000000000000..62040048335f2
--- /dev/null
+++ b/tests/rustdoc-ui/doctest/sanitizer-option.stdout
@@ -0,0 +1,6 @@
+
+running 1 test
+test $DIR/sanitizer-option.rs - z_flag_is_passed_to_rustc (line 11) ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/rustdoc-html/test_option_check/test.rs b/tests/rustdoc-ui/doctest/test-option-check-2.rs
similarity index 54%
rename from tests/rustdoc-html/test_option_check/test.rs
rename to tests/rustdoc-ui/doctest/test-option-check-2.rs
index af7a5827690f0..2e74da1eca794 100644
--- a/tests/rustdoc-html/test_option_check/test.rs
+++ b/tests/rustdoc-ui/doctest/test-option-check-2.rs
@@ -1,6 +1,9 @@
-//@ compile-flags: --test
+//@ compile-flags: --test --test-args=--test-threads=1
 //@ check-test-line-numbers-match
+//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
+//@ check-pass
 
+#[path = "test-option-check.rs"]
 pub mod bar;
 
 /// This is a Foo;
diff --git a/tests/rustdoc-ui/doctest/test-option-check-2.stdout b/tests/rustdoc-ui/doctest/test-option-check-2.stdout
new file mode 100644
index 0000000000000..ab2db4938dfab
--- /dev/null
+++ b/tests/rustdoc-ui/doctest/test-option-check-2.stdout
@@ -0,0 +1,8 @@
+
+running 3 tests
+test $DIR/test-option-check-2.rs - Bar (line 18) ... ok
+test $DIR/test-option-check-2.rs - Foo (line 11) ... ok
+test $DIR/test-option-check.rs - bar::foooo (line 8) ... ok
+
+test result: ok. 3 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/rustdoc-html/test_option_check/bar.rs b/tests/rustdoc-ui/doctest/test-option-check.rs
similarity index 65%
rename from tests/rustdoc-html/test_option_check/bar.rs
rename to tests/rustdoc-ui/doctest/test-option-check.rs
index 7c2309a79d4b9..e5d3350e3f981 100644
--- a/tests/rustdoc-html/test_option_check/bar.rs
+++ b/tests/rustdoc-ui/doctest/test-option-check.rs
@@ -1,5 +1,7 @@
 //@ compile-flags: --test
 //@ check-test-line-numbers-match
+//@ normalize-stdout: "finished in \d+\.\d+s" -> "finished in $$TIME"
+//@ check-pass
 
 /// This looks like another awesome test!
 ///
diff --git a/tests/rustdoc-ui/doctest/test-option-check.stdout b/tests/rustdoc-ui/doctest/test-option-check.stdout
new file mode 100644
index 0000000000000..38f949612a47a
--- /dev/null
+++ b/tests/rustdoc-ui/doctest/test-option-check.stdout
@@ -0,0 +1,6 @@
+
+running 1 test
+test $DIR/test-option-check.rs - foooo (line 8) ... ok
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in $TIME
+
diff --git a/tests/rustdoc-ui/lints/renamed-lint-still-applies.rs b/tests/rustdoc-ui/lints/renamed-lint-still-applies.rs
deleted file mode 100644
index a4d3a4b497117..0000000000000
--- a/tests/rustdoc-ui/lints/renamed-lint-still-applies.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-// compile-args: --crate-type lib
-#![deny(broken_intra_doc_links)]
-//~^ WARNING renamed to `rustdoc::broken_intra_doc_links`
-//! [x]
-//~^ ERROR unresolved link
-
-#![deny(rustdoc::non_autolinks)]
-//~^ WARNING renamed to `rustdoc::bare_urls`
-//! http://example.com
-//~^ ERROR not a hyperlink
diff --git a/tests/rustdoc-ui/lints/renamed-lint-still-applies.stderr b/tests/rustdoc-ui/lints/renamed-lint-still-applies.stderr
index 88807dfb495d0..f4428ff6e5983 100644
--- a/tests/rustdoc-ui/lints/renamed-lint-still-applies.stderr
+++ b/tests/rustdoc-ui/lints/renamed-lint-still-applies.stderr
@@ -1,5 +1,5 @@
 warning: lint `broken_intra_doc_links` has been renamed to `rustdoc::broken_intra_doc_links`
-  --> $DIR/renamed-lint-still-applies.rs:2:9
+  --> $DIR/renamed-lint-still-applies.rs:3:9
    |
 LL | #![deny(broken_intra_doc_links)]
    |         ^^^^^^^^^^^^^^^^^^^^^^ help: use the new name: `rustdoc::broken_intra_doc_links`
@@ -7,33 +7,33 @@ LL | #![deny(broken_intra_doc_links)]
    = note: `#[warn(renamed_and_removed_lints)]` on by default
 
 warning: lint `rustdoc::non_autolinks` has been renamed to `rustdoc::bare_urls`
-  --> $DIR/renamed-lint-still-applies.rs:7:9
+  --> $DIR/renamed-lint-still-applies.rs:8:9
    |
 LL | #![deny(rustdoc::non_autolinks)]
    |         ^^^^^^^^^^^^^^^^^^^^^^ help: use the new name: `rustdoc::bare_urls`
 
 error: unresolved link to `x`
-  --> $DIR/renamed-lint-still-applies.rs:4:6
+  --> $DIR/renamed-lint-still-applies.rs:5:6
    |
 LL | //! [x]
    |      ^ no item named `x` in scope
    |
    = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]`
 note: the lint level is defined here
-  --> $DIR/renamed-lint-still-applies.rs:2:9
+  --> $DIR/renamed-lint-still-applies.rs:3:9
    |
 LL | #![deny(broken_intra_doc_links)]
    |         ^^^^^^^^^^^^^^^^^^^^^^
 
 error: this URL is not a hyperlink
-  --> $DIR/renamed-lint-still-applies.rs:9:5
+  --> $DIR/renamed-lint-still-applies.rs:10:5
    |
 LL | //! http://example.com
    |     ^^^^^^^^^^^^^^^^^^
    |
    = note: bare URLs are not automatically turned into clickable links
 note: the lint level is defined here
-  --> $DIR/renamed-lint-still-applies.rs:7:9
+  --> $DIR/renamed-lint-still-applies.rs:8:9
    |
 LL | #![deny(rustdoc::non_autolinks)]
    |         ^^^^^^^^^^^^^^^^^^^^^^
diff --git a/tests/ui/lint/forbid-error-capped.rs b/tests/ui/lint/forbid-error-capped.rs
index e458ddf90746e..bfa72beac5828 100644
--- a/tests/ui/lint/forbid-error-capped.rs
+++ b/tests/ui/lint/forbid-error-capped.rs
@@ -1,5 +1,4 @@
 //@ check-pass
-// compile-args: --cap-lints=warn -Fwarnings
 
 // This checks that the forbid attribute checking is ignored when the forbidden
 // lint is capped.
diff --git a/tests/ui/lint/forbid-error-capped.stderr b/tests/ui/lint/forbid-error-capped.stderr
index 479e7b9412d57..3de8c2fe0ce61 100644
--- a/tests/ui/lint/forbid-error-capped.stderr
+++ b/tests/ui/lint/forbid-error-capped.stderr
@@ -1,5 +1,5 @@
 warning: allow(unused) incompatible with previous forbid
-  --> $DIR/forbid-error-capped.rs:8:10
+  --> $DIR/forbid-error-capped.rs:7:10
    |
 LL | #![forbid(warnings)]
    |           -------- `forbid` level set here
@@ -14,7 +14,7 @@ warning: 1 warning emitted
 
 Future incompatibility report: Future breakage diagnostic:
 warning: allow(unused) incompatible with previous forbid
-  --> $DIR/forbid-error-capped.rs:8:10
+  --> $DIR/forbid-error-capped.rs:7:10
    |
 LL | #![forbid(warnings)]
    |           -------- `forbid` level set here
diff --git a/tests/ui/mir/issue-71793-inline-args-storage.rs b/tests/ui/mir/issue-71793-inline-args-storage.rs
index 0ed4d4723731e..38ce28a035346 100644
--- a/tests/ui/mir/issue-71793-inline-args-storage.rs
+++ b/tests/ui/mir/issue-71793-inline-args-storage.rs
@@ -1,10 +1,10 @@
 // Verifies that inliner emits StorageLive & StorageDead when introducing
 // temporaries for arguments, so that they don't become part of the coroutine.
 // Regression test for #71793.
-//
+
 //@ check-pass
 //@ edition:2018
-// compile-args: -Zmir-opt-level=3
+//@ compile-flags: -Zmir-opt-level=3
 
 #![crate_type = "lib"]