diff --git a/Library/Homebrew/test/cmd/commands_spec.rb b/Library/Homebrew/test/cmd/commands_spec.rb
new file mode 100644
index 0000000000..f42072956b
--- /dev/null
+++ b/Library/Homebrew/test/cmd/commands_spec.rb
@@ -0,0 +1,7 @@
+describe "brew commands", :integration_test do
+  it "prints a list of all available commands" do
+    expect { brew "commands" }
+      .to output(/Built-in commands/).to_stdout
+      .and be_a_success
+  end
+end
diff --git a/Library/Homebrew/test/commands_test.rb b/Library/Homebrew/test/commands_test.rb
index 5f5dc95865..da88ee2d51 100644
--- a/Library/Homebrew/test/commands_test.rb
+++ b/Library/Homebrew/test/commands_test.rb
@@ -4,13 +4,6 @@ require "cmd/commands"
 require "fileutils"
 require "testing_env"
 
-class IntegrationCommandTestCommands < IntegrationCommandTestCase
-  def test_commands
-    assert_match "Built-in commands",
-                 cmd("commands")
-  end
-end
-
 class CommandsTests < Homebrew::TestCase
   def setup
     super