diff --git a/ci/run.bash b/ci/run.bash
index 8e44c8c8a18..3a872bd2332 100644
--- a/ci/run.bash
+++ b/ci/run.bash
@@ -61,24 +61,17 @@ build_test() {
   cmd="$1"
   shift
   download_pkg_test "${cmd}"
-  target_cargo "${cmd}" --bin rustup-init
-  target_cargo "${cmd}" --lib --all
-  if [ "build" != "${cmd}" ]; then
-    target_cargo "${cmd}" --doc --all
-  fi
-
-  if [ "build" = "${cmd}" ]; then
-    target_cargo "${cmd}" --test dist
+    if [ "build" = "${cmd}" ]; then
+    target_cargo "${cmd}" --workspace --all-targets
   else
     #  free runners have 2 or 3(mac) cores
-    target_cargo "${cmd}" --test dist -- --test-threads 2
+    target_cargo "${cmd}" --workspace --tests -- --test-threads 2
+  fi
+
+  if [ "build" != "${cmd}" ]; then
+    target_cargo "${cmd}" --doc --workspace
   fi
 
-  find tests -maxdepth 1 -type f ! -path '*/dist.rs' -name '*.rs' \
-  | sed -e 's@^tests/@@;s@\.rs$@@g' \
-  | while read -r test; do
-      target_cargo "${cmd}" --test "${test}"
-  done
 }
 
 if [ -z "$SKIP_TESTS" ]; then
diff --git a/tests/mock/clitools.rs b/tests/mock/clitools.rs
index 7f24019d3ca..79a16e4a971 100644
--- a/tests/mock/clitools.rs
+++ b/tests/mock/clitools.rs
@@ -806,24 +806,6 @@ where
     !(run || self_cmd || version || (is_update && !no_self_update))
 }
 
