diff --git a/Library/Homebrew/test/cmd/home_spec.rb b/Library/Homebrew/test/cmd/home_spec.rb
new file mode 100644
index 0000000000..5a40704929
--- /dev/null
+++ b/Library/Homebrew/test/cmd/home_spec.rb
@@ -0,0 +1,17 @@
+describe "brew home", :integration_test do
+  it "opens the Homebrew homepage when no argument is given" do
+    expect { brew "home", "HOMEBREW_BROWSER" => "echo" }
+      .to output("#{HOMEBREW_WWW}\n").to_stdout
+      .and not_to_output.to_stderr
+      .and be_a_success
+  end
+
+  it "opens the homepage for a given Formula" do
+    setup_test_formula "testball"
+
+    expect { brew "home", "testball", "HOMEBREW_BROWSER" => "echo" }
+      .to output("#{Formula["testball"].homepage}\n").to_stdout
+      .and not_to_output.to_stderr
+      .and be_a_success
+  end
+end
diff --git a/Library/Homebrew/test/home_test.rb b/Library/Homebrew/test/home_test.rb
deleted file mode 100644
index ff06b72c1d..0000000000
--- a/Library/Homebrew/test/home_test.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require "testing_env"
-
-class IntegrationCommandTestHome < IntegrationCommandTestCase
-  def test_home
-    setup_test_formula "testball"
-
-    assert_equal HOMEBREW_WWW,
-                 cmd("home", "HOMEBREW_BROWSER" => "echo")
-    assert_equal Formula["testball"].homepage,
-                 cmd("home", "testball", "HOMEBREW_BROWSER" => "echo")
-  end
-end