diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index fd39944e176..5a1f2e70413 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -45,8 +45,6 @@ check-aux:
 		src/tools/cargo \
 		src/tools/cargotest \
 		$(BOOTSTRAP_ARGS)
-check-bootstrap:
-	$(Q)$(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap_test.py
 dist:
 	$(Q)$(BOOTSTRAP) dist $(BOOTSTRAP_ARGS)
 distcheck:
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index f60766bde72..d7a29a6b6be 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -2356,6 +2356,10 @@ impl Step for Bootstrap {
 
     /// Tests the build system itself.
     fn run(self, builder: &Builder<'_>) {
+        let mut check_bootstrap = Command::new(&builder.python());
+        check_bootstrap.arg("bootstrap_test.py").current_dir(builder.src.join("src/bootstrap/"));
+        try_run(builder, &mut check_bootstrap);
+
         let mut cmd = Command::new(&builder.initial_cargo);
         cmd.arg("test")
             .current_dir(builder.src.join("src/bootstrap"))
diff --git a/src/ci/run.sh b/src/ci/run.sh
index 948445427d9..5f843a13bcd 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -141,8 +141,6 @@ $SRC/configure $RUST_CONFIGURE_ARGS
 
 retry make prepare
 
-make check-bootstrap
-
 # Display the CPU and memory information. This helps us know why the CI timing
 # is fluctuating.
 if isMacOS; then