diff --git a/Library/Homebrew/cask/spec/cask/depends_on_spec.rb b/Library/Homebrew/cask/spec/cask/depends_on_spec.rb
new file mode 100644
index 0000000000..078a2bce74
--- /dev/null
+++ b/Library/Homebrew/cask/spec/cask/depends_on_spec.rb
@@ -0,0 +1,92 @@
+require "spec_helper"
+
+# TODO: this test should be named after the corresponding class, once
+#       that class is abstracted from installer.rb
+describe "Satisfy Dependencies and Requirements" do
+  subject {
+    lambda do
+      shutup do
+        Hbc::Installer.new(cask).install
+      end
+    end
+  }
+
+  describe "depends_on cask" do
+    context "when depends_on cask is cyclic" do
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-cask-cyclic.rb") }
+      it { is_expected.to raise_error(Hbc::CaskCyclicCaskDependencyError) }
+    end
+
+    context do
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-cask.rb") }
+      let(:dependency) { Hbc.load(cask.depends_on.cask.first) }
+
+      it "installs the dependency of a Cask and the Cask itself" do
+        expect(subject).not_to raise_error
+        expect(cask).to be_installed
+        expect(dependency).to be_installed
+      end
+    end
+  end
+
+  describe "depends_on macos" do
+    context "given an array" do
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-macos-array.rb") }
+      it { is_expected.not_to raise_error }
+    end
+
+    context "given a comparisson" do
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-macos-comparison.rb") }
+      it { is_expected.not_to raise_error }
+    end
+
+    context "given a string" do
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-macos-string.rb") }
+      it { is_expected.not_to raise_error }
+    end
+
+    context "given a symbol" do
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-macos-symbol.rb") }
+      it { is_expected.not_to raise_error }
+    end
+
+    context "when not satisfied" do
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-macos-failure.rb") }
+      it { is_expected.to raise_error(Hbc::CaskError) }
+    end
+  end
+
+  describe "depends_on arch" do
+    context "when satisfied" do
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-arch.rb") }
+      it { is_expected.not_to raise_error }
+    end
+  end
+
+  describe "depends_on x11" do
+    before(:each) do
+      allow(MacOS::X11).to receive(:installed?).and_return(x11_installed)
+    end
+
+    context "when satisfied" do
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-x11.rb") }
+      let(:x11_installed) { true }
+
+      it { is_expected.not_to raise_error }
+    end
+
+    context "when not satisfied" do
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-x11.rb") }
+      let(:x11_installed) { false }
+
+      it { is_expected.to raise_error(Hbc::CaskX11DependencyError) }
+    end
+
+    context "when depends_on x11: false" do
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-x11-false.rb") }
+      let(:x11_installed) { false }
+
+      it { is_expected.not_to raise_error }
+    end
+  end
+end
diff --git a/Library/Homebrew/cask/test/cask/depends_on_test.rb b/Library/Homebrew/cask/test/cask/depends_on_test.rb
deleted file mode 100644
index 1ec85b520b..0000000000
--- a/Library/Homebrew/cask/test/cask/depends_on_test.rb
+++ /dev/null
@@ -1,113 +0,0 @@
-require "test_helper"
-
-# TODO: this test should be named after the corresponding class, once
-#       that class is abstracted from installer.rb
-describe "Satisfy Dependencies and Requirements" do
-  # TODO: test that depends_on formula invokes Homebrew
-  #
-  # describe "depends_on formula" do
-  #   it "" do
-  #   end
-  # end
-  #
-
-  describe "depends_on cask" do
-    it "raises an exception when depends_on cask is cyclic" do
-      dep_cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-cask-cyclic.rb")
-      lambda {
-        shutup do
-          Hbc::Installer.new(dep_cask).install
-        end
-      }.must_raise(Hbc::CaskCyclicCaskDependencyError)
-    end
-
-    it "installs the dependency of a Cask and the Cask itself" do
-      csk = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-cask.rb")
-      dependency = Hbc.load(csk.depends_on.cask.first)
-      shutup do
-        Hbc::Installer.new(csk).install
-      end
-
-      csk.must_be :installed?
-      dependency.must_be :installed?
-    end
-  end
-
-  describe "depends_on macos" do
-    it "understands depends_on macos: <array>" do
-      macos_cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-macos-array.rb")
-      shutup do
-        Hbc::Installer.new(macos_cask).install
-      end
-    end
-
-    it "understands depends_on macos: <comparison>" do
-      macos_cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-macos-comparison.rb")
-      shutup do
-        Hbc::Installer.new(macos_cask).install
-      end
-    end
-
-    it "understands depends_on macos: <string>" do
-      macos_cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-macos-string.rb")
-      shutup do
-        Hbc::Installer.new(macos_cask).install
-      end
-    end
-
-    it "understands depends_on macos: <symbol>" do
-      macos_cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-macos-symbol.rb")
-      shutup do
-        Hbc::Installer.new(macos_cask).install
-      end
-    end
-
-    it "raises an exception when depends_on macos is not satisfied" do
-      macos_cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-macos-failure.rb")
-      lambda {
-        shutup do
-          Hbc::Installer.new(macos_cask).install
-        end
-      }.must_raise(Hbc::CaskError)
-    end
-  end
-
-  describe "depends_on arch" do
-    it "succeeds when depends_on arch is satisfied" do
-      arch_cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-arch.rb")
-      shutup do
-        Hbc::Installer.new(arch_cask).install
-      end
-    end
-  end
-
-  describe "depends_on x11" do
-    it "succeeds when depends_on x11 is satisfied" do
-      x11_cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-x11.rb")
-      MacOS::X11.stubs(:installed?).returns(true)
-      shutup do
-        Hbc::Installer.new(x11_cask).install
-      end
-    end
-
-    it "raises an exception when depends_on x11 is not satisfied" do
-      x11_cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-x11.rb")
-      MacOS::X11.stubs(:installed?).returns(false)
-      lambda {
-        shutup do
-          Hbc::Installer.new(x11_cask).install
-        end
-      }.must_raise(Hbc::CaskX11DependencyError)
-    end
-
-    it "never raises when depends_on x11: false" do
-      x11_cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-x11-false.rb")
-      MacOS::X11.stubs(:installed?).returns(false)
-      lambda do
-        shutup do
-          Hbc::Installer.new(x11_cask).install
-        end
-      end # won't raise
-    end
-  end
-end