-#[deprecated]
-pub fn run<I, A>(config: &Config, name: &str, args: I, env: &[(&str, &str)]) -> SanitizedOutput
-where
-    I: IntoIterator<Item = A> + Clone,
-    A: AsRef<OsStr>,
-{
-    config.run(name, args, env)
-}
-
-#[deprecated]
-pub fn run_subprocess<I, A>(config: &Config, name: &str, args: I, env: &[(&str, &str)]) -> Output
-where
-    I: IntoIterator<Item = A>,
-    A: AsRef<OsStr>,
-{
-    config.run_subprocess(name, args, env)
-}
-
 #[derive(Copy, Clone, Eq, PartialEq)]
 enum RlsStatus {
     Available,
diff --git a/tests/channel-rust-nightly-example.toml b/tests/suite/channel-rust-nightly-example.toml
similarity index 100%
rename from tests/channel-rust-nightly-example.toml
rename to tests/suite/channel-rust-nightly-example.toml
diff --git a/tests/channel-rust-nightly-example2.toml b/tests/suite/channel-rust-nightly-example2.toml
similarity index 100%
rename from tests/channel-rust-nightly-example2.toml
rename to tests/suite/channel-rust-nightly-example2.toml
diff --git a/tests/cli-ui/rustup-init/rustup-init_help_flag_stdout.toml b/tests/suite/cli-ui/rustup-init/rustup-init_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup-init/rustup-init_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup-init/rustup-init_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup-init/rustup-init_sh_help_flag_stdout.toml b/tests/suite/cli-ui/rustup-init/rustup-init_sh_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup-init/rustup-init_sh_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup-init/rustup-init_sh_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_check_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_check_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_check_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_check_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_completions_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_completions_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_completions_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_completions_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_component_cmd_add_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_component_cmd_add_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_component_cmd_add_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_component_cmd_add_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_component_cmd_list_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_component_cmd_list_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_component_cmd_list_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_component_cmd_list_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_component_cmd_remove_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_component_cmd_remove_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_component_cmd_remove_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_component_cmd_remove_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_default_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_default_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_default_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_default_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_doc_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_doc_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_doc_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_doc_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_help_cmd_stdout.toml b/tests/suite/cli-ui/rustup/rustup_help_cmd_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_help_cmd_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_help_cmd_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_man_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_man_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_man_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_man_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_override_cmd_add_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_override_cmd_add_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_override_cmd_add_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_override_cmd_add_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_override_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_override_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_override_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_override_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_override_cmd_list_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_override_cmd_list_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_override_cmd_list_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_override_cmd_list_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_override_cmd_remove_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_override_cmd_remove_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_override_cmd_remove_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_override_cmd_remove_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_override_cmd_set_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_override_cmd_set_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_override_cmd_set_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_override_cmd_set_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_override_cmd_unset_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_override_cmd_unset_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_override_cmd_unset_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_override_cmd_unset_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_run_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_run_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_run_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_run_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_self_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_self_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_self_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_self_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_self_cmd_uninstall_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_self_cmd_uninstall_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_self_cmd_uninstall_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_self_cmd_uninstall_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_self_cmd_update_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_self_cmd_update_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_self_cmd_update_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_self_cmd_update_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_self_cmd_upgrade-data _cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_self_cmd_upgrade-data _cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_self_cmd_upgrade-data _cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_self_cmd_upgrade-data _cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_set_cmd_auto-self-update_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_set_cmd_auto-self-update_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_set_cmd_auto-self-update_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_set_cmd_auto-self-update_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_set_cmd_default-host_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_set_cmd_default-host_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_set_cmd_default-host_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_set_cmd_default-host_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_set_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_set_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_set_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_set_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_set_cmd_profile_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_set_cmd_profile_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_set_cmd_profile_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_set_cmd_profile_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_show_cmd_active-toolchain_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_show_cmd_active-toolchain_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_show_cmd_active-toolchain_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_show_cmd_active-toolchain_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_show_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_show_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_show_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_show_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_show_cmd_home_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_show_cmd_home_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_show_cmd_home_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_show_cmd_home_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_show_cmd_keys_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_show_cmd_keys_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_show_cmd_keys_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_show_cmd_keys_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_show_cmd_profile_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_show_cmd_profile_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_show_cmd_profile_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_show_cmd_profile_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_target_cmd_add_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_target_cmd_add_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_target_cmd_add_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_target_cmd_add_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_target_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_target_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_target_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_target_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_target_cmd_list_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_target_cmd_list_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_target_cmd_list_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_target_cmd_list_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_target_cmd_remove_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_target_cmd_remove_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_target_cmd_remove_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_target_cmd_remove_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_toolchain_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_toolchain_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_toolchain_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_toolchain_cmd_install_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_install_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_toolchain_cmd_install_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_toolchain_cmd_install_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_toolchain_cmd_link_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_link_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_toolchain_cmd_link_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_toolchain_cmd_link_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_toolchain_cmd_list_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_list_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_toolchain_cmd_list_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_toolchain_cmd_list_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_toolchain_cmd_uninstall_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_toolchain_cmd_uninstall_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_toolchain_cmd_uninstall_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_toolchain_cmd_uninstall_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_up_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_up_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_up_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_up_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_update_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_update_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_update_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_update_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_upgrade_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_upgrade_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_upgrade_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_upgrade_cmd_help_flag_stdout.toml
diff --git a/tests/cli-ui/rustup/rustup_which_cmd_help_flag_stdout.toml b/tests/suite/cli-ui/rustup/rustup_which_cmd_help_flag_stdout.toml
similarity index 100%
rename from tests/cli-ui/rustup/rustup_which_cmd_help_flag_stdout.toml
rename to tests/suite/cli-ui/rustup/rustup_which_cmd_help_flag_stdout.toml
diff --git a/tests/cli-exact.rs b/tests/suite/cli_exact.rs
similarity index 99%
rename from tests/cli-exact.rs
rename to tests/suite/cli_exact.rs
index 099dbc1da63..d650ab4932f 100644
--- a/tests/cli-exact.rs
+++ b/tests/suite/cli_exact.rs
@@ -1,8 +1,6 @@
 //! Yet more cli test cases. These are testing that the output
 //! is exactly as expected.
 
-pub mod mock;
-
 use crate::mock::clitools::{self, set_current_dist_date, with_update_server, Config, Scenario};
 use rustup::for_host;
 use rustup::test::this_host_triple;
diff --git a/tests/cli-inst-interactive.rs b/tests/suite/cli_inst_interactive.rs
similarity index 99%
rename from tests/cli-inst-interactive.rs
rename to tests/suite/cli_inst_interactive.rs
index b6422243bee..0c00ce255af 100644
--- a/tests/cli-inst-interactive.rs
+++ b/tests/suite/cli_inst_interactive.rs
@@ -1,7 +1,5 @@
 //! Tests of the interactive console installer
 
-pub mod mock;
-
 use std::env::consts::EXE_SUFFIX;
 use std::io::Write;
 use std::process::Stdio;
diff --git a/tests/cli-misc.rs b/tests/suite/cli_misc.rs
similarity index 99%
rename from tests/cli-misc.rs
rename to tests/suite/cli_misc.rs
index 1c39c5f9571..60d68fc2370 100644
--- a/tests/cli-misc.rs
+++ b/tests/suite/cli_misc.rs
@@ -1,8 +1,6 @@
 //! Test cases of the rustup command that do not depend on the
 //! dist server, mostly derived from multirust/test-v2.sh
 
-pub mod mock;
-
 use std::str;
 use std::{env::consts::EXE_SUFFIX, path::Path};
 
diff --git a/tests/cli-paths.rs b/tests/suite/cli_paths.rs
similarity index 99%
rename from tests/cli-paths.rs
rename to tests/suite/cli_paths.rs
index b98c6dc6b4c..bf645f802dd 100644
--- a/tests/cli-paths.rs
+++ b/tests/suite/cli_paths.rs
@@ -1,7 +1,6 @@
 //! This file contains tests relevant to Rustup's handling of updating PATHs.
 //! It depends on self-update working, so if absolutely everything here breaks,
 //! check those tests as well.
-pub mod mock;
 
 // Prefer omitting actually unpacking content while just testing paths.
 const INIT_NONE: [&str; 4] = ["rustup-init", "-y", "--default-toolchain", "none"];
diff --git a/tests/cli-rustup.rs b/tests/suite/cli_rustup.rs
similarity index 99%
rename from tests/cli-rustup.rs
rename to tests/suite/cli_rustup.rs
index ab5a4054a60..4a500ed61c4 100644
--- a/tests/cli-rustup.rs
+++ b/tests/suite/cli_rustup.rs
@@ -1,7 +1,5 @@
 //! Test cases for new rustup UI
 
-pub mod mock;
-
 use std::env::consts::EXE_SUFFIX;
 use std::fs;
 use std::path::{PathBuf, MAIN_SEPARATOR};
@@ -10,7 +8,10 @@ use rustup::for_host;
 use rustup::test::this_host_triple;
 use rustup::utils::raw;
 
-use crate::mock::clitools::{self, Config, Scenario};
+use crate::mock::{
+    self,
+    clitools::{self, Config, Scenario},
+};
 
 macro_rules! for_host_and_home {
     ($config:ident, $s: expr) => {
diff --git a/tests/cli-self-upd.rs b/tests/suite/cli_self_upd.rs
similarity index 99%
rename from tests/cli-self-upd.rs
rename to tests/suite/cli_self_upd.rs
index a7e5bbaa1c2..d20c502c983 100644
--- a/tests/cli-self-upd.rs
+++ b/tests/suite/cli_self_upd.rs
@@ -1,7 +1,5 @@
 //! Testing self install, uninstall and update
 
-pub mod mock;
-
 use std::env;
 use std::env::consts::EXE_SUFFIX;
 use std::fs;
@@ -14,9 +12,10 @@ use rustup::test::{this_host_triple, with_saved_path};
 use rustup::utils::{raw, utils};
 use rustup::{for_host, Notification, DUP_TOOLS, TOOLS};
 
-use crate::clitools::output_release_file;
-use crate::mock::clitools::{self, self_update_setup, Config, Scenario};
-use crate::mock::dist::calc_hash;
+use crate::mock::{
+    clitools::{self, output_release_file, self_update_setup, Config, Scenario},
+    dist::calc_hash,
+};
 
 const TEST_VERSION: &str = "1.1.1";
 
diff --git a/tests/cli-ui.rs b/tests/suite/cli_ui.rs
similarity index 80%
rename from tests/cli-ui.rs
rename to tests/suite/cli_ui.rs
index e42aa72e9b9..74c4fe5b1a2 100644
--- a/tests/cli-ui.rs
+++ b/tests/suite/cli_ui.rs
@@ -23,20 +23,20 @@ fn rustup_init_ui_doc_text_tests() {
     let project_root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     t.register_bin("rustup-init", &rustup_init);
     t.register_bin("rustup-init.sh", &project_root.join("rustup-init.sh"));
-    t.case("tests/cli-ui/rustup-init/*.toml");
+    t.case("tests/suite/cli-ui/rustup-init/*.toml");
     #[cfg(target_os = "windows")]
     {
-        // On non-windows, we don't use rustup-init.sh, so skip the test.
-        t.skip("tests/cli-ui/rustup-init/rustup-init_sh_help_flag_stdout.toml");
+        // On windows, we don't use rustup-init.sh, so skip the test.
+        t.skip("tests/suite/cli-ui/rustup-init/rustup-init_sh_help_flag_stdout.toml");
     }
 
     // On non-windows, we don't use rustup-init.sh, so skip the test.
     #[cfg(not(target_os = "windows"))]
     {
         let rustup_init_help_toml =
-            project_root.join("tests/cli-ui/rustup-init/rustup-init_help_flag_stdout.toml");
-        let rustup_init_sh_help_toml =
-            project_root.join("tests/cli-ui/rustup-init/rustup-init_sh_help_flag_stdout.toml");
+            project_root.join("tests/suite/cli-ui/rustup-init/rustup-init_help_flag_stdout.toml");
+        let rustup_init_sh_help_toml = project_root
+            .join("tests/suite/cli-ui/rustup-init/rustup-init_sh_help_flag_stdout.toml");
 
         #[derive(Debug, PartialEq, Eq, serde::Deserialize, serde::Serialize)]
         struct Stdout {
diff --git a/tests/cli-v1.rs b/tests/suite/cli_v1.rs
similarity index 99%
rename from tests/cli-v1.rs
rename to tests/suite/cli_v1.rs
index 00096da2c69..10b14cf9676 100644
--- a/tests/cli-v1.rs
+++ b/tests/suite/cli_v1.rs
@@ -1,8 +1,6 @@
 //! Test cases of the rustup command, using v1 manifests, mostly
 //! derived from multirust/test-v2.sh
 
-pub mod mock;
-
 use std::fs;
 
 use rustup::for_host;
diff --git a/tests/cli-v2.rs b/tests/suite/cli_v2.rs
similarity index 99%
rename from tests/cli-v2.rs
rename to tests/suite/cli_v2.rs
index 32f17b6c1cd..a53e3a32945 100644
--- a/tests/cli-v2.rs
+++ b/tests/suite/cli_v2.rs
@@ -1,8 +1,6 @@
 //! Test cases of the rustup command, using v2 manifests, mostly
 //! derived from multirust/test-v2.sh
 
-pub mod mock;
-
 use std::fs;
 use std::io::Write;
 
diff --git a/tests/dist.rs b/tests/suite/dist.rs
similarity index 99%
rename from tests/dist.rs
rename to tests/suite/dist.rs
index aba165b5ae2..6f7005ee0f1 100644
--- a/tests/dist.rs
+++ b/tests/suite/dist.rs
@@ -1,8 +1,6 @@
 // Tests of installation and updates from a v2 Rust distribution
 // server (mocked on the file system)
 
-pub mod mock;
-
 use std::cell::Cell;
 use std::collections::HashMap;
 use std::env;
diff --git a/tests/dist_install.rs b/tests/suite/dist_install.rs
similarity index 99%
rename from tests/dist_install.rs
rename to tests/suite/dist_install.rs
index 83edc8bc67f..9e33c0de06e 100644
--- a/tests/dist_install.rs
+++ b/tests/suite/dist_install.rs
@@ -1,5 +1,3 @@
-pub mod mock;
-
 use std::fs::File;
 use std::io::Write;
 
diff --git a/tests/dist_manifest.rs b/tests/suite/dist_manifest.rs
similarity index 100%
rename from tests/dist_manifest.rs
rename to tests/suite/dist_manifest.rs
diff --git a/tests/dist_transactions.rs b/tests/suite/dist_transactions.rs
similarity index 100%
rename from tests/dist_transactions.rs
rename to tests/suite/dist_transactions.rs
diff --git a/tests/suite/mod.rs b/tests/suite/mod.rs
new file mode 100644
index 00000000000..afb91fd4a25
--- /dev/null
+++ b/tests/suite/mod.rs
@@ -0,0 +1,13 @@
+mod cli_exact;
+mod cli_inst_interactive;
+mod cli_misc;
+mod cli_paths;
+mod cli_rustup;
+mod cli_self_upd;
+mod cli_ui;
+mod cli_v1;
+mod cli_v2;
+mod dist;
+mod dist_install;
+mod dist_manifest;
+mod dist_transactions;
diff --git a/tests/test_bonanza.rs b/tests/test_bonanza.rs
new file mode 100644
index 00000000000..0941d0b40a4
--- /dev/null
+++ b/tests/test_bonanza.rs
@@ -0,0 +1,2 @@
+mod mock;
+mod suite;