diff --git a/Library/Homebrew/cli_parser.rb b/Library/Homebrew/cli_parser.rb
index 8a6e15abb7..a7ed26e553 100644
--- a/Library/Homebrew/cli_parser.rb
+++ b/Library/Homebrew/cli_parser.rb
@@ -11,6 +11,8 @@ module Homebrew
       def initialize(&block)
         @parser = OptionParser.new
         @parsed_args = OpenStruct.new
+        # undefine tap to allow --tap argument
+        @parsed_args.instance_eval { undef tap }
         instance_eval(&block)
       end