diff --git a/tests/coverage-map/README.md b/tests/coverage-map/README.md
index 60d1352cd64f1..146fbff5b204d 100644
--- a/tests/coverage-map/README.md
+++ b/tests/coverage-map/README.md
@@ -1,4 +1,4 @@
-The tests in `./status-quo` were copied from `tests/run-coverage` in order to
+Many of these tests were copied from `tests/run-coverage` in order to
 capture the current behavior of the instrumentor on non-trivial programs.
 The actual mappings have not been closely inspected.
 
diff --git a/tests/coverage-map/status-quo/abort.cov-map b/tests/coverage-map/abort.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/abort.cov-map
rename to tests/coverage-map/abort.cov-map
diff --git a/tests/coverage-map/status-quo/abort.rs b/tests/coverage-map/abort.rs
similarity index 100%
rename from tests/coverage-map/status-quo/abort.rs
rename to tests/coverage-map/abort.rs
diff --git a/tests/coverage-map/status-quo/assert.cov-map b/tests/coverage-map/assert.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/assert.cov-map
rename to tests/coverage-map/assert.cov-map
diff --git a/tests/coverage-map/status-quo/assert.rs b/tests/coverage-map/assert.rs
similarity index 100%
rename from tests/coverage-map/status-quo/assert.rs
rename to tests/coverage-map/assert.rs
diff --git a/tests/coverage-map/status-quo/async.cov-map b/tests/coverage-map/async.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/async.cov-map
rename to tests/coverage-map/async.cov-map
diff --git a/tests/coverage-map/status-quo/async.rs b/tests/coverage-map/async.rs
similarity index 100%
rename from tests/coverage-map/status-quo/async.rs
rename to tests/coverage-map/async.rs
diff --git a/tests/coverage-map/status-quo/async2.cov-map b/tests/coverage-map/async2.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/async2.cov-map
rename to tests/coverage-map/async2.cov-map
diff --git a/tests/coverage-map/status-quo/async2.rs b/tests/coverage-map/async2.rs
similarity index 100%
rename from tests/coverage-map/status-quo/async2.rs
rename to tests/coverage-map/async2.rs
diff --git a/tests/coverage-map/status-quo/bad_counter_ids.cov-map b/tests/coverage-map/bad_counter_ids.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/bad_counter_ids.cov-map
rename to tests/coverage-map/bad_counter_ids.cov-map
diff --git a/tests/coverage-map/status-quo/bad_counter_ids.rs b/tests/coverage-map/bad_counter_ids.rs
similarity index 100%
rename from tests/coverage-map/status-quo/bad_counter_ids.rs
rename to tests/coverage-map/bad_counter_ids.rs
diff --git a/tests/coverage-map/status-quo/closure.cov-map b/tests/coverage-map/closure.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/closure.cov-map
rename to tests/coverage-map/closure.cov-map
diff --git a/tests/coverage-map/status-quo/closure.rs b/tests/coverage-map/closure.rs
similarity index 100%
rename from tests/coverage-map/status-quo/closure.rs
rename to tests/coverage-map/closure.rs
diff --git a/tests/coverage-map/status-quo/closure_bug.cov-map b/tests/coverage-map/closure_bug.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/closure_bug.cov-map
rename to tests/coverage-map/closure_bug.cov-map
diff --git a/tests/coverage-map/status-quo/closure_bug.rs b/tests/coverage-map/closure_bug.rs
similarity index 100%
rename from tests/coverage-map/status-quo/closure_bug.rs
rename to tests/coverage-map/closure_bug.rs
diff --git a/tests/coverage-map/status-quo/closure_macro.cov-map b/tests/coverage-map/closure_macro.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/closure_macro.cov-map
rename to tests/coverage-map/closure_macro.cov-map
diff --git a/tests/coverage-map/status-quo/closure_macro.rs b/tests/coverage-map/closure_macro.rs
similarity index 100%
rename from tests/coverage-map/status-quo/closure_macro.rs
rename to tests/coverage-map/closure_macro.rs
diff --git a/tests/coverage-map/status-quo/closure_macro_async.cov-map b/tests/coverage-map/closure_macro_async.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/closure_macro_async.cov-map
rename to tests/coverage-map/closure_macro_async.cov-map
diff --git a/tests/coverage-map/status-quo/closure_macro_async.rs b/tests/coverage-map/closure_macro_async.rs
similarity index 100%
rename from tests/coverage-map/status-quo/closure_macro_async.rs
rename to tests/coverage-map/closure_macro_async.rs
diff --git a/tests/coverage-map/status-quo/conditions.cov-map b/tests/coverage-map/conditions.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/conditions.cov-map
rename to tests/coverage-map/conditions.cov-map
diff --git a/tests/coverage-map/status-quo/conditions.rs b/tests/coverage-map/conditions.rs
similarity index 100%
rename from tests/coverage-map/status-quo/conditions.rs
rename to tests/coverage-map/conditions.rs
diff --git a/tests/coverage-map/status-quo/continue.cov-map b/tests/coverage-map/continue.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/continue.cov-map
rename to tests/coverage-map/continue.cov-map
diff --git a/tests/coverage-map/status-quo/continue.rs b/tests/coverage-map/continue.rs
similarity index 100%
rename from tests/coverage-map/status-quo/continue.rs
rename to tests/coverage-map/continue.rs
diff --git a/tests/coverage-map/status-quo/coroutine.cov-map b/tests/coverage-map/coroutine.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/coroutine.cov-map
rename to tests/coverage-map/coroutine.cov-map
diff --git a/tests/coverage-map/status-quo/coroutine.rs b/tests/coverage-map/coroutine.rs
similarity index 100%
rename from tests/coverage-map/status-quo/coroutine.rs
rename to tests/coverage-map/coroutine.rs
diff --git a/tests/coverage-map/status-quo/dead_code.cov-map b/tests/coverage-map/dead_code.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/dead_code.cov-map
rename to tests/coverage-map/dead_code.cov-map
diff --git a/tests/coverage-map/status-quo/dead_code.rs b/tests/coverage-map/dead_code.rs
similarity index 100%
rename from tests/coverage-map/status-quo/dead_code.rs
rename to tests/coverage-map/dead_code.rs
diff --git a/tests/coverage-map/status-quo/drop_trait.cov-map b/tests/coverage-map/drop_trait.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/drop_trait.cov-map
rename to tests/coverage-map/drop_trait.cov-map
diff --git a/tests/coverage-map/status-quo/drop_trait.rs b/tests/coverage-map/drop_trait.rs
similarity index 100%
rename from tests/coverage-map/status-quo/drop_trait.rs
rename to tests/coverage-map/drop_trait.rs
diff --git a/tests/coverage-map/status-quo/generics.cov-map b/tests/coverage-map/generics.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/generics.cov-map
rename to tests/coverage-map/generics.cov-map
diff --git a/tests/coverage-map/status-quo/generics.rs b/tests/coverage-map/generics.rs
similarity index 100%
rename from tests/coverage-map/status-quo/generics.rs
rename to tests/coverage-map/generics.rs
diff --git a/tests/coverage-map/status-quo/if.cov-map b/tests/coverage-map/if.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/if.cov-map
rename to tests/coverage-map/if.cov-map
diff --git a/tests/coverage-map/status-quo/if.rs b/tests/coverage-map/if.rs
similarity index 100%
rename from tests/coverage-map/status-quo/if.rs
rename to tests/coverage-map/if.rs
diff --git a/tests/coverage-map/status-quo/if_else.cov-map b/tests/coverage-map/if_else.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/if_else.cov-map
rename to tests/coverage-map/if_else.cov-map
diff --git a/tests/coverage-map/status-quo/if_else.rs b/tests/coverage-map/if_else.rs
similarity index 100%
rename from tests/coverage-map/status-quo/if_else.rs
rename to tests/coverage-map/if_else.rs
diff --git a/tests/coverage-map/status-quo/inline-dead.cov-map b/tests/coverage-map/inline-dead.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/inline-dead.cov-map
rename to tests/coverage-map/inline-dead.cov-map
diff --git a/tests/coverage-map/status-quo/inline-dead.rs b/tests/coverage-map/inline-dead.rs
similarity index 100%
rename from tests/coverage-map/status-quo/inline-dead.rs
rename to tests/coverage-map/inline-dead.rs
diff --git a/tests/coverage-map/status-quo/inline.cov-map b/tests/coverage-map/inline.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/inline.cov-map
rename to tests/coverage-map/inline.cov-map
diff --git a/tests/coverage-map/status-quo/inline.rs b/tests/coverage-map/inline.rs
similarity index 100%
rename from tests/coverage-map/status-quo/inline.rs
rename to tests/coverage-map/inline.rs
diff --git a/tests/coverage-map/status-quo/inner_items.cov-map b/tests/coverage-map/inner_items.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/inner_items.cov-map
rename to tests/coverage-map/inner_items.cov-map
diff --git a/tests/coverage-map/status-quo/inner_items.rs b/tests/coverage-map/inner_items.rs
similarity index 100%
rename from tests/coverage-map/status-quo/inner_items.rs
rename to tests/coverage-map/inner_items.rs
diff --git a/tests/coverage-map/status-quo/issue-83601.cov-map b/tests/coverage-map/issue-83601.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/issue-83601.cov-map
rename to tests/coverage-map/issue-83601.cov-map
diff --git a/tests/coverage-map/status-quo/issue-83601.rs b/tests/coverage-map/issue-83601.rs
similarity index 100%
rename from tests/coverage-map/status-quo/issue-83601.rs
rename to tests/coverage-map/issue-83601.rs
diff --git a/tests/coverage-map/status-quo/issue-84561.cov-map b/tests/coverage-map/issue-84561.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/issue-84561.cov-map
rename to tests/coverage-map/issue-84561.cov-map
diff --git a/tests/coverage-map/status-quo/issue-84561.rs b/tests/coverage-map/issue-84561.rs
similarity index 100%
rename from tests/coverage-map/status-quo/issue-84561.rs
rename to tests/coverage-map/issue-84561.rs
diff --git a/tests/coverage-map/status-quo/issue-93054.cov-map b/tests/coverage-map/issue-93054.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/issue-93054.cov-map
rename to tests/coverage-map/issue-93054.cov-map
diff --git a/tests/coverage-map/status-quo/issue-93054.rs b/tests/coverage-map/issue-93054.rs
similarity index 100%
rename from tests/coverage-map/status-quo/issue-93054.rs
rename to tests/coverage-map/issue-93054.rs
diff --git a/tests/coverage-map/status-quo/lazy_boolean.cov-map b/tests/coverage-map/lazy_boolean.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/lazy_boolean.cov-map
rename to tests/coverage-map/lazy_boolean.cov-map
diff --git a/tests/coverage-map/status-quo/lazy_boolean.rs b/tests/coverage-map/lazy_boolean.rs
similarity index 100%
rename from tests/coverage-map/status-quo/lazy_boolean.rs
rename to tests/coverage-map/lazy_boolean.rs
diff --git a/tests/coverage-map/status-quo/loop_break_value.cov-map b/tests/coverage-map/loop_break_value.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/loop_break_value.cov-map
rename to tests/coverage-map/loop_break_value.cov-map
diff --git a/tests/coverage-map/status-quo/loop_break_value.rs b/tests/coverage-map/loop_break_value.rs
similarity index 100%
rename from tests/coverage-map/status-quo/loop_break_value.rs
rename to tests/coverage-map/loop_break_value.rs
diff --git a/tests/coverage-map/status-quo/loops_branches.cov-map b/tests/coverage-map/loops_branches.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/loops_branches.cov-map
rename to tests/coverage-map/loops_branches.cov-map
diff --git a/tests/coverage-map/status-quo/loops_branches.rs b/tests/coverage-map/loops_branches.rs
similarity index 100%
rename from tests/coverage-map/status-quo/loops_branches.rs
rename to tests/coverage-map/loops_branches.rs
diff --git a/tests/coverage-map/status-quo/match_or_pattern.cov-map b/tests/coverage-map/match_or_pattern.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/match_or_pattern.cov-map
rename to tests/coverage-map/match_or_pattern.cov-map
diff --git a/tests/coverage-map/status-quo/match_or_pattern.rs b/tests/coverage-map/match_or_pattern.rs
similarity index 100%
rename from tests/coverage-map/status-quo/match_or_pattern.rs
rename to tests/coverage-map/match_or_pattern.rs
diff --git a/tests/coverage-map/status-quo/nested_loops.cov-map b/tests/coverage-map/nested_loops.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/nested_loops.cov-map
rename to tests/coverage-map/nested_loops.cov-map
diff --git a/tests/coverage-map/status-quo/nested_loops.rs b/tests/coverage-map/nested_loops.rs
similarity index 100%
rename from tests/coverage-map/status-quo/nested_loops.rs
rename to tests/coverage-map/nested_loops.rs
diff --git a/tests/coverage-map/status-quo/no_cov_crate.cov-map b/tests/coverage-map/no_cov_crate.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/no_cov_crate.cov-map
rename to tests/coverage-map/no_cov_crate.cov-map
diff --git a/tests/coverage-map/status-quo/no_cov_crate.rs b/tests/coverage-map/no_cov_crate.rs
similarity index 100%
rename from tests/coverage-map/status-quo/no_cov_crate.rs
rename to tests/coverage-map/no_cov_crate.rs
diff --git a/tests/coverage-map/status-quo/overflow.cov-map b/tests/coverage-map/overflow.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/overflow.cov-map
rename to tests/coverage-map/overflow.cov-map
diff --git a/tests/coverage-map/status-quo/overflow.rs b/tests/coverage-map/overflow.rs
similarity index 100%
rename from tests/coverage-map/status-quo/overflow.rs
rename to tests/coverage-map/overflow.rs
diff --git a/tests/coverage-map/status-quo/panic_unwind.cov-map b/tests/coverage-map/panic_unwind.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/panic_unwind.cov-map
rename to tests/coverage-map/panic_unwind.cov-map
diff --git a/tests/coverage-map/status-quo/panic_unwind.rs b/tests/coverage-map/panic_unwind.rs
similarity index 100%
rename from tests/coverage-map/status-quo/panic_unwind.rs
rename to tests/coverage-map/panic_unwind.rs
diff --git a/tests/coverage-map/status-quo/partial_eq.cov-map b/tests/coverage-map/partial_eq.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/partial_eq.cov-map
rename to tests/coverage-map/partial_eq.cov-map
diff --git a/tests/coverage-map/status-quo/partial_eq.rs b/tests/coverage-map/partial_eq.rs
similarity index 100%
rename from tests/coverage-map/status-quo/partial_eq.rs
rename to tests/coverage-map/partial_eq.rs
diff --git a/tests/coverage-map/status-quo/simple_loop.cov-map b/tests/coverage-map/simple_loop.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/simple_loop.cov-map
rename to tests/coverage-map/simple_loop.cov-map
diff --git a/tests/coverage-map/status-quo/simple_loop.rs b/tests/coverage-map/simple_loop.rs
similarity index 100%
rename from tests/coverage-map/status-quo/simple_loop.rs
rename to tests/coverage-map/simple_loop.rs
diff --git a/tests/coverage-map/status-quo/simple_match.cov-map b/tests/coverage-map/simple_match.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/simple_match.cov-map
rename to tests/coverage-map/simple_match.cov-map
diff --git a/tests/coverage-map/status-quo/simple_match.rs b/tests/coverage-map/simple_match.rs
similarity index 100%
rename from tests/coverage-map/status-quo/simple_match.rs
rename to tests/coverage-map/simple_match.rs
diff --git a/tests/coverage-map/status-quo/sort_groups.cov-map b/tests/coverage-map/sort_groups.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/sort_groups.cov-map
rename to tests/coverage-map/sort_groups.cov-map
diff --git a/tests/coverage-map/status-quo/sort_groups.rs b/tests/coverage-map/sort_groups.rs
similarity index 100%
rename from tests/coverage-map/status-quo/sort_groups.rs
rename to tests/coverage-map/sort_groups.rs
diff --git a/tests/coverage-map/status-quo/test_harness.cov-map b/tests/coverage-map/test_harness.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/test_harness.cov-map
rename to tests/coverage-map/test_harness.cov-map
diff --git a/tests/coverage-map/status-quo/test_harness.rs b/tests/coverage-map/test_harness.rs
similarity index 100%
rename from tests/coverage-map/status-quo/test_harness.rs
rename to tests/coverage-map/test_harness.rs
diff --git a/tests/coverage-map/status-quo/tight_inf_loop.cov-map b/tests/coverage-map/tight_inf_loop.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/tight_inf_loop.cov-map
rename to tests/coverage-map/tight_inf_loop.cov-map
diff --git a/tests/coverage-map/status-quo/tight_inf_loop.rs b/tests/coverage-map/tight_inf_loop.rs
similarity index 100%
rename from tests/coverage-map/status-quo/tight_inf_loop.rs
rename to tests/coverage-map/tight_inf_loop.rs
diff --git a/tests/coverage-map/status-quo/try_error_result.cov-map b/tests/coverage-map/try_error_result.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/try_error_result.cov-map
rename to tests/coverage-map/try_error_result.cov-map
diff --git a/tests/coverage-map/status-quo/try_error_result.rs b/tests/coverage-map/try_error_result.rs
similarity index 100%
rename from tests/coverage-map/status-quo/try_error_result.rs
rename to tests/coverage-map/try_error_result.rs
diff --git a/tests/coverage-map/status-quo/unused.cov-map b/tests/coverage-map/unused.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/unused.cov-map
rename to tests/coverage-map/unused.cov-map
diff --git a/tests/coverage-map/status-quo/unused.rs b/tests/coverage-map/unused.rs
similarity index 100%
rename from tests/coverage-map/status-quo/unused.rs
rename to tests/coverage-map/unused.rs
diff --git a/tests/coverage-map/status-quo/while.cov-map b/tests/coverage-map/while.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/while.cov-map
rename to tests/coverage-map/while.cov-map
diff --git a/tests/coverage-map/status-quo/while.rs b/tests/coverage-map/while.rs
similarity index 100%
rename from tests/coverage-map/status-quo/while.rs
rename to tests/coverage-map/while.rs
diff --git a/tests/coverage-map/status-quo/while_early_ret.cov-map b/tests/coverage-map/while_early_ret.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/while_early_ret.cov-map
rename to tests/coverage-map/while_early_ret.cov-map
diff --git a/tests/coverage-map/status-quo/while_early_ret.rs b/tests/coverage-map/while_early_ret.rs
similarity index 100%
rename from tests/coverage-map/status-quo/while_early_ret.rs
rename to tests/coverage-map/while_early_ret.rs
diff --git a/tests/coverage-map/status-quo/yield.cov-map b/tests/coverage-map/yield.cov-map
similarity index 100%
rename from tests/coverage-map/status-quo/yield.cov-map
rename to tests/coverage-map/yield.cov-map
diff --git a/tests/coverage-map/status-quo/yield.rs b/tests/coverage-map/yield.rs
similarity index 100%
rename from tests/coverage-map/status-quo/yield.rs
rename to tests/coverage-map/yield.rs