diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/src/tests/builder.rs
similarity index 99%
rename from src/bootstrap/builder/tests.rs
rename to src/bootstrap/src/tests/builder.rs
index 0294102286e..96139f7b099 100644
--- a/src/bootstrap/builder/tests.rs
+++ b/src/bootstrap/src/tests/builder.rs
@@ -1,6 +1,6 @@
 use super::*;
-use crate::config::{Config, DryRun, TargetSelection};
-use crate::doc::DocumentationFormat;
+use crate::core::config::{Config, DryRun, TargetSelection};
+use crate::core::build_steps::doc::DocumentationFormat;
 use std::thread;
 
 fn configure(cmd: &str, host: &[&str], target: &[&str]) -> Config {
@@ -158,7 +158,7 @@ fn alias_and_path_for_library() {
 
 #[test]
 fn test_beta_rev_parsing() {
-    use crate::extract_beta_rev;
+    use crate::utils::helpers::extract_beta_rev;
 
     // single digit revision
     assert_eq!(extract_beta_rev("1.99.9-beta.7 (xxxxxx)"), Some("7".to_string()));
@@ -174,7 +174,7 @@ fn test_beta_rev_parsing() {
 
 mod defaults {
     use super::{configure, first, run_build};
-    use crate::builder::*;
+    use crate::core::builder::*;
     use crate::Config;
     use pretty_assertions::assert_eq;
 
@@ -285,7 +285,7 @@ mod defaults {
 
 mod dist {
     use super::{first, run_build, Config};
-    use crate::builder::*;
+    use crate::core::builder::*;
     use pretty_assertions::assert_eq;
 
     fn configure(host: &[&str], target: &[&str]) -> Config {
diff --git a/src/bootstrap/config/tests.rs b/src/bootstrap/src/tests/config.rs
similarity index 97%
rename from src/bootstrap/config/tests.rs
rename to src/bootstrap/src/tests/config.rs
index ae8363b6de9..59bd52a94dc 100644
--- a/src/bootstrap/config/tests.rs
+++ b/src/bootstrap/src/tests/config.rs
@@ -1,6 +1,6 @@
-use crate::config::TomlConfig;
-
+use crate::core::config::TomlConfig;
 use super::{Config, Flags};
+
 use clap::CommandFactory;
 use serde::Deserialize;
 use std::{
@@ -18,7 +18,7 @@ fn parse(config: &str) -> Config {
 
 #[test]
 fn download_ci_llvm() {
-    if crate::llvm::is_ci_llvm_modified(&parse("")) {
+    if crate::core::build_steps::llvm::is_ci_llvm_modified(&parse("")) {
         eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change");
         return;
     }
@@ -137,7 +137,7 @@ build-config = {}
     assert_eq!(config.change_id, Some(1), "setting top-level value");
     assert_eq!(
         config.rust_lto,
-        crate::config::RustcLto::Fat,
+        crate::core::config::RustcLto::Fat,
         "setting string value without quotes"
     );
     assert_eq!(config.gdb, Some("bar".into()), "setting string value with quotes");
@@ -175,7 +175,7 @@ fn profile_user_dist() {
             "profile = \"user\"".to_owned()
         } else {
             assert!(file.ends_with("config.dist.toml"));
-            std::fs::read_to_string(dbg!(file)).unwrap()
+            std::fs::read_to_string(file).unwrap()
         };
         toml::from_str(&contents)
             .and_then(|table: toml::Value| TomlConfig::deserialize(table))
diff --git a/src/bootstrap/setup/tests.rs b/src/bootstrap/src/tests/setup.rs
similarity index 100%
rename from src/bootstrap/setup/tests.rs
rename to src/bootstrap/src/tests/setup.rs