diff --git a/Library/Homebrew/cmd/tap-info.rb b/Library/Homebrew/cmd/tap-info.rb
index 5428cca33c..ac9bdc4161 100644
--- a/Library/Homebrew/cmd/tap-info.rb
+++ b/Library/Homebrew/cmd/tap-info.rb
@@ -1,88 +1,88 @@
 # typed: true
 # frozen_string_literal: true
 
-require "cli/parser"
+require "abstract_command"
 
 module Homebrew
-  module_function
+  module Cmd
+    class TapInfo < AbstractCommand
+      cmd_args do
+        description <<~EOS
+          Show detailed information about one or more <tap>s.
+          If no <tap> names are provided, display brief statistics for all installed taps.
+        EOS
+        switch "--installed",
+               description: "Show information on each installed tap."
+        flag   "--json",
+               description: "Print a JSON representation of <tap>. Currently the default and only accepted " \
+                            "value for <version> is `v1`. See the docs for examples of using the JSON " \
+                            "output: <https://docs.brew.sh/Querying-Brew>"
 
-  sig { returns(CLI::Parser) }
-  def tap_info_args
-    Homebrew::CLI::Parser.new do
-      description <<~EOS
-        Show detailed information about one or more <tap>s.
-        If no <tap> names are provided, display brief statistics for all installed taps.
-      EOS
-      switch "--installed",
-             description: "Show information on each installed tap."
-      flag   "--json",
-             description: "Print a JSON representation of <tap>. Currently the default and only accepted " \
-                          "value for <version> is `v1`. See the docs for examples of using the JSON " \
-                          "output: <https://docs.brew.sh/Querying-Brew>"
-
-      named_args :tap
-    end
-  end
-
-  def tap_info
-    args = tap_info_args.parse
-
-    taps = if args.installed?
-      Tap
-    else
-      args.named.to_taps
-    end
-
-    if args.json
-      raise UsageError, "invalid JSON version: #{args.json}" unless ["v1", true].include? args.json
-
-      print_tap_json(taps.sort_by(&:to_s))
-    else
-      print_tap_info(taps.sort_by(&:to_s))
-    end
-  end
-
-  def print_tap_info(taps)
-    if taps.none?
-      tap_count = 0
-      formula_count = 0
-      command_count = 0
-      private_count = 0
-      Tap.installed.each do |tap|
-        tap_count += 1
-        formula_count += tap.formula_files.size
-        command_count += tap.command_files.size
-        private_count += 1 if tap.private?
+        named_args :tap
       end
-      info = Utils.pluralize("tap", tap_count, include_count: true)
-      info += ", #{private_count} private"
-      info += ", #{Utils.pluralize("formula", formula_count, plural: "e", include_count: true)}"
-      info += ", #{Utils.pluralize("command", command_count, include_count: true)}"
-      info += ", #{Tap::TAP_DIRECTORY.dup.abv}" if Tap::TAP_DIRECTORY.directory?
-      puts info
-    else
-      info = ""
-      taps.each_with_index do |tap, i|
-        puts unless i.zero?
-        info = "#{tap}: "
-        if tap.installed?
-          info += if (contents = tap.contents).blank?
-            "no commands/casks/formulae"
-          else
-            contents.join(", ")
-          end
-          info += ", private" if tap.private?
-          info += "\n#{tap.path} (#{tap.path.abv})"
-          info += "\nFrom: #{tap.remote.presence || "N/A"}"
+
+      sig { override.void }
+      def run
+        taps = if args.installed?
+          Tap
         else
-          info += "Not installed"
+          args.named.to_taps
         end
-        puts info
+
+        if args.json
+          raise UsageError, "invalid JSON version: #{args.json}" unless ["v1", true].include? args.json
+
+          print_tap_json(taps.sort_by(&:to_s))
+        else
+          print_tap_info(taps.sort_by(&:to_s))
+        end
+      end
+
+      private
+
+      def print_tap_info(taps)
+        if taps.none?
+          tap_count = 0
+          formula_count = 0
+          command_count = 0
+          private_count = 0
+          Tap.installed.each do |tap|
+            tap_count += 1
+            formula_count += tap.formula_files.size
+            command_count += tap.command_files.size
+            private_count += 1 if tap.private?
+          end
+          info = Utils.pluralize("tap", tap_count, include_count: true)
+          info += ", #{private_count} private"
+          info += ", #{Utils.pluralize("formula", formula_count, plural: "e", include_count: true)}"
+          info += ", #{Utils.pluralize("command", command_count, include_count: true)}"
+          info += ", #{Tap::TAP_DIRECTORY.dup.abv}" if Tap::TAP_DIRECTORY.directory?
+          puts info
+        else
+          info = ""
+          taps.each_with_index do |tap, i|
+            puts unless i.zero?
+            info = "#{tap}: "
+            if tap.installed?
+              info += if (contents = tap.contents).blank?
+                "no commands/casks/formulae"
+              else
+                contents.join(", ")
+              end
+              info += ", private" if tap.private?
+              info += "\n#{tap.path} (#{tap.path.abv})"
+              info += "\nFrom: #{tap.remote.presence || "N/A"}"
+            else
+              info += "Not installed"
+            end
+            puts info
+          end
+        end
+      end
+
+      def print_tap_json(taps)
+        puts JSON.pretty_generate(taps.map(&:to_hash))
       end
     end
   end
-
-  def print_tap_json(taps)
-    puts JSON.pretty_generate(taps.map(&:to_hash))
-  end
 end
diff --git a/Library/Homebrew/test/cmd/tap-info_spec.rb b/Library/Homebrew/test/cmd/tap-info_spec.rb
index 394b79ebd8..ada71038cd 100644
--- a/Library/Homebrew/test/cmd/tap-info_spec.rb
+++ b/Library/Homebrew/test/cmd/tap-info_spec.rb
@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
 require "cmd/shared_examples/args_parse"
+require "cmd/tap-info"
 
-RSpec.describe "brew tap-info" do
+RSpec.describe Homebrew::Cmd::TapInfo do
   it_behaves_like "parseable arguments"
 
   it "gets information for a given Tap", :integration_test, :needs_network do