diff --git a/Library/Homebrew/test/cask_test.rb b/Library/Homebrew/test/cask_test.rb
deleted file mode 100644
index d5b81facb6e3bea880232f460ff64294cb396ac7..0000000000000000000000000000000000000000
--- a/Library/Homebrew/test/cask_test.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require "testing_env"
-
-class IntegrationCommandTestCask < IntegrationCommandTestCase
-  def test_cask
-    needs_test_cmd_taps
-    needs_macos
-    setup_remote_tap("caskroom/cask")
-    cmd("cask", "list", "--caskroom=#{HOMEBREW_PREFIX}/Caskroom")
-  end
-end
diff --git a/Library/Homebrew/test/cmd/cask_spec.rb b/Library/Homebrew/test/cmd/cask_spec.rb
new file mode 100644
index 0000000000000000000000000000000000000000..e46843cab23422ca043d72594aa6bfe91ac83cb5
--- /dev/null
+++ b/Library/Homebrew/test/cmd/cask_spec.rb
@@ -0,0 +1,8 @@
+describe "brew cask", :integration_test, :needs_macos, :needs_official_cmd_taps do
+  describe "list" do
+    it "returns a list of installed Casks" do
+      setup_remote_tap("caskroom/cask")
+      expect { brew "cask", "list" }.to be_a_success
+    end
+  end
+end