diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index 4295639d22bb993e6f34e04dc39e8fbdf2afe36f..1a495d04cb7d2e21432df9c8c05ba50f58d92bae 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -687,7 +687,7 @@ module Homebrew
         git "checkout", "-f", "master"
         git "reset", "--hard", "origin/master"
       end
-      git "clean", "-ffdx"
+      git "clean", "-ffdx", "--exclude=/Library/Taps/"
 
       Pathname.glob("{#{HOMEBREW_REPOSITORY},#{HOMEBREW_LIBRARY}/Taps/*/*}").each do |git_repo|
         next if @repository == git_repo
@@ -717,16 +717,14 @@ module Homebrew
         git "stash", "pop"
         test "brew", "cleanup", "--prune=7"
         git "gc", "--auto"
-        test "git", "clean", "-ffdx"
-
-        Tap.names.each { |s| safe_system "brew", "untap", s if s != "homebrew/core" }
+        test "git", "clean", "-ffdx", "--exclude=/Library/Taps/homebrew/homebrew-core"
 
         Pathname.glob("{#{HOMEBREW_REPOSITORY},#{HOMEBREW_LIBRARY}/Taps/*/*}").each do |git_repo|
           next if @repository == git_repo
           git_repo.cd do
             safe_system "git", "checkout", "-f", "master"
             safe_system "git", "reset", "--hard", "origin/master"
-            safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/"
+            safe_system "git", "clean", "-ffdx", "--exclude=/Library/Taps/homebrew/homebrew-core"
           end
         end