diff --git a/Library/Homebrew/dev-cmd/test.rb b/Library/Homebrew/dev-cmd/test.rb
index 72b912789c..413ebe88ac 100644
--- a/Library/Homebrew/dev-cmd/test.rb
+++ b/Library/Homebrew/dev-cmd/test.rb
@@ -8,31 +8,33 @@ require "cli/parser"
 module Homebrew
   module_function
 
-  def test_args
-    Homebrew::CLI::Parser.new do
-      usage_banner <<~EOS
-        `test` [<options>] <formula>
+  module Test
+    def self.args
+      Homebrew::CLI::Parser.new do
+        usage_banner <<~EOS
+          `test` [<options>] <formula>
 
-        Run the test method provided by an installed formula.
-        There is no standard output or return code, but generally it should notify the
-        user if something is wrong with the installed formula.
+          Run the test method provided by an installed formula.
+          There is no standard output or return code, but generally it should notify the
+          user if something is wrong with the installed formula.
 
-        *Example:* `brew install jruby && brew test jruby`
-      EOS
-      switch "--devel",
-             description: "Test the development version of a formula."
-      switch "--HEAD",
-             description: "Test the head version of a formula."
-      switch "--keep-tmp",
-             description: "Retain the temporary files created for the test."
-      switch :verbose
-      switch :debug
-      conflicts "--devel", "--HEAD"
+          *Example:* `brew install jruby && brew test jruby`
+        EOS
+        switch "--devel",
+               description: "Test the development version of a formula."
+        switch "--HEAD",
+               description: "Test the head version of a formula."
+        switch "--keep-tmp",
+               description: "Retain the temporary files created for the test."
+        switch :verbose
+        switch :debug
+        conflicts "--devel", "--HEAD"
+      end
     end
   end
 
   def test
-    test_args.parse
+    Test.args.parse
 
     raise FormulaUnspecifiedError if ARGV.named.empty?
 
diff --git a/Library/Homebrew/test.rb b/Library/Homebrew/test.rb
index c4b6403e86..97600c259f 100644
--- a/Library/Homebrew/test.rb
+++ b/Library/Homebrew/test.rb
@@ -9,20 +9,13 @@ require "debrew"
 require "formula_assertions"
 require "fcntl"
 require "socket"
-require "cli/parser"
-
-def test_args
-  Homebrew::CLI::Parser.new do
-    switch :force
-    switch :verbose
-    switch :debug
-  end
-end
+require "dev-cmd/test"
 
 TEST_TIMEOUT_SECONDS = 5 * 60
 
 begin
-  test_args.parse
+  Homebrew::Test.args.parse
+
   error_pipe = UNIXSocket.open(ENV["HOMEBREW_ERROR_PIPE"], &:recv_io)
   error_pipe.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)