diff --git a/Library/Homebrew/dev-cmd/test-bot.rb b/Library/Homebrew/dev-cmd/test-bot.rb
index 8a20bb5940..d3a2c2a09c 100644
--- a/Library/Homebrew/dev-cmd/test-bot.rb
+++ b/Library/Homebrew/dev-cmd/test-bot.rb
@@ -796,12 +796,7 @@ module Homebrew
     end
 
     first_formula_name = bottles_hash.keys.first
-    tap = if first_formula_name.include? "/"
-      user, repo = bottles_hash.keys.first.split("/", 3)
-      Tap.new user, repo
-    else
-      CoreTap.instance
-    end
+    tap = Tap.fetch(first_formula_name.rpartition("/").first.chuzzle || "homebrew/core")
 
     ENV["GIT_AUTHOR_NAME"] = ENV["GIT_COMMITTER_NAME"] = "BrewTestBot"
     ENV["GIT_AUTHOR_EMAIL"] = ENV["GIT_COMMITTER_EMAIL"] = "brew-test-bot@googlegroups.com"