diff --git a/Library/Homebrew/test/cmd/switch_spec.rb b/Library/Homebrew/test/cmd/switch_spec.rb
new file mode 100644
index 0000000000..c27c96c14f
--- /dev/null
+++ b/Library/Homebrew/test/cmd/switch_spec.rb
@@ -0,0 +1,34 @@
+describe "brew switch", :integration_test do
+  it "allows switching between Formula versions" do
+    expect { brew "switch" }
+      .to output(/Usage: brew switch <name> <version>/).to_stderr
+      .and not_to_output.to_stdout
+      .and be_a_failure
+
+    expect { brew "switch", "testball", "0.1" }
+      .to output(/testball not found/).to_stderr
+      .and not_to_output.to_stdout
+      .and be_a_failure
+
+    setup_test_formula "testball", <<-EOS.undent
+      keg_only "just because"
+    EOS
+
+    shutup do
+      expect { brew "install", "testball" }.to be_a_success
+    end
+
+    testball_rack = HOMEBREW_CELLAR/"testball"
+    FileUtils.cp_r testball_rack/"0.1", testball_rack/"0.2"
+
+    expect { brew "switch", "testball", "0.2" }
+      .to output(/link created/).to_stdout
+      .and not_to_output.to_stderr
+      .and be_a_success
+
+    expect { brew "switch", "testball", "0.3" }
+      .to output("Versions available: 0.1, 0.2\n").to_stdout
+      .and output(/testball does not have a version "0.3"/).to_stderr
+      .and be_a_failure
+  end
+end
diff --git a/Library/Homebrew/test/switch_test.rb b/Library/Homebrew/test/switch_test.rb
deleted file mode 100644
index af1926c39e..0000000000
--- a/Library/Homebrew/test/switch_test.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-require "testing_env"
-
-class IntegrationCommandTestSwitch < IntegrationCommandTestCase
-  def test_switch
-    assert_match "Usage: brew switch <name> <version>", cmd_fail("switch")
-    assert_match "testball not found", cmd_fail("switch", "testball", "0.1")
-
-    setup_test_formula "testball", <<-EOS.undent
-      keg_only "just because"
-    EOS
-
-    cmd("install", "testball")
-    testball_rack = HOMEBREW_CELLAR/"testball"
-    FileUtils.cp_r testball_rack/"0.1", testball_rack/"0.2"
-
-    cmd("switch", "testball", "0.2")
-    assert_match "testball does not have a version \"0.3\"",
-      cmd_fail("switch", "testball", "0.3")
-  end
-end