diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index 328bc34824ab689270cfd595ab1df149b923727f..9f8eb947a54fc217eb2903fa05b3b1c40b1e6e00 100644
--- a/Library/Homebrew/cmd/test-bot.rb
+++ b/Library/Homebrew/cmd/test-bot.rb
@@ -381,7 +381,10 @@ module Homebrew
 
       begin
         deps.each do |dep|
-          system "brew", "tap", dep.tap if dep.is_a? TapDependency
+          if dep.is_a?(TapDependency) && dep.tap
+            tap_dir = Homebrew.homebrew_git_repo dep.tap
+            test "brew", "tap", dep.tap unless tap_dir.directory?
+          end
           CompilerSelector.select_for(dep.to_formula)
         end
         CompilerSelector.select_for(formula)