diff --git a/tests/run-make/coverage-reports/expected_show_coverage.abort.txt b/tests/run-coverage/abort.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.abort.txt
rename to tests/run-coverage/abort.coverage
diff --git a/tests/run-make/coverage/abort.rs b/tests/run-coverage/abort.rs
similarity index 100%
rename from tests/run-make/coverage/abort.rs
rename to tests/run-coverage/abort.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.assert.txt b/tests/run-coverage/assert.coverage
similarity index 97%
rename from tests/run-make/coverage-reports/expected_show_coverage.assert.txt
rename to tests/run-coverage/assert.coverage
index 405688806eaa..a7134a149e2f 100644
--- a/tests/run-make/coverage-reports/expected_show_coverage.assert.txt
+++ b/tests/run-coverage/assert.coverage
@@ -1,5 +1,5 @@
     1|       |#![allow(unused_assignments)]
-    2|       |// expect-exit-status-101
+    2|       |// failure-status: 101
     3|       |
     4|      4|fn might_fail_assert(one_plus_one: u32) {
     5|      4|    println!("does 1 + 1 = {}?", one_plus_one);
diff --git a/tests/run-make/coverage/assert.rs b/tests/run-coverage/assert.rs
similarity index 98%
rename from tests/run-make/coverage/assert.rs
rename to tests/run-coverage/assert.rs
index c85f2748eb9d..d32a37e078e4 100644
--- a/tests/run-make/coverage/assert.rs
+++ b/tests/run-coverage/assert.rs
@@ -1,5 +1,5 @@
 #![allow(unused_assignments)]
-// expect-exit-status-101
+// failure-status: 101
 
 fn might_fail_assert(one_plus_one: u32) {
     println!("does 1 + 1 = {}?", one_plus_one);
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.async.txt b/tests/run-coverage/async.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.async.txt
rename to tests/run-coverage/async.coverage
diff --git a/tests/run-make/coverage/async.rs b/tests/run-coverage/async.rs
similarity index 100%
rename from tests/run-make/coverage/async.rs
rename to tests/run-coverage/async.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.async2.txt b/tests/run-coverage/async2.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.async2.txt
rename to tests/run-coverage/async2.coverage
diff --git a/tests/run-make/coverage/async2.rs b/tests/run-coverage/async2.rs
similarity index 100%
rename from tests/run-make/coverage/async2.rs
rename to tests/run-coverage/async2.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.closure.txt b/tests/run-coverage/closure.coverage
similarity index 98%
rename from tests/run-make/coverage-reports/expected_show_coverage.closure.txt
rename to tests/run-coverage/closure.coverage
index 002ecec3b916..45d36b72e3a2 100644
--- a/tests/run-make/coverage-reports/expected_show_coverage.closure.txt
+++ b/tests/run-coverage/closure.coverage
@@ -1,6 +1,6 @@
     1|       |#![allow(unused_assignments, unused_variables)]
-    2|       |// compile-flags: -C opt-level=2 # fix described in rustc_middle/mir/mono.rs
-    3|      1|fn main() {
+    2|       |// compile-flags: -C opt-level=2
+    3|      1|fn main() { // ^^ fix described in rustc_middle/mir/mono.rs
     4|      1|    // Initialize test constants in a way that cannot be determined at compile time, to ensure
     5|      1|    // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
     6|      1|    // dependent conditions.
diff --git a/tests/run-make/coverage/closure.rs b/tests/run-coverage/closure.rs
similarity index 98%
rename from tests/run-make/coverage/closure.rs
rename to tests/run-coverage/closure.rs
index 32ec0bcdf8c9..eb3a1ebff889 100644
--- a/tests/run-make/coverage/closure.rs
+++ b/tests/run-coverage/closure.rs
@@ -1,6 +1,6 @@
 #![allow(unused_assignments, unused_variables)]
-// compile-flags: -C opt-level=2 # fix described in rustc_middle/mir/mono.rs
-fn main() {
+// compile-flags: -C opt-level=2
+fn main() { // ^^ fix described in rustc_middle/mir/mono.rs
     // Initialize test constants in a way that cannot be determined at compile time, to ensure
     // rustc and LLVM cannot optimize out statements (or coverage counters) downstream from
     // dependent conditions.
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.closure_macro.txt b/tests/run-coverage/closure_macro.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.closure_macro.txt
rename to tests/run-coverage/closure_macro.coverage
diff --git a/tests/run-make/coverage/closure_macro.rs b/tests/run-coverage/closure_macro.rs
similarity index 100%
rename from tests/run-make/coverage/closure_macro.rs
rename to tests/run-coverage/closure_macro.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.closure_macro_async.txt b/tests/run-coverage/closure_macro_async.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.closure_macro_async.txt
rename to tests/run-coverage/closure_macro_async.coverage
diff --git a/tests/run-make/coverage/closure_macro_async.rs b/tests/run-coverage/closure_macro_async.rs
similarity index 100%
rename from tests/run-make/coverage/closure_macro_async.rs
rename to tests/run-coverage/closure_macro_async.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.conditions.txt b/tests/run-coverage/conditions.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.conditions.txt
rename to tests/run-coverage/conditions.coverage
diff --git a/tests/run-make/coverage/conditions.rs b/tests/run-coverage/conditions.rs
similarity index 100%
rename from tests/run-make/coverage/conditions.rs
rename to tests/run-coverage/conditions.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.continue.txt b/tests/run-coverage/continue.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.continue.txt
rename to tests/run-coverage/continue.coverage
diff --git a/tests/run-make/coverage/continue.rs b/tests/run-coverage/continue.rs
similarity index 100%
rename from tests/run-make/coverage/continue.rs
rename to tests/run-coverage/continue.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.dead_code.txt b/tests/run-coverage/dead_code.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.dead_code.txt
rename to tests/run-coverage/dead_code.coverage
diff --git a/tests/run-make/coverage/dead_code.rs b/tests/run-coverage/dead_code.rs
similarity index 100%
rename from tests/run-make/coverage/dead_code.rs
rename to tests/run-coverage/dead_code.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.drop_trait.txt b/tests/run-coverage/drop_trait.coverage
similarity index 96%
rename from tests/run-make/coverage-reports/expected_show_coverage.drop_trait.txt
rename to tests/run-coverage/drop_trait.coverage
index fe6a9e93cbf7..293001e9590e 100644
--- a/tests/run-make/coverage-reports/expected_show_coverage.drop_trait.txt
+++ b/tests/run-coverage/drop_trait.coverage
@@ -1,5 +1,5 @@
     1|       |#![allow(unused_assignments)]
-    2|       |// expect-exit-status-1
+    2|       |// failure-status: 1
     3|       |
     4|       |struct Firework {
     5|       |    strength: i32,
diff --git a/tests/run-make/coverage/drop_trait.rs b/tests/run-coverage/drop_trait.rs
similarity index 95%
rename from tests/run-make/coverage/drop_trait.rs
rename to tests/run-coverage/drop_trait.rs
index d15bfc0f8771..a9b5d1d1e7fe 100644
--- a/tests/run-make/coverage/drop_trait.rs
+++ b/tests/run-coverage/drop_trait.rs
@@ -1,5 +1,5 @@
 #![allow(unused_assignments)]
-// expect-exit-status-1
+// failure-status: 1
 
 struct Firework {
     strength: i32,
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.generator.txt b/tests/run-coverage/generator.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.generator.txt
rename to tests/run-coverage/generator.coverage
diff --git a/tests/run-make/coverage/generator.rs b/tests/run-coverage/generator.rs
similarity index 100%
rename from tests/run-make/coverage/generator.rs
rename to tests/run-coverage/generator.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.generics.txt b/tests/run-coverage/generics.coverage
similarity index 98%
rename from tests/run-make/coverage-reports/expected_show_coverage.generics.txt
rename to tests/run-coverage/generics.coverage
index 7eb33a29a926..7a7649674cac 100644
--- a/tests/run-make/coverage-reports/expected_show_coverage.generics.txt
+++ b/tests/run-coverage/generics.coverage
@@ -1,5 +1,5 @@
     1|       |#![allow(unused_assignments)]
-    2|       |// expect-exit-status-1
+    2|       |// failure-status: 1
     3|       |
     4|       |struct Firework<T> where T: Copy + std::fmt::Display {
     5|       |    strength: T,
diff --git a/tests/run-make/coverage/generics.rs b/tests/run-coverage/generics.rs
similarity index 97%
rename from tests/run-make/coverage/generics.rs
rename to tests/run-coverage/generics.rs
index 18b38868496d..150ffb9db395 100644
--- a/tests/run-make/coverage/generics.rs
+++ b/tests/run-coverage/generics.rs
@@ -1,5 +1,5 @@
 #![allow(unused_assignments)]
-// expect-exit-status-1
+// failure-status: 1
 
 struct Firework<T> where T: Copy + std::fmt::Display {
     strength: T,
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.if.txt b/tests/run-coverage/if.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.if.txt
rename to tests/run-coverage/if.coverage
diff --git a/tests/run-make/coverage/if.rs b/tests/run-coverage/if.rs
similarity index 100%
rename from tests/run-make/coverage/if.rs
rename to tests/run-coverage/if.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.if_else.txt b/tests/run-coverage/if_else.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.if_else.txt
rename to tests/run-coverage/if_else.coverage
diff --git a/tests/run-make/coverage/if_else.rs b/tests/run-coverage/if_else.rs
similarity index 100%
rename from tests/run-make/coverage/if_else.rs
rename to tests/run-coverage/if_else.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.inline-dead.txt b/tests/run-coverage/inline-dead.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.inline-dead.txt
rename to tests/run-coverage/inline-dead.coverage
diff --git a/tests/run-make/coverage/inline-dead.rs b/tests/run-coverage/inline-dead.rs
similarity index 100%
rename from tests/run-make/coverage/inline-dead.rs
rename to tests/run-coverage/inline-dead.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.inline.txt b/tests/run-coverage/inline.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.inline.txt
rename to tests/run-coverage/inline.coverage
diff --git a/tests/run-make/coverage/inline.rs b/tests/run-coverage/inline.rs
similarity index 100%
rename from tests/run-make/coverage/inline.rs
rename to tests/run-coverage/inline.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.inner_items.txt b/tests/run-coverage/inner_items.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.inner_items.txt
rename to tests/run-coverage/inner_items.coverage
diff --git a/tests/run-make/coverage/inner_items.rs b/tests/run-coverage/inner_items.rs
similarity index 100%
rename from tests/run-make/coverage/inner_items.rs
rename to tests/run-coverage/inner_items.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.issue-83601.txt b/tests/run-coverage/issue-83601.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.issue-83601.txt
rename to tests/run-coverage/issue-83601.coverage
diff --git a/tests/run-make/coverage/issue-83601.rs b/tests/run-coverage/issue-83601.rs
similarity index 100%
rename from tests/run-make/coverage/issue-83601.rs
rename to tests/run-coverage/issue-83601.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.issue-84561.txt b/tests/run-coverage/issue-84561.coverage
similarity index 99%
rename from tests/run-make/coverage-reports/expected_show_coverage.issue-84561.txt
rename to tests/run-coverage/issue-84561.coverage
index 4a60432c14c1..7a97e353245a 100644
--- a/tests/run-make/coverage-reports/expected_show_coverage.issue-84561.txt
+++ b/tests/run-coverage/issue-84561.coverage
@@ -1,6 +1,6 @@
     1|       |// This demonstrated Issue #84561: function-like macros produce unintuitive coverage results.
     2|       |
-    3|       |// expect-exit-status-101
+    3|       |// failure-status: 101
     4|     21|#[derive(PartialEq, Eq)]
     5|       |struct Foo(u32);
     6|      1|fn test3() {
diff --git a/tests/run-make/coverage/issue-84561.rs b/tests/run-coverage/issue-84561.rs
similarity index 99%
rename from tests/run-make/coverage/issue-84561.rs
rename to tests/run-coverage/issue-84561.rs
index b39a289c45e2..facf5b5b4cfb 100644
--- a/tests/run-make/coverage/issue-84561.rs
+++ b/tests/run-coverage/issue-84561.rs
@@ -1,6 +1,6 @@
 // This demonstrated Issue #84561: function-like macros produce unintuitive coverage results.
 
-// expect-exit-status-101
+// failure-status: 101
 #[derive(PartialEq, Eq)]
 struct Foo(u32);
 fn test3() {
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.issue-93054.txt b/tests/run-coverage/issue-93054.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.issue-93054.txt
rename to tests/run-coverage/issue-93054.coverage
diff --git a/tests/run-make/coverage/issue-93054.rs b/tests/run-coverage/issue-93054.rs
similarity index 100%
rename from tests/run-make/coverage/issue-93054.rs
rename to tests/run-coverage/issue-93054.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.lazy_boolean.txt b/tests/run-coverage/lazy_boolean.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.lazy_boolean.txt
rename to tests/run-coverage/lazy_boolean.coverage
diff --git a/tests/run-make/coverage/lazy_boolean.rs b/tests/run-coverage/lazy_boolean.rs
similarity index 100%
rename from tests/run-make/coverage/lazy_boolean.rs
rename to tests/run-coverage/lazy_boolean.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.loop_break_value.txt b/tests/run-coverage/loop_break_value.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.loop_break_value.txt
rename to tests/run-coverage/loop_break_value.coverage
diff --git a/tests/run-make/coverage/loop_break_value.rs b/tests/run-coverage/loop_break_value.rs
similarity index 100%
rename from tests/run-make/coverage/loop_break_value.rs
rename to tests/run-coverage/loop_break_value.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.loops_branches.txt b/tests/run-coverage/loops_branches.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.loops_branches.txt
rename to tests/run-coverage/loops_branches.coverage
diff --git a/tests/run-make/coverage/loops_branches.rs b/tests/run-coverage/loops_branches.rs
similarity index 100%
rename from tests/run-make/coverage/loops_branches.rs
rename to tests/run-coverage/loops_branches.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.match_or_pattern.txt b/tests/run-coverage/match_or_pattern.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.match_or_pattern.txt
rename to tests/run-coverage/match_or_pattern.coverage
diff --git a/tests/run-make/coverage/match_or_pattern.rs b/tests/run-coverage/match_or_pattern.rs
similarity index 100%
rename from tests/run-make/coverage/match_or_pattern.rs
rename to tests/run-coverage/match_or_pattern.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.nested_loops.txt b/tests/run-coverage/nested_loops.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.nested_loops.txt
rename to tests/run-coverage/nested_loops.coverage
diff --git a/tests/run-make/coverage/nested_loops.rs b/tests/run-coverage/nested_loops.rs
similarity index 100%
rename from tests/run-make/coverage/nested_loops.rs
rename to tests/run-coverage/nested_loops.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.no_cov_crate.txt b/tests/run-coverage/no_cov_crate.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.no_cov_crate.txt
rename to tests/run-coverage/no_cov_crate.coverage
diff --git a/tests/run-make/coverage/no_cov_crate.rs b/tests/run-coverage/no_cov_crate.rs
similarity index 100%
rename from tests/run-make/coverage/no_cov_crate.rs
rename to tests/run-coverage/no_cov_crate.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.overflow.txt b/tests/run-coverage/overflow.coverage
similarity index 99%
rename from tests/run-make/coverage-reports/expected_show_coverage.overflow.txt
rename to tests/run-coverage/overflow.coverage
index 25e822bffd11..95043759166b 100644
--- a/tests/run-make/coverage-reports/expected_show_coverage.overflow.txt
+++ b/tests/run-coverage/overflow.coverage
@@ -1,5 +1,5 @@
     1|       |#![allow(unused_assignments)]
-    2|       |// expect-exit-status-101
+    2|       |// failure-status: 101
     3|       |
     4|      4|fn might_overflow(to_add: u32) -> u32 {
     5|      4|    if to_add > 5 {
diff --git a/tests/run-make/coverage/overflow.rs b/tests/run-coverage/overflow.rs
similarity index 99%
rename from tests/run-make/coverage/overflow.rs
rename to tests/run-coverage/overflow.rs
index e537b0e95c32..7df8de6f3cd1 100644
--- a/tests/run-make/coverage/overflow.rs
+++ b/tests/run-coverage/overflow.rs
@@ -1,5 +1,5 @@
 #![allow(unused_assignments)]
-// expect-exit-status-101
+// failure-status: 101
 
 fn might_overflow(to_add: u32) -> u32 {
     if to_add > 5 {
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.panic_unwind.txt b/tests/run-coverage/panic_unwind.coverage
similarity index 96%
rename from tests/run-make/coverage-reports/expected_show_coverage.panic_unwind.txt
rename to tests/run-coverage/panic_unwind.coverage
index 114507dc9fd2..58b9ba448eea 100644
--- a/tests/run-make/coverage-reports/expected_show_coverage.panic_unwind.txt
+++ b/tests/run-coverage/panic_unwind.coverage
@@ -1,5 +1,5 @@
     1|       |#![allow(unused_assignments)]
-    2|       |// expect-exit-status-101
+    2|       |// failure-status: 101
     3|       |
     4|      4|fn might_panic(should_panic: bool) {
     5|      4|    if should_panic {
diff --git a/tests/run-make/coverage/panic_unwind.rs b/tests/run-coverage/panic_unwind.rs
similarity index 96%
rename from tests/run-make/coverage/panic_unwind.rs
rename to tests/run-coverage/panic_unwind.rs
index 03128c2cce62..638d2eb6aaaf 100644
--- a/tests/run-make/coverage/panic_unwind.rs
+++ b/tests/run-coverage/panic_unwind.rs
@@ -1,5 +1,5 @@
 #![allow(unused_assignments)]
-// expect-exit-status-101
+// failure-status: 101
 
 fn might_panic(should_panic: bool) {
     if should_panic {
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.partial_eq.txt b/tests/run-coverage/partial_eq.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.partial_eq.txt
rename to tests/run-coverage/partial_eq.coverage
diff --git a/tests/run-make/coverage/partial_eq.rs b/tests/run-coverage/partial_eq.rs
similarity index 100%
rename from tests/run-make/coverage/partial_eq.rs
rename to tests/run-coverage/partial_eq.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.simple_loop.txt b/tests/run-coverage/simple_loop.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.simple_loop.txt
rename to tests/run-coverage/simple_loop.coverage
diff --git a/tests/run-make/coverage/simple_loop.rs b/tests/run-coverage/simple_loop.rs
similarity index 100%
rename from tests/run-make/coverage/simple_loop.rs
rename to tests/run-coverage/simple_loop.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.simple_match.txt b/tests/run-coverage/simple_match.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.simple_match.txt
rename to tests/run-coverage/simple_match.coverage
diff --git a/tests/run-make/coverage/simple_match.rs b/tests/run-coverage/simple_match.rs
similarity index 100%
rename from tests/run-make/coverage/simple_match.rs
rename to tests/run-coverage/simple_match.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.sort_groups.txt b/tests/run-coverage/sort_groups.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.sort_groups.txt
rename to tests/run-coverage/sort_groups.coverage
diff --git a/tests/run-make/coverage/sort_groups.rs b/tests/run-coverage/sort_groups.rs
similarity index 100%
rename from tests/run-make/coverage/sort_groups.rs
rename to tests/run-coverage/sort_groups.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.test_harness.txt b/tests/run-coverage/test_harness.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.test_harness.txt
rename to tests/run-coverage/test_harness.coverage
diff --git a/tests/run-make/coverage/test_harness.rs b/tests/run-coverage/test_harness.rs
similarity index 100%
rename from tests/run-make/coverage/test_harness.rs
rename to tests/run-coverage/test_harness.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.tight_inf_loop.txt b/tests/run-coverage/tight_inf_loop.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.tight_inf_loop.txt
rename to tests/run-coverage/tight_inf_loop.coverage
diff --git a/tests/run-make/coverage/tight_inf_loop.rs b/tests/run-coverage/tight_inf_loop.rs
similarity index 100%
rename from tests/run-make/coverage/tight_inf_loop.rs
rename to tests/run-coverage/tight_inf_loop.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.try_error_result.txt b/tests/run-coverage/try_error_result.coverage
similarity index 99%
rename from tests/run-make/coverage-reports/expected_show_coverage.try_error_result.txt
rename to tests/run-coverage/try_error_result.coverage
index 0ad0180b7614..efe573a5607d 100644
--- a/tests/run-make/coverage-reports/expected_show_coverage.try_error_result.txt
+++ b/tests/run-coverage/try_error_result.coverage
@@ -1,5 +1,5 @@
     1|       |#![allow(unused_assignments)]
-    2|       |// expect-exit-status-1
+    2|       |// failure-status: 1
     3|       |
     4|      6|fn call(return_error: bool) -> Result<(),()> {
     5|      6|    if return_error {
diff --git a/tests/run-make/coverage/try_error_result.rs b/tests/run-coverage/try_error_result.rs
similarity index 99%
rename from tests/run-make/coverage/try_error_result.rs
rename to tests/run-coverage/try_error_result.rs
index cd0acf723022..9eb1d2db218b 100644
--- a/tests/run-make/coverage/try_error_result.rs
+++ b/tests/run-coverage/try_error_result.rs
@@ -1,5 +1,5 @@
 #![allow(unused_assignments)]
-// expect-exit-status-1
+// failure-status: 1
 
 fn call(return_error: bool) -> Result<(),()> {
     if return_error {
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.unused.txt b/tests/run-coverage/unused.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.unused.txt
rename to tests/run-coverage/unused.coverage
diff --git a/tests/run-make/coverage/unused.rs b/tests/run-coverage/unused.rs
similarity index 100%
rename from tests/run-make/coverage/unused.rs
rename to tests/run-coverage/unused.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.while.txt b/tests/run-coverage/while.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.while.txt
rename to tests/run-coverage/while.coverage
diff --git a/tests/run-make/coverage/while.rs b/tests/run-coverage/while.rs
similarity index 100%
rename from tests/run-make/coverage/while.rs
rename to tests/run-coverage/while.rs
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.while_early_ret.txt b/tests/run-coverage/while_early_ret.coverage
similarity index 97%
rename from tests/run-make/coverage-reports/expected_show_coverage.while_early_ret.txt
rename to tests/run-coverage/while_early_ret.coverage
index d19afc0de61d..2ce94e0131d1 100644
--- a/tests/run-make/coverage-reports/expected_show_coverage.while_early_ret.txt
+++ b/tests/run-coverage/while_early_ret.coverage
@@ -1,5 +1,5 @@
     1|       |#![allow(unused_assignments)]
-    2|       |// expect-exit-status-1
+    2|       |// failure-status: 1
     3|       |
     4|      1|fn main() -> Result<(),u8> {
     5|      1|    let mut countdown = 10;
diff --git a/tests/run-make/coverage/while_early_ret.rs b/tests/run-coverage/while_early_ret.rs
similarity index 97%
rename from tests/run-make/coverage/while_early_ret.rs
rename to tests/run-coverage/while_early_ret.rs
index 1fcea9c85c44..1c83c8fc7a8f 100644
--- a/tests/run-make/coverage/while_early_ret.rs
+++ b/tests/run-coverage/while_early_ret.rs
@@ -1,5 +1,5 @@
 #![allow(unused_assignments)]
-// expect-exit-status-1
+// failure-status: 1
 
 fn main() -> Result<(),u8> {
     let mut countdown = 10;
diff --git a/tests/run-make/coverage-reports/expected_show_coverage.yield.txt b/tests/run-coverage/yield.coverage
similarity index 100%
rename from tests/run-make/coverage-reports/expected_show_coverage.yield.txt
rename to tests/run-coverage/yield.coverage
diff --git a/tests/run-make/coverage/yield.rs b/tests/run-coverage/yield.rs
similarity index 100%
rename from tests/run-make/coverage/yield.rs
rename to tests/run-coverage/yield.rs
diff --git a/tests/run-make/coverage-reports/Makefile b/tests/run-make/coverage-reports/Makefile
index 0ae409c4119e..283b89edaf02 100644
--- a/tests/run-make/coverage-reports/Makefile
+++ b/tests/run-make/coverage-reports/Makefile
@@ -1,3 +1,7 @@
+# NOTE: Most of the tests previously associated with this makefile have been
+# migrated over to the custom `run-coverage` test suite instead, so only a few
+# harder-to-port tests remain here.
+
 # needs-profiler-support
 # ignore-windows-gnu