diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index 71a0257ab4..38779531d9 100644
--- a/Library/Homebrew/cmd/test-bot.rb
+++ b/Library/Homebrew/cmd/test-bot.rb
@@ -49,7 +49,7 @@ module Homebrew
       bot_argv = ENV["UPSTREAM_BOT_PARAMS"].split " "
       bot_argv.extend HomebrewArgvExtension
       if tap = bot_argv.value("tap")
-        return Tap.fetch(tap) if url_path =~ HOMEBREW_TAP_REGEX
+        return Tap.fetch(tap)
       end
     end
 
@@ -57,7 +57,7 @@ module Homebrew
       # Also can get tap from Jenkins GIT_URL.
       url_path = git_url.sub(%r{^https?://github\.com/}, "").chomp("/").sub(%r{\.git$}, "")
       begin
-        return Tap.fetch(url_path)
+        return Tap.fetch(url_path) if url_path =~ HOMEBREW_TAP_REGEX
       rescue
       end
     end