diff --git a/src/bootstrap/build/clean.rs b/src/bootstrap/build/clean.rs
index 8f78fed001c..796d70bdecf 100644
--- a/src/bootstrap/build/clean.rs
+++ b/src/bootstrap/build/clean.rs
@@ -19,11 +19,14 @@ pub fn clean(build: &Build) {
         let out = build.out.join(host);
 
         rm_rf(build, &out.join("compiler-rt"));
+        rm_rf(build, &out.join("doc"));
 
         for stage in 0..4 {
             rm_rf(build, &out.join(format!("stage{}", stage)));
             rm_rf(build, &out.join(format!("stage{}-std", stage)));
             rm_rf(build, &out.join(format!("stage{}-rustc", stage)));
+            rm_rf(build, &out.join(format!("stage{}-test", stage)));
+            rm_rf(build, &out.join(format!("stage{}-tools", stage)));
         }
     }
 }