diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index 0efd400dc6..b6b167f3f6 100644
--- a/Library/Homebrew/cmd/test-bot.rb
+++ b/Library/Homebrew/cmd/test-bot.rb
@@ -244,6 +244,9 @@ module Homebrew
 
     def safe_formulary(formula)
       Formulary.factory formula
+    rescue TapFormulaUnavailableError => e
+      test "brew", "tap", e.tap.name
+      retry unless steps.last.failed?
     rescue FormulaUnavailableError, TapFormulaAmbiguityError, TapFormulaWithOldnameAmbiguityError
     end