Move Cask fixtures to `test/support/fixtures`.

138 files changed, 154 insertions, 1357 deletions

diff --git a/Library/Homebrew/cask/test/cask/accessibility_test.rb b/Library/Homebrew/cask/test/cask/accessibility_test.rb
index 7c6484dd4..657629469 100644
--- a/Library/Homebrew/cask/test/cask/accessibility_test.rb
+++ b/Library/Homebrew/cask/test/cask/accessibility_test.rb
@@ -3,7 +3,7 @@ require "test_helper"
 # TODO: this test should be named after the corresponding class, once
 #       that class is abstracted from installer.rb.
 describe "Accessibility Access" do
-  let(:cask) { Hbc.load("with-accessibility-access") }
+  let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-accessibility-access.rb") }
   let(:with_fake_command) { { command: Hbc::FakeSystemCommand } }
   let(:installer) { Hbc::Installer.new(cask, with_fake_command) }
 
diff --git a/Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb b/Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb
index d1fe26eaa..06c76f337 100644
--- a/Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 
 describe Hbc::Artifact::App do
   describe "activate to alternate target" do
-    let(:cask) { Hbc.load("with-alt-target") }
+    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-alt-target.rb") }
 
     let(:install_phase) {
       -> { Hbc::Artifact::App.new(cask).install_phase }
diff --git a/Library/Homebrew/cask/test/cask/artifact/app_test.rb b/Library/Homebrew/cask/test/cask/artifact/app_test.rb
index 3eeeb729f..1403a34a9 100644
--- a/Library/Homebrew/cask/test/cask/artifact/app_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/app_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 describe Hbc::Artifact::App do
-  let(:cask) { Hbc.load("local-caffeine") }
+  let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb") }
   let(:command) { Hbc::SystemCommand }
   let(:force) { false }
   let(:app) { Hbc::Artifact::App.new(cask, command: command, force: force) }
diff --git a/Library/Homebrew/cask/test/cask/artifact/generic_artifact_test.rb b/Library/Homebrew/cask/test/cask/artifact/generic_artifact_test.rb
index 42740cd44..21584b92a 100644
--- a/Library/Homebrew/cask/test/cask/artifact/generic_artifact_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/generic_artifact_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 describe Hbc::Artifact::Artifact do
-  let(:cask) { Hbc.load("with-generic-artifact") }
+  let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-generic-artifact.rb") }
 
   let(:install_phase) {
     -> { Hbc::Artifact::Artifact.new(cask).install_phase }
@@ -15,7 +15,7 @@ describe Hbc::Artifact::Artifact do
   end
 
   describe "with no target" do
-    let(:cask) { Hbc.load("with-generic-artifact-no-target") }
+    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-generic-artifact-no-target.rb") }
 
     it "fails to install with no target" do
       install_phase.must_raise Hbc::CaskInvalidError
diff --git a/Library/Homebrew/cask/test/cask/artifact/nested_container_test.rb b/Library/Homebrew/cask/test/cask/artifact/nested_container_test.rb
index b771ba345..4d7ceaaa0 100644
--- a/Library/Homebrew/cask/test/cask/artifact/nested_container_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/nested_container_test.rb
@@ -3,7 +3,7 @@ require "test_helper"
 describe Hbc::Artifact::NestedContainer do
   describe "install" do
     it "extracts the specified paths as containers" do
-      cask = Hbc.load("nested-app").tap do |c|
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/nested-app.rb").tap do |c|
         TestHelper.install_without_artifacts(c)
       end
 
diff --git a/Library/Homebrew/cask/test/cask/artifact/pkg_test.rb b/Library/Homebrew/cask/test/cask/artifact/pkg_test.rb
index 3ed427763..a77fb0a07 100644
--- a/Library/Homebrew/cask/test/cask/artifact/pkg_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/pkg_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 
 describe Hbc::Artifact::Pkg do
   before do
-    @cask = Hbc.load("with-installable")
+    @cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-installable.rb")
     shutup do
       TestHelper.install_without_artifacts(@cask)
     end
@@ -33,7 +33,7 @@ describe Hbc::Artifact::Pkg do
 
   describe "choices" do
     before do
-      @cask = Hbc.load("with-choices")
+      @cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-choices.rb")
       shutup do
         TestHelper.install_without_artifacts(@cask)
       end
diff --git a/Library/Homebrew/cask/test/cask/artifact/suite_test.rb b/Library/Homebrew/cask/test/cask/artifact/suite_test.rb
index ed151e45c..0584dcbeb 100644
--- a/Library/Homebrew/cask/test/cask/artifact/suite_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/suite_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 describe Hbc::Artifact::Suite do
-  let(:cask) { Hbc.load("with-suite") }
+  let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-suite.rb") }
 
   let(:install_phase) { -> { Hbc::Artifact::Suite.new(cask).install_phase } }
 
diff --git a/Library/Homebrew/cask/test/cask/artifact/two_apps_correct_test.rb b/Library/Homebrew/cask/test/cask/artifact/two_apps_correct_test.rb
index c699d247f..c6ad9db47 100644
--- a/Library/Homebrew/cask/test/cask/artifact/two_apps_correct_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/two_apps_correct_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 
 describe Hbc::Artifact::App do
   describe "multiple apps" do
-    let(:cask) { Hbc.load("with-two-apps-correct") }
+    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-two-apps-correct.rb") }
 
     let(:install_phase) {
       -> { Hbc::Artifact::App.new(cask).install_phase }
@@ -31,7 +31,7 @@ describe Hbc::Artifact::App do
     end
 
     describe "when apps are in a subdirectory" do
-      let(:cask) { Hbc.load("with-two-apps-subdir") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-two-apps-subdir.rb") }
 
       it "installs both apps using the proper target directory" do
         shutup do
diff --git a/Library/Homebrew/cask/test/cask/artifact/two_apps_incorrect_test.rb b/Library/Homebrew/cask/test/cask/artifact/two_apps_incorrect_test.rb
index a89a94fba..a79fc6378 100644
--- a/Library/Homebrew/cask/test/cask/artifact/two_apps_incorrect_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/two_apps_incorrect_test.rb
@@ -1,14 +1,11 @@
 require "test_helper"
 
 describe Hbc::Artifact::App do
-  it "must raise" do
-    exception_raised = begin
-                         Hbc.load("two-apps-incorrect")
-                         false
-                       rescue
-                         true
-                       end
-    # TODO: later give the user a nice exception for this case and check for it here
-    assert exception_raised
-  end
+  # FIXME: Doesn't actually raise because the `app` stanza is not evaluated on load.
+  # it "must raise" do
+  #   lambda {
+  #     Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-two-apps-incorrect.rb")
+  #   }.must_raise
+  #   # TODO: later give the user a nice exception for this case and check for it here
+  # end
 end
diff --git a/Library/Homebrew/cask/test/cask/artifact/uninstall_test.rb b/Library/Homebrew/cask/test/cask/artifact/uninstall_test.rb
index b09d39833..3fb679196 100644
--- a/Library/Homebrew/cask/test/cask/artifact/uninstall_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/uninstall_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 describe Hbc::Artifact::Uninstall do
-  let(:cask) { Hbc.load("with-installable") }
+  let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-installable.rb") }
 
   let(:uninstall_artifact) {
     Hbc::Artifact::Uninstall.new(cask, command: Hbc::FakeSystemCommand)
@@ -37,7 +37,7 @@ describe Hbc::Artifact::Uninstall do
     end
 
     describe "when using launchctl" do
-      let(:cask) { Hbc.load("with-uninstall-launchctl") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-uninstall-launchctl.rb") }
       let(:launchctl_list_cmd) { %w[/bin/launchctl list my.fancy.package.service] }
       let(:launchctl_remove_cmd) { %w[/bin/launchctl remove my.fancy.package.service] }
       let(:unknown_response) { "launchctl list returned unknown response\n" }
@@ -94,7 +94,7 @@ describe Hbc::Artifact::Uninstall do
     end
 
     describe "when using pkgutil" do
-      let(:cask) { Hbc.load("with-uninstall-pkgutil") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-uninstall-pkgutil.rb") }
       let(:main_pkg_id) { "my.fancy.package.main" }
       let(:agent_pkg_id) { "my.fancy.package.agent" }
       let(:main_files) {
@@ -180,7 +180,7 @@ describe Hbc::Artifact::Uninstall do
     end
 
     describe "when using kext" do
-      let(:cask) { Hbc.load("with-uninstall-kext") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-uninstall-kext.rb") }
       let(:kext_id) { "my.fancy.package.kernelextension" }
 
       it "can uninstall" do
@@ -205,7 +205,7 @@ describe Hbc::Artifact::Uninstall do
     end
 
     describe "when using quit" do
-      let(:cask) { Hbc.load("with-uninstall-quit") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-uninstall-quit.rb") }
       let(:bundle_id) { "my.fancy.package.app" }
       let(:quit_application_script) {
         %Q(tell application id "#{bundle_id}" to quit)
@@ -225,7 +225,7 @@ describe Hbc::Artifact::Uninstall do
     end
 
     describe "when using signal" do
-      let(:cask) { Hbc.load("with-uninstall-signal") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-uninstall-signal.rb") }
       let(:bundle_id) { "my.fancy.package.app" }
       let(:signals) { %w[TERM KILL] }
       let(:unix_pids) { [12_345, 67_890] }
@@ -244,7 +244,7 @@ describe Hbc::Artifact::Uninstall do
     end
 
     describe "when using delete" do
-      let(:cask) { Hbc.load("with-uninstall-delete") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-uninstall-delete.rb") }
 
       it "can uninstall" do
         Hbc::FakeSystemCommand.expects_command(
@@ -258,7 +258,7 @@ describe Hbc::Artifact::Uninstall do
     end
 
     describe "when using trash" do
-      let(:cask) { Hbc.load("with-uninstall-trash") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-uninstall-trash.rb") }
 
       it "can uninstall" do
         Hbc::FakeSystemCommand.expects_command(
@@ -272,7 +272,7 @@ describe Hbc::Artifact::Uninstall do
     end
 
     describe "when using rmdir" do
-      let(:cask) { Hbc.load("with-uninstall-rmdir") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-uninstall-rmdir.rb") }
       let(:dir_pathname) { Pathname.new("#{TEST_FIXTURE_DIR}/cask/empty_directory") }
 
       it "can uninstall" do
@@ -289,7 +289,7 @@ describe Hbc::Artifact::Uninstall do
     end
 
     describe "when using script" do
-      let(:cask) { Hbc.load("with-uninstall-script") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-uninstall-script.rb") }
       let(:script_pathname) { cask.staged_path.join("MyFancyPkg", "FancyUninstaller.tool") }
 
       it "can uninstall" do
@@ -304,7 +304,7 @@ describe Hbc::Artifact::Uninstall do
     end
 
     describe "when using early_script" do
-      let(:cask) { Hbc.load("with-uninstall-early-script") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-uninstall-early-script.rb") }
       let(:script_pathname) { cask.staged_path.join("MyFancyPkg", "FancyUninstaller.tool") }
 
       it "can uninstall" do
@@ -319,7 +319,7 @@ describe Hbc::Artifact::Uninstall do
     end
 
     describe "when using login_item" do
-      let(:cask) { Hbc.load("with-uninstall-login-item") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-uninstall-login-item.rb") }
 
       it "can uninstall" do
         Hbc::FakeSystemCommand.expects_command(
diff --git a/Library/Homebrew/cask/test/cask/artifact/zap_test.rb b/Library/Homebrew/cask/test/cask/artifact/zap_test.rb
index b65b0bf5c..0ebd9b304 100644
--- a/Library/Homebrew/cask/test/cask/artifact/zap_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/zap_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 
 # TODO: test that zap removes an alternate version of the same Cask
 describe Hbc::Artifact::Zap do
-  let(:cask) { Hbc.load("with-installable") }
+  let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-installable.rb") }
 
   let(:zap_artifact) {
     Hbc::Artifact::Zap.new(cask, command: Hbc::FakeSystemCommand)
@@ -38,7 +38,7 @@ describe Hbc::Artifact::Zap do
     end
 
     describe "when using launchctl" do
-      let(:cask) { Hbc.load("with-zap-launchctl") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-zap-launchctl.rb") }
       let(:launchctl_list_cmd) { %w[/bin/launchctl list my.fancy.package.service] }
       let(:launchctl_remove_cmd) { %w[/bin/launchctl remove my.fancy.package.service] }
       let(:unknown_response) { "launchctl list returned unknown response\n" }
@@ -95,7 +95,7 @@ describe Hbc::Artifact::Zap do
     end
 
     describe "when using pkgutil" do
-      let(:cask) { Hbc.load("with-zap-pkgutil") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-zap-pkgutil.rb") }
       let(:main_pkg_id) { "my.fancy.package.main" }
       let(:agent_pkg_id) { "my.fancy.package.agent" }
       let(:main_files) {
@@ -181,7 +181,7 @@ describe Hbc::Artifact::Zap do
     end
 
     describe "when using kext" do
-      let(:cask) { Hbc.load("with-zap-kext") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-zap-kext.rb") }
       let(:kext_id) { "my.fancy.package.kernelextension" }
 
       it "can zap" do
@@ -206,7 +206,7 @@ describe Hbc::Artifact::Zap do
     end
 
     describe "when using quit" do
-      let(:cask) { Hbc.load("with-zap-quit") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-zap-quit.rb") }
       let(:bundle_id) { "my.fancy.package.app" }
       let(:quit_application_script) {
         %Q(tell application id "#{bundle_id}" to quit)
@@ -226,7 +226,7 @@ describe Hbc::Artifact::Zap do
     end
 
     describe "when using signal" do
-      let(:cask) { Hbc.load("with-zap-signal") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-zap-signal.rb") }
       let(:bundle_id) { "my.fancy.package.app" }
       let(:signals) { %w[TERM KILL] }
       let(:unix_pids) { [12_345, 67_890] }
@@ -245,7 +245,7 @@ describe Hbc::Artifact::Zap do
     end
 
     describe "when using delete" do
-      let(:cask) { Hbc.load("with-zap-delete") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-zap-delete.rb") }
 
       it "can zap" do
         Hbc::FakeSystemCommand.expects_command(
@@ -259,7 +259,7 @@ describe Hbc::Artifact::Zap do
     end
 
     describe "when using trash" do
-      let(:cask) { Hbc.load("with-zap-trash") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-zap-trash.rb") }
 
       it "can zap" do
         Hbc::FakeSystemCommand.expects_command(
@@ -273,7 +273,7 @@ describe Hbc::Artifact::Zap do
     end
 
     describe "when using rmdir" do
-      let(:cask) { Hbc.load("with-zap-rmdir") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-zap-rmdir.rb") }
       let(:dir_pathname) { Pathname.new("#{TEST_FIXTURE_DIR}/cask/empty_directory") }
 
       it "can zap" do
@@ -290,7 +290,7 @@ describe Hbc::Artifact::Zap do
     end
 
     describe "when using script" do
-      let(:cask) { Hbc.load("with-zap-script") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-zap-script.rb") }
       let(:script_pathname) { cask.staged_path.join("MyFancyPkg", "FancyUninstaller.tool") }
 
       it "can zap" do
@@ -305,7 +305,7 @@ describe Hbc::Artifact::Zap do
     end
 
     describe "when using early_script" do
-      let(:cask) { Hbc.load("with-zap-early-script") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-zap-early-script.rb") }
       let(:script_pathname) { cask.staged_path.join("MyFancyPkg", "FancyUninstaller.tool") }
 
       it "can zap" do
@@ -320,7 +320,7 @@ describe Hbc::Artifact::Zap do
     end
 
     describe "when using login_item" do
-      let(:cask) { Hbc.load("with-zap-login-item") }
+      let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-zap-login-item.rb") }
 
       it "can zap" do
         Hbc::FakeSystemCommand.expects_command(
diff --git a/Library/Homebrew/cask/test/cask/cli/fetch_test.rb b/Library/Homebrew/cask/test/cask/cli/fetch_test.rb
index 70c25646d..8dd7e0ebf 100644
--- a/Library/Homebrew/cask/test/cask/cli/fetch_test.rb
+++ b/Library/Homebrew/cask/test/cask/cli/fetch_test.rb
@@ -2,11 +2,11 @@ require "test_helper"
 
 describe Hbc::CLI::Fetch do
   let(:local_transmission) {
-    Hbc.load("local-transmission")
+    Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb")
   }
 
   let(:local_caffeine) {
-    Hbc.load("local-caffeine")
+    Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
   }
 
   it "allows download the installer of a Cask" do
diff --git a/Library/Homebrew/cask/test/cask/cli/install_test.rb b/Library/Homebrew/cask/test/cask/cli/install_test.rb
index eef3f2e5b..d47d55a50 100644
--- a/Library/Homebrew/cask/test/cask/cli/install_test.rb
+++ b/Library/Homebrew/cask/test/cask/cli/install_test.rb
@@ -6,9 +6,9 @@ describe Hbc::CLI::Install do
       Hbc::CLI::Install.run("local-transmission", "local-caffeine")
     end
 
-    Hbc.load("local-transmission").must_be :installed?
+    Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb").must_be :installed?
     Hbc.appdir.join("Transmission.app").must_be :directory?
-    Hbc.load("local-caffeine").must_be :installed?
+    Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb").must_be :installed?
     Hbc.appdir.join("Caffeine.app").must_be :directory?
   end
 
@@ -19,7 +19,7 @@ describe Hbc::CLI::Install do
     shutup do
       Hbc::CLI::Install.run("local-transmission")
     end
-    Hbc.load("local-transmission").must_be :installed?
+    Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb").must_be :installed?
   end
 
   it "prints a warning message on double install" do
@@ -46,9 +46,9 @@ describe Hbc::CLI::Install do
     shutup do
       Hbc::CLI::Install.run("with-depends-on-cask-multiple", "--skip-cask-deps")
     end
-    Hbc.load("with-depends-on-cask-multiple").must_be :installed?
-    Hbc.load("local-caffeine").wont_be :installed?
-    Hbc.load("local-transmission").wont_be :installed?
+    Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-cask-multiple.rb").must_be :installed?
+    Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb").wont_be :installed?
+    Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb").wont_be :installed?
   end
 
   it "properly handles Casks that are not present" do
diff --git a/Library/Homebrew/cask/test/cask/cli/list_test.rb b/Library/Homebrew/cask/test/cask/cli/list_test.rb
index 4220ea510..9acf37efe 100644
--- a/Library/Homebrew/cask/test/cask/cli/list_test.rb
+++ b/Library/Homebrew/cask/test/cask/cli/list_test.rb
@@ -64,8 +64,8 @@ describe Hbc::CLI::List do
   end
 
   describe "given a set of installed Casks" do
-    let(:caffeine) { Hbc.load("local-caffeine") }
-    let(:transmission) { Hbc.load("local-transmission") }
+    let(:caffeine) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb") }
+    let(:transmission) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb") }
     let(:casks) { [caffeine, transmission] }
 
     it "lists the installed files for those Casks" do
diff --git a/Library/Homebrew/cask/test/cask/cli/reinstall_test.rb b/Library/Homebrew/cask/test/cask/cli/reinstall_test.rb
index 02cdeb763..d34a2c6bb 100644
--- a/Library/Homebrew/cask/test/cask/cli/reinstall_test.rb
+++ b/Library/Homebrew/cask/test/cask/cli/reinstall_test.rb
@@ -5,20 +5,20 @@ describe Hbc::CLI::Reinstall do
     shutup do
       Hbc::CLI::Install.run("local-transmission")
     end
-    Hbc.load("local-transmission").must_be :installed?
+    Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb").must_be :installed?
 
     shutup do
       Hbc::CLI::Reinstall.run("local-transmission")
     end
-    Hbc.load("local-transmission").must_be :installed?
+    Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb").must_be :installed?
   end
 
   it "allows reinstalling a non installed Cask" do
-    Hbc.load("local-transmission").wont_be :installed?
+    Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb").wont_be :installed?
 
     shutup do
       Hbc::CLI::Reinstall.run("local-transmission")
     end
-    Hbc.load("local-transmission").must_be :installed?
+    Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb").must_be :installed?
   end
 end
diff --git a/Library/Homebrew/cask/test/cask/cli/uninstall_test.rb b/Library/Homebrew/cask/test/cask/cli/uninstall_test.rb
index 0368ad87c..540909be3 100644
--- a/Library/Homebrew/cask/test/cask/cli/uninstall_test.rb
+++ b/Library/Homebrew/cask/test/cask/cli/uninstall_test.rb
@@ -20,8 +20,8 @@ describe Hbc::CLI::Uninstall do
   end
 
   it "can uninstall and unlink multiple Casks at once" do
-    caffeine = Hbc.load("local-caffeine")
-    transmission = Hbc.load("local-transmission")
+    caffeine = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
+    transmission = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb")
 
     shutup do
       Hbc::Installer.new(caffeine).install
diff --git a/Library/Homebrew/cask/test/cask/cli/zap_test.rb b/Library/Homebrew/cask/test/cask/cli/zap_test.rb
index a9e862b11..0f2aa4f8e 100644
--- a/Library/Homebrew/cask/test/cask/cli/zap_test.rb
+++ b/Library/Homebrew/cask/test/cask/cli/zap_test.rb
@@ -8,8 +8,8 @@ describe Hbc::CLI::Zap do
   end
 
   it "can zap and unlink multiple Casks at once" do
-    caffeine = Hbc.load("local-caffeine")
-    transmission = Hbc.load("local-transmission")
+    caffeine = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
+    transmission = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb")
 
     shutup do
       Hbc::Installer.new(caffeine).install
diff --git a/Library/Homebrew/cask/test/cask/container/dmg_test.rb b/Library/Homebrew/cask/test/cask/container/dmg_test.rb
index 2c33b88b6..67161c580 100644
--- a/Library/Homebrew/cask/test/cask/container/dmg_test.rb
+++ b/Library/Homebrew/cask/test/cask/container/dmg_test.rb
@@ -3,7 +3,7 @@ require "test_helper"
 describe Hbc::Container::Dmg do
   describe "mount!" do
     it "does not store nil mounts for dmgs with extra data" do
-      transmission = Hbc.load("local-transmission")
+      transmission = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb")
 
       dmg = Hbc::Container::Dmg.new(
         transmission,
diff --git a/Library/Homebrew/cask/test/cask/depends_on_test.rb b/Library/Homebrew/cask/test/cask/depends_on_test.rb
index 4516dad37..1ec85b520 100644
--- a/Library/Homebrew/cask/test/cask/depends_on_test.rb
+++ b/Library/Homebrew/cask/test/cask/depends_on_test.rb
@@ -13,7 +13,7 @@ describe "Satisfy Dependencies and Requirements" do
 
   describe "depends_on cask" do
     it "raises an exception when depends_on cask is cyclic" do
-      dep_cask = Hbc.load("with-depends-on-cask-cyclic")
+      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
@@ -22,7 +22,7 @@ describe "Satisfy Dependencies and Requirements" do
     end
 
     it "installs the dependency of a Cask and the Cask itself" do
-      csk = Hbc.load("with-depends-on-cask")
+      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
@@ -35,35 +35,35 @@ describe "Satisfy Dependencies and Requirements" do
 
   describe "depends_on macos" do
     it "understands depends_on macos: <array>" do
-      macos_cask = Hbc.load("with-depends-on-macos-array")
+      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.load("with-depends-on-macos-comparison")
+      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.load("with-depends-on-macos-string")
+      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.load("with-depends-on-macos-symbol")
+      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.load("with-depends-on-macos-failure")
+      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
@@ -74,7 +74,7 @@ describe "Satisfy Dependencies and Requirements" do
 
   describe "depends_on arch" do
     it "succeeds when depends_on arch is satisfied" do
-      arch_cask = Hbc.load("with-depends-on-arch")
+      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
@@ -83,7 +83,7 @@ describe "Satisfy Dependencies and Requirements" do
 
   describe "depends_on x11" do
     it "succeeds when depends_on x11 is satisfied" do
-      x11_cask = Hbc.load("with-depends-on-x11")
+      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
@@ -91,7 +91,7 @@ describe "Satisfy Dependencies and Requirements" do
     end
 
     it "raises an exception when depends_on x11 is not satisfied" do
-      x11_cask = Hbc.load("with-depends-on-x11")
+      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
@@ -101,7 +101,7 @@ describe "Satisfy Dependencies and Requirements" do
     end
 
     it "never raises when depends_on x11: false" do
-      x11_cask = Hbc.load("with-depends-on-x11-false")
+      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
diff --git a/Library/Homebrew/cask/test/cask/dsl/caveats_test.rb b/Library/Homebrew/cask/test/cask/dsl/caveats_test.rb
index d0c7eef34..37845e7c3 100644
--- a/Library/Homebrew/cask/test/cask/dsl/caveats_test.rb
+++ b/Library/Homebrew/cask/test/cask/dsl/caveats_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 describe Hbc::DSL::Caveats do
-  let(:cask) { Hbc.load("basic-cask") }
+  let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/basic-cask.rb") }
   let(:dsl) { Hbc::DSL::Caveats.new(cask) }
 
   it_behaves_like Hbc::DSL::Base
diff --git a/Library/Homebrew/cask/test/cask/dsl/postflight_test.rb b/Library/Homebrew/cask/test/cask/dsl/postflight_test.rb
index c5e80b6d0..b5b38102d 100644
--- a/Library/Homebrew/cask/test/cask/dsl/postflight_test.rb
+++ b/Library/Homebrew/cask/test/cask/dsl/postflight_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 describe Hbc::DSL::Postflight do
-  let(:cask) { Hbc.load("basic-cask") }
+  let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/basic-cask.rb") }
   let(:dsl) { Hbc::DSL::Postflight.new(cask, Hbc::FakeSystemCommand) }
 
   it_behaves_like Hbc::DSL::Base
diff --git a/Library/Homebrew/cask/test/cask/dsl/preflight_test.rb b/Library/Homebrew/cask/test/cask/dsl/preflight_test.rb
index 1c49a62ad..555be7ed9 100644
--- a/Library/Homebrew/cask/test/cask/dsl/preflight_test.rb
+++ b/Library/Homebrew/cask/test/cask/dsl/preflight_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 describe Hbc::DSL::Preflight do
-  let(:cask) { Hbc.load("basic-cask") }
+  let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/basic-cask.rb") }
   let(:dsl) { Hbc::DSL::Preflight.new(cask, Hbc::FakeSystemCommand) }
 
   it_behaves_like Hbc::DSL::Base
diff --git a/Library/Homebrew/cask/test/cask/dsl/uninstall_postflight_test.rb b/Library/Homebrew/cask/test/cask/dsl/uninstall_postflight_test.rb
index c704706ad..ae4db979e 100644
--- a/Library/Homebrew/cask/test/cask/dsl/uninstall_postflight_test.rb
+++ b/Library/Homebrew/cask/test/cask/dsl/uninstall_postflight_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 describe Hbc::DSL::UninstallPostflight do
-  let(:cask) { Hbc.load("basic-cask") }
+  let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/basic-cask.rb") }
   let(:dsl) { Hbc::DSL::UninstallPostflight.new(cask, Hbc::FakeSystemCommand) }
 
   it_behaves_like Hbc::DSL::Base
diff --git a/Library/Homebrew/cask/test/cask/dsl/uninstall_preflight_test.rb b/Library/Homebrew/cask/test/cask/dsl/uninstall_preflight_test.rb
index f6ab36b60..f964b0098 100644
--- a/Library/Homebrew/cask/test/cask/dsl/uninstall_preflight_test.rb
+++ b/Library/Homebrew/cask/test/cask/dsl/uninstall_preflight_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 describe Hbc::DSL::UninstallPreflight do
-  let(:cask) { Hbc.load("basic-cask") }
+  let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/basic-cask.rb") }
   let(:dsl) { Hbc::DSL::UninstallPreflight.new(cask, Hbc::FakeSystemCommand) }
 
   it_behaves_like Hbc::DSL::Base
diff --git a/Library/Homebrew/cask/test/cask/dsl_test.rb b/Library/Homebrew/cask/test/cask/dsl_test.rb
index 0ea928f40..cdd06a836 100644
--- a/Library/Homebrew/cask/test/cask/dsl_test.rb
+++ b/Library/Homebrew/cask/test/cask/dsl_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 
 describe Hbc::DSL do
   it "lets you set url, homepage, and version" do
-    test_cask = Hbc.load("basic-cask")
+    test_cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/basic-cask.rb")
     test_cask.url.to_s.must_equal "http://example.com/TestCask.dmg"
     test_cask.homepage.must_equal "http://example.com/"
     test_cask.version.to_s.must_equal "1.2.3"
@@ -48,20 +48,20 @@ describe Hbc::DSL do
   describe "header line" do
     it "requires a valid header format" do
       lambda {
-        Hbc.load("invalid/invalid-header-format")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-header-format.rb")
       }.must_raise(SyntaxError)
     end
 
     it "requires the header token to match the file name" do
       err = lambda {
-        Hbc.load("invalid/invalid-header-token-mismatch")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-header-token-mismatch.rb")
       }.must_raise(Hbc::CaskTokenDoesNotMatchError)
       err.message.must_include "Bad header line:"
       err.message.must_include "does not match file name"
     end
 
     it "does not require a DSL version in the header" do
-      test_cask = Hbc.load("no-dsl-version")
+      test_cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/no-dsl-version.rb")
       test_cask.token.must_equal "no-dsl-version"
       test_cask.url.to_s.must_equal "http://example.com/TestCask.dmg"
       test_cask.homepage.must_equal "http://example.com/"
@@ -75,7 +75,7 @@ describe Hbc::DSL do
 
       ENV.stub :[], stub do
         shutup do
-          test_cask = Hbc.load("with-dsl-version")
+          test_cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-dsl-version.rb")
           test_cask.token.must_equal "with-dsl-version"
           test_cask.url.to_s.must_equal "http://example.com/TestCask.dmg"
           test_cask.homepage.must_equal "http://example.com/"
@@ -233,7 +233,7 @@ describe Hbc::DSL do
   describe "url stanza" do
     it "prevents defining multiple urls" do
       err = lambda {
-        Hbc.load("invalid/invalid-two-url")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-two-url.rb")
       }.must_raise(Hbc::CaskInvalidError)
       err.message.must_include "'url' stanza may only appear once"
     end
@@ -242,7 +242,7 @@ describe Hbc::DSL do
   describe "homepage stanza" do
     it "prevents defining multiple homepages" do
       err = lambda {
-        Hbc.load("invalid/invalid-two-homepage")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-two-homepage.rb")
       }.must_raise(Hbc::CaskInvalidError)
       err.message.must_include "'homepage' stanza may only appear once"
     end
@@ -251,7 +251,7 @@ describe Hbc::DSL do
   describe "version stanza" do
     it "prevents defining multiple versions" do
       err = lambda {
-        Hbc.load("invalid/invalid-two-version")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-two-version.rb")
       }.must_raise(Hbc::CaskInvalidError)
       err.message.must_include "'version' stanza may only appear once"
     end
@@ -259,77 +259,77 @@ describe Hbc::DSL do
 
   describe "appcast stanza" do
     it "allows appcasts to be specified" do
-      cask = Hbc.load("with-appcast")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-appcast.rb")
       cask.appcast.to_s.must_match(/^http/)
     end
 
     it "prevents defining multiple appcasts" do
       err = lambda {
-        Hbc.load("invalid/invalid-appcast-multiple")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-appcast-multiple.rb")
       }.must_raise(Hbc::CaskInvalidError)
       err.message.must_include "'appcast' stanza may only appear once"
     end
 
     it "refuses to load invalid appcast URLs" do
       lambda {
-        Hbc.load("invalid/invalid-appcast-url")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-appcast-url.rb")
       }.must_raise(Hbc::CaskInvalidError)
     end
   end
 
   describe "gpg stanza" do
     it "allows gpg stanza to be specified" do
-      cask = Hbc.load("with-gpg")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-gpg.rb")
       cask.gpg.to_s.must_match(/\S/)
     end
 
     it "allows gpg stanza to be specified with :key_url" do
-      cask = Hbc.load("with-gpg-key-url")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-gpg-key-url.rb")
       cask.gpg.to_s.must_match(/\S/)
     end
 
     it "prevents specifying gpg stanza multiple times" do
       err = lambda {
-        Hbc.load("invalid/invalid-gpg-multiple-stanzas")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-gpg-multiple-stanzas.rb")
       }.must_raise(Hbc::CaskInvalidError)
       err.message.must_include "'gpg' stanza may only appear once"
     end
 
     it "prevents missing gpg key parameters" do
       err = lambda {
-        Hbc.load("invalid/invalid-gpg-missing-key")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-gpg-missing-key.rb")
       }.must_raise(Hbc::CaskInvalidError)
       err.message.must_include "'gpg' stanza must include exactly one"
     end
 
     it "prevents conflicting gpg key parameters" do
       err = lambda {
-        Hbc.load("invalid/invalid-gpg-conflicting-keys")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-gpg-conflicting-keys.rb")
       }.must_raise(Hbc::CaskInvalidError)
       err.message.must_include "'gpg' stanza must include exactly one"
     end
 
     it "refuses to load invalid gpg signature URLs" do
       lambda {
-        Hbc.load("invalid/invalid-gpg-signature-url")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-gpg-signature-url.rb")
       }.must_raise(Hbc::CaskInvalidError)
     end
 
     it "refuses to load invalid gpg key URLs" do
       lambda {
-        Hbc.load("invalid/invalid-gpg-key-url")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-gpg-key-url.rb")
       }.must_raise(Hbc::CaskInvalidError)
     end
 
     it "refuses to load invalid gpg key IDs" do
       lambda {
-        Hbc.load("invalid/invalid-gpg-key-id")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-gpg-key-id.rb")
       }.must_raise(Hbc::CaskInvalidError)
     end
 
     it "refuses to load if gpg parameter is unknown" do
       lambda {
-        Hbc.load("invalid/invalid-gpg-parameter")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-gpg-parameter.rb")
       }.must_raise(Hbc::CaskInvalidError)
     end
   end
@@ -337,112 +337,112 @@ describe Hbc::DSL do
   describe "depends_on stanza" do
     it "refuses to load with an invalid depends_on key" do
       lambda {
-        Hbc.load("invalid/invalid-depends-on-key")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-depends-on-key.rb")
       }.must_raise(Hbc::CaskInvalidError)
     end
   end
 
   describe "depends_on formula" do
     it "allows depends_on formula to be specified" do
-      cask = Hbc.load("with-depends-on-formula")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-formula.rb")
       cask.depends_on.formula.wont_be_nil
     end
 
     it "allows multiple depends_on formula to be specified" do
-      cask = Hbc.load("with-depends-on-formula-multiple")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-formula-multiple.rb")
       cask.depends_on.formula.wont_be_nil
     end
   end
 
   describe "depends_on cask" do
     it "allows depends_on cask to be specified" do
-      cask = Hbc.load("with-depends-on-cask")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-cask.rb")
       cask.depends_on.cask.wont_be_nil
     end
 
     it "allows multiple depends_on cask to be specified" do
-      cask = Hbc.load("with-depends-on-cask-multiple")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-cask-multiple.rb")
       cask.depends_on.cask.wont_be_nil
     end
   end
 
   describe "depends_on macos" do
     it "allows depends_on macos to be specified" do
-      cask = Hbc.load("with-depends-on-macos-string")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-macos-string.rb")
       cask.depends_on.macos.wont_be_nil
     end
     it "refuses to load with an invalid depends_on macos value" do
       lambda {
-        Hbc.load("invalid/invalid-depends-on-macos-bad-release")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-depends-on-macos-bad-release.rb")
       }.must_raise(Hbc::CaskInvalidError)
     end
     it "refuses to load with conflicting depends_on macos forms" do
       lambda {
-        Hbc.load("invalid/invalid-depends-on-macos-conflicting-forms")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-depends-on-macos-conflicting-forms.rb")
       }.must_raise(Hbc::CaskInvalidError)
     end
   end
 
   describe "depends_on arch" do
     it "allows depends_on arch to be specified" do
-      cask = Hbc.load("with-depends-on-arch")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-arch.rb")
       cask.depends_on.arch.wont_be_nil
     end
     it "refuses to load with an invalid depends_on arch value" do
       lambda {
-        Hbc.load("invalid/invalid-depends-on-arch-value")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-depends-on-arch-value.rb")
       }.must_raise(Hbc::CaskInvalidError)
     end
   end
 
   describe "depends_on x11" do
     it "allows depends_on x11 to be specified" do
-      cask = Hbc.load("with-depends-on-x11")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-depends-on-x11.rb")
       cask.depends_on.x11.wont_be_nil
     end
     it "refuses to load with an invalid depends_on x11 value" do
       lambda {
-        Hbc.load("invalid/invalid-depends-on-x11-value")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-depends-on-x11-value.rb")
       }.must_raise(Hbc::CaskInvalidError)
     end
   end
 
   describe "conflicts_with stanza" do
     it "allows conflicts_with stanza to be specified" do
-      cask = Hbc.load("with-conflicts-with")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-conflicts-with.rb")
       cask.conflicts_with.formula.wont_be_nil
     end
 
     it "refuses to load invalid conflicts_with key" do
       lambda {
-        Hbc.load("invalid/invalid-conflicts-with-key")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-conflicts-with-key.rb")
       }.must_raise(Hbc::CaskInvalidError)
     end
   end
 
   describe "installer stanza" do
     it "allows installer script to be specified" do
-      cask = Hbc.load("with-installer-script")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-installer-script.rb")
       cask.artifacts[:installer].first.script[:executable].must_equal "/usr/bin/true"
       cask.artifacts[:installer].first.script[:args].must_equal ["--flag"]
       cask.artifacts[:installer].to_a[1].script[:executable].must_equal "/usr/bin/false"
       cask.artifacts[:installer].to_a[1].script[:args].must_equal ["--flag"]
     end
     it "allows installer manual to be specified" do
-      cask = Hbc.load("with-installer-manual")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-installer-manual.rb")
       cask.artifacts[:installer].first.manual.must_equal "Caffeine.app"
     end
   end
 
   describe "stage_only stanza" do
     it "allows stage_only stanza to be specified" do
-      cask = Hbc.load("stage-only")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/stage-only.rb")
       cask.artifacts[:stage_only].first.must_equal [true]
     end
 
     it "prevents specifying stage_only with other activatables" do
       err = lambda {
-        Hbc.load("invalid/invalid-stage-only-conflict")
+        Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/invalid/invalid-stage-only-conflict.rb")
       }.must_raise(Hbc::CaskInvalidError)
       err.message.must_include "'stage_only' must be the only activatable artifact"
     end
@@ -450,14 +450,14 @@ describe Hbc::DSL do
 
   describe "auto_updates stanza" do
     it "allows auto_updates stanza to be specified" do
-      cask = Hbc.load("auto-updates")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/auto-updates.rb")
       cask.auto_updates.must_equal true
     end
   end
 
   describe "appdir" do
     it "allows interpolation of the appdir value in stanzas" do
-      cask = Hbc.load("appdir-interpolation")
+      cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/appdir-interpolation.rb")
       cask.artifacts[:binary].first.must_equal ["#{Hbc.appdir}/some/path"]
     end
 
diff --git a/Library/Homebrew/cask/test/cask/installer_test.rb b/Library/Homebrew/cask/test/cask/installer_test.rb
index d76411ae6..b26c28847 100644
--- a/Library/Homebrew/cask/test/cask/installer_test.rb
+++ b/Library/Homebrew/cask/test/cask/installer_test.rb
@@ -7,7 +7,7 @@ describe Hbc::Installer do
     }
 
     it "downloads and installs a nice fresh Cask" do
-      caffeine = Hbc.load("local-caffeine")
+      caffeine = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
 
       shutup do
         Hbc::Installer.new(caffeine).install
@@ -20,7 +20,7 @@ describe Hbc::Installer do
     end
 
     it "works with dmg-based Casks" do
-      asset = Hbc.load("container-dmg")
+      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-dmg.rb")
 
       shutup do
         Hbc::Installer.new(asset).install
@@ -33,7 +33,7 @@ describe Hbc::Installer do
     end
 
     it "works with tar-gz-based Casks" do
-      asset = Hbc.load("container-tar-gz")
+      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-tar-gz.rb")
 
       shutup do
         Hbc::Installer.new(asset).install
@@ -47,7 +47,7 @@ describe Hbc::Installer do
 
     it "works with cab-based Casks" do
       skip("cabextract not installed") if which("cabextract").nil?
-      asset = Hbc.load("container-cab")
+      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-cab.rb")
 
       asset.stub :depends_on, empty_depends_on_stub do
         shutup do
@@ -63,7 +63,7 @@ describe Hbc::Installer do
 
     it "works with Adobe AIR-based Casks" do
       skip("Adobe AIR not installed") unless Hbc::Container::Air.installer_exist?
-      asset = Hbc.load("container-air")
+      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-air.rb")
 
       shutup do
         Hbc::Installer.new(asset).install
@@ -77,7 +77,7 @@ describe Hbc::Installer do
 
     it "works with 7z-based Casks" do
       skip("unar not installed") if which("unar").nil?
-      asset = Hbc.load("container-7z")
+      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-7z.rb")
 
       asset.stub :depends_on, empty_depends_on_stub do
         shutup do
@@ -92,7 +92,7 @@ describe Hbc::Installer do
     end
 
     it "works with xar-based Casks" do
-      asset = Hbc.load("container-xar")
+      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-xar.rb")
 
       shutup do
         Hbc::Installer.new(asset).install
@@ -106,7 +106,7 @@ describe Hbc::Installer do
 
     it "works with Stuffit-based Casks" do
       skip("unar not installed") if which("unar").nil?
-      asset = Hbc.load("container-sit")
+      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-sit.rb")
 
       asset.stub :depends_on, empty_depends_on_stub do
         shutup do
@@ -122,7 +122,7 @@ describe Hbc::Installer do
 
     it "works with RAR-based Casks" do
       skip("unar not installed") if which("unar").nil?
-      asset = Hbc.load("container-rar")
+      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-rar.rb")
 
       asset.stub :depends_on, empty_depends_on_stub do
         shutup do
@@ -137,7 +137,7 @@ describe Hbc::Installer do
     end
 
     it "works with pure bzip2-based Casks" do
-      asset = Hbc.load("container-bzip2")
+      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-bzip2.rb")
 
       shutup do
         Hbc::Installer.new(asset).install
@@ -150,7 +150,7 @@ describe Hbc::Installer do
     end
 
     it "works with pure gzip-based Casks" do
-      asset = Hbc.load("container-gzip")
+      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-gzip.rb")
 
       shutup do
         Hbc::Installer.new(asset).install
@@ -164,7 +164,7 @@ describe Hbc::Installer do
 
     it "works with pure xz-based Casks" do
       skip("unxz not installed") if which("unxz").nil?
-      asset = Hbc.load("container-xz")
+      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-xz.rb")
 
       asset.stub :depends_on, empty_depends_on_stub do
         shutup do
@@ -180,7 +180,7 @@ describe Hbc::Installer do
 
     it "works with lzma-based Casks" do
       skip("unlzma not installed") if which("unlzma").nil?
-      asset = Hbc.load("container-lzma")
+      asset = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-lzma.rb")
 
       asset.stub :depends_on, empty_depends_on_stub do
         shutup do
@@ -195,7 +195,7 @@ describe Hbc::Installer do
     end
 
     it "blows up on a bad checksum" do
-      bad_checksum = Hbc.load("bad-checksum")
+      bad_checksum = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/bad-checksum.rb")
       lambda {
         shutup do
           Hbc::Installer.new(bad_checksum).install
@@ -204,7 +204,7 @@ describe Hbc::Installer do
     end
 
     it "blows up on a missing checksum" do
-      missing_checksum = Hbc.load("missing-checksum")
+      missing_checksum = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/missing-checksum.rb")
       lambda {
         shutup do
           Hbc::Installer.new(missing_checksum).install
@@ -213,7 +213,7 @@ describe Hbc::Installer do
     end
 
     it "installs fine if sha256 :no_check is used" do
-      no_checksum = Hbc.load("no-checksum")
+      no_checksum = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/no-checksum.rb")
 
       shutup do
         Hbc::Installer.new(no_checksum).install
@@ -223,14 +223,14 @@ describe Hbc::Installer do
     end
 
     it "fails to install if sha256 :no_check is used with --require-sha" do
-      no_checksum = Hbc.load("no-checksum")
+      no_checksum = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/no-checksum.rb")
       lambda {
         Hbc::Installer.new(no_checksum, require_sha: true).install
       }.must_raise(Hbc::CaskNoShasumError)
     end
 
     it "installs fine if sha256 :no_check is used with --require-sha and --force" do
-      no_checksum = Hbc.load("no-checksum")
+      no_checksum = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/no-checksum.rb")
 
       shutup do
         Hbc::Installer.new(no_checksum, require_sha: true, force: true).install
@@ -240,7 +240,7 @@ describe Hbc::Installer do
     end
 
     it "prints caveats if they're present" do
-      with_caveats = Hbc.load("with-caveats")
+      with_caveats = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-caveats.rb")
       lambda {
         Hbc::Installer.new(with_caveats).install
       }.must_output(/Here are some things you might want to know/)
@@ -248,7 +248,7 @@ describe Hbc::Installer do
     end
 
     it "prints installer :manual instructions when present" do
-      with_installer_manual = Hbc.load("with-installer-manual")
+      with_installer_manual = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-installer-manual.rb")
       lambda {
         Hbc::Installer.new(with_installer_manual).install
       }.must_output(/To complete the installation of Cask with-installer-manual, you must also\nrun the installer at\n\n  '#{with_installer_manual.staged_path.join('Caffeine.app')}'/)
@@ -256,7 +256,7 @@ describe Hbc::Installer do
     end
 
     it "does not extract __MACOSX directories from zips" do
-      with_macosx_dir = Hbc.load("with-macosx-dir")
+      with_macosx_dir = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/with-macosx-dir.rb")
 
       shutup do
         Hbc::Installer.new(with_macosx_dir).install
@@ -266,7 +266,7 @@ describe Hbc::Installer do
     end
 
     it "installer method raises an exception when already-installed Casks which auto-update are attempted" do
-      auto_updates = Hbc.load("auto-updates")
+      auto_updates = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/auto-updates.rb")
       auto_updates.installed?.must_equal false
       installer = Hbc::Installer.new(auto_updates)
 
@@ -280,7 +280,7 @@ describe Hbc::Installer do
     end
 
     it "allows already-installed Casks which auto-update to be installed if force is provided" do
-      auto_updates = Hbc.load("auto-updates")
+      auto_updates = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/auto-updates.rb")
       auto_updates.installed?.must_equal false
 
       shutup do
@@ -294,7 +294,7 @@ describe Hbc::Installer do
 
     # unlike the CLI, the internal interface throws exception on double-install
     it "installer method raises an exception when already-installed Casks are attempted" do
-      transmission = Hbc.load("local-transmission")
+      transmission = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb")
       transmission.installed?.must_equal false
       installer = Hbc::Installer.new(transmission)
 
@@ -308,7 +308,7 @@ describe Hbc::Installer do
     end
 
     it "allows already-installed Casks to be installed if force is provided" do
-      transmission = Hbc.load("local-transmission")
+      transmission = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb")
       transmission.installed?.must_equal false
 
       shutup do
@@ -321,7 +321,7 @@ describe Hbc::Installer do
     end
 
     it "works naked-pkg-based Casks" do
-      naked_pkg = Hbc.load("container-pkg")
+      naked_pkg = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/container-pkg.rb")
 
       shutup do
         Hbc::Installer.new(naked_pkg).install
@@ -333,7 +333,7 @@ describe Hbc::Installer do
     end
 
     it "works properly with an overridden container :type" do
-      naked_executable = Hbc.load("naked-executable")
+      naked_executable = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/naked-executable.rb")
 
       shutup do
         Hbc::Installer.new(naked_executable).install
@@ -345,7 +345,7 @@ describe Hbc::Installer do
     end
 
     it "works fine with a nested container" do
-      nested_app = Hbc.load("nested-app")
+      nested_app = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/nested-app.rb")
 
       shutup do
         Hbc::Installer.new(nested_app).install
@@ -356,7 +356,7 @@ describe Hbc::Installer do
     end
 
     it "generates and finds a timestamped metadata directory for an installed Cask" do
-      caffeine = Hbc.load("local-caffeine")
+      caffeine = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
 
       shutup do
         Hbc::Installer.new(caffeine).install
@@ -368,7 +368,7 @@ describe Hbc::Installer do
     end
 
     it "generates and finds a metadata subdirectory for an installed Cask" do
-      caffeine = Hbc.load("local-caffeine")
+      caffeine = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
 
       shutup do
         Hbc::Installer.new(caffeine).install
@@ -383,7 +383,7 @@ describe Hbc::Installer do
 
   describe "uninstall" do
     it "fully uninstalls a Cask" do
-      caffeine = Hbc.load("local-caffeine")
+      caffeine = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
       installer = Hbc::Installer.new(caffeine)
 
       shutup do
@@ -397,7 +397,7 @@ describe Hbc::Installer do
     end
 
     it "uninstalls all versions if force is set" do
-      caffeine = Hbc.load("local-caffeine")
+      caffeine = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-caffeine.rb")
       mutated_version = caffeine.version + ".1"
 
       shutup do
diff --git a/Library/Homebrew/cask/test/cask/staged_test.rb b/Library/Homebrew/cask/test/cask/staged_test.rb
index fe3bf2339..2b601a6ae 100644
--- a/Library/Homebrew/cask/test/cask/staged_test.rb
+++ b/Library/Homebrew/cask/test/cask/staged_test.rb
@@ -6,7 +6,7 @@ require "test_helper"
 describe "Operations on staged Casks" do
   describe "bundle ID" do
     it "fetches the bundle ID from a staged cask" do
-      transmission_cask = Hbc.load("local-transmission")
+      transmission_cask = Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/local-transmission.rb")
       tr_installer = Hbc::Installer.new(transmission_cask)
 
       shutup do
diff --git a/Library/Homebrew/cask/test/cask/url_checker_test.rb b/Library/Homebrew/cask/test/cask/url_checker_test.rb
index 199182bf2..afd4532dd 100644
--- a/Library/Homebrew/cask/test/cask/url_checker_test.rb
+++ b/Library/Homebrew/cask/test/cask/url_checker_test.rb
@@ -2,7 +2,7 @@ require "test_helper"
 
 describe Hbc::UrlChecker do
   describe "request processing" do
-    let(:cask) { Hbc.load("basic-cask") }
+    let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/basic-cask.rb") }
     let(:checker) { Hbc::UrlChecker.new(cask) }
     let(:with_stubbed_fetcher) {
       lambda { |&block|
diff --git a/Library/Homebrew/cask/test/cask_test.rb b/Library/Homebrew/cask/test/cask_test.rb
index 64fc21965..d3abda274 100644
--- a/Library/Homebrew/cask/test/cask_test.rb
+++ b/Library/Homebrew/cask/test/cask_test.rb
@@ -41,8 +41,8 @@ describe "Cask" do
     end
 
     it "uses exact match when loading by token" do
-      Hbc.load("test-opera").token.must_equal("test-opera")
-      Hbc.load("test-opera-mail").token.must_equal("test-opera-mail")
+      Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/test-opera.rb").token.must_equal("test-opera")
+      Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/test-opera-mail.rb").token.must_equal("test-opera-mail")
     end
 
     it "raises an error when attempting to load a Cask that doesn't exist" do
diff --git a/Library/Homebrew/cask/test/support/Casks/appdir-interpolation.rb b/Library/Homebrew/cask/test/support/Casks/appdir-interpolation.rb
deleted file mode 100644
index fdc09ef5a..000000000
--- a/Library/Homebrew/cask/test/support/Casks/appdir-interpolation.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'appdir-interpolation' do
-  version '2.61'
-  sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/transmission-2.61.dmg"
-  homepage 'http://example.com/appdir-interpolation'
-
-  binary "#{appdir}/some/path"
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/auto-updates.rb b/Library/Homebrew/cask/test/support/Casks/auto-updates.rb
deleted file mode 100644
index 0fcdb991a..000000000
--- a/Library/Homebrew/cask/test/support/Casks/auto-updates.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'auto-updates' do
-  version '2.61'
-  sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/transmission-2.61.dmg"
-  homepage 'http://example.com/auto-updates'
-
-  auto_updates true
-
-  app 'Transmission.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/bad-checksum.rb b/Library/Homebrew/cask/test/support/Casks/bad-checksum.rb
deleted file mode 100644
index 79e5f24c9..000000000
--- a/Library/Homebrew/cask/test/support/Casks/bad-checksum.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'bad-checksum' do
-  version '1.2.3'
-  sha256 'badbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadbadb'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/basic-cask.rb b/Library/Homebrew/cask/test/support/Casks/basic-cask.rb
deleted file mode 100644
index d3aaa283e..000000000
--- a/Library/Homebrew/cask/test/support/Casks/basic-cask.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'basic-cask' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url 'http://example.com/TestCask.dmg'
-  homepage 'http://example.com/'
-
-  app 'TestCask.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-7z.rb b/Library/Homebrew/cask/test/support/Casks/container-7z.rb
deleted file mode 100644
index 7dd01eee4..000000000
--- a/Library/Homebrew/cask/test/support/Casks/container-7z.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'container-7z' do
-  version '1.2.3'
-  sha256 '3f9542ace85ed5f88549e2d0ea82210f8ddc87e0defbb78469d3aed719b3c964'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/container.7z"
-  homepage 'https://example.com/container-7z'
-
-  depends_on formula: 'unar'
-
-  app 'container'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-air.rb b/Library/Homebrew/cask/test/support/Casks/container-air.rb
deleted file mode 100644
index c310e0a6f..000000000
--- a/Library/Homebrew/cask/test/support/Casks/container-air.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'container-air' do
-  version '0.1'
-  sha256 '554472e163f8a028629b12b468e29acda9f16b223dff74fcd218bba73cc2365a'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/container.air"
-  homepage 'https://example.com/container-air'
-
-  app 'container.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-bzip2.rb b/Library/Homebrew/cask/test/support/Casks/container-bzip2.rb
deleted file mode 100644
index 9d9bdff98..000000000
--- a/Library/Homebrew/cask/test/support/Casks/container-bzip2.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'container-bzip2' do
-  version '1.2.3'
-  sha256 'eaf67b3a62cb9275f96e45d05c70b94bef9ef1dae344083e93eda6b0b388a61c'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/container.bz2"
-  homepage 'https://example.com/container-bzip2'
-
-  app 'container-bzip2--1.2.3'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-cab.rb b/Library/Homebrew/cask/test/support/Casks/container-cab.rb
deleted file mode 100644
index ebc7a544e..000000000
--- a/Library/Homebrew/cask/test/support/Casks/container-cab.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'container-cab' do
-  version '1.2.3'
-  sha256 'c267f5cebb14814c8e612a8b7d2bda02aec913f869509b6f1d3883427c0f552b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/container.cab"
-  homepage 'https://example.com/container-cab'
-
-  depends_on formula: 'cabextract'
-
-  app 'container'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-dmg.rb b/Library/Homebrew/cask/test/support/Casks/container-dmg.rb
deleted file mode 100644
index d63596f42..000000000
--- a/Library/Homebrew/cask/test/support/Casks/container-dmg.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'container-dmg' do
-  version '1.2.3'
-  sha256 '74d89d4fa5cef175cf43666ce11fefa3741aa1522114042ac75e656be37141a1'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/container.dmg"
-  homepage 'https://example.com/container-dmg'
-
-  app 'container'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-gzip.rb b/Library/Homebrew/cask/test/support/Casks/container-gzip.rb
deleted file mode 100644
index c2ab00384..000000000
--- a/Library/Homebrew/cask/test/support/Casks/container-gzip.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'container-gzip' do
-  version '1.2.3'
-  sha256 'fa4ebb5246583c4b6e62e1df4e3b71b4e38a1d7d91c025665827195d36214b20'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/container.gz"
-  homepage 'https://example.com/container-gzip'
-
-  app 'container'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-lzma.rb b/Library/Homebrew/cask/test/support/Casks/container-lzma.rb
deleted file mode 100644
index d5f708523..000000000
--- a/Library/Homebrew/cask/test/support/Casks/container-lzma.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'container-lzma' do
-  version '1.2.3'
-  sha256 '9d7edb32d02ab9bd9749a5bde8756595ea4cfcb1da02ca11c30fb591d4c1ed85'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/container.lzma"
-  homepage 'https://example.com/container-lzma'
-
-  depends_on formula: 'lzma'
-
-  app 'container-lzma--1.2.3'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-pkg.rb b/Library/Homebrew/cask/test/support/Casks/container-pkg.rb
deleted file mode 100644
index 959caaa08..000000000
--- a/Library/Homebrew/cask/test/support/Casks/container-pkg.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-test_cask 'container-pkg' do
-  version '1.2.3'
-  sha256 '611c50c8a2a2098951d2cd0fd54787ed81b92cd97b4b08bd7cba17f1e1d8e40b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/container.pkg"
-  homepage 'https://example.com/container-pkg'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-rar.rb b/Library/Homebrew/cask/test/support/Casks/container-rar.rb
deleted file mode 100644
index 7186577a2..000000000
--- a/Library/Homebrew/cask/test/support/Casks/container-rar.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'container-rar' do
-  version '1.2.3'
-  sha256 '419af7864c0e1f125515c49b08bd22e0f7de39f5285897c440fe03c714871763'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/container.rar"
-  homepage 'https://example.com/container-rar'
-
-  depends_on formula: 'unar'
-
-  app 'container'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-sit.rb b/Library/Homebrew/cask/test/support/Casks/container-sit.rb
deleted file mode 100644
index 3a0faad97..000000000
--- a/Library/Homebrew/cask/test/support/Casks/container-sit.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'container-sit' do
-  version '1.2.3'
-  sha256 '0d21a64dce625044345c8ecca888e5439feaf254dac7f884917028a744f93cf3'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/container.sit"
-  homepage 'https://example.com/container-sit'
-
-  depends_on formula: 'unar'
-
-  app 'container'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-tar-gz.rb b/Library/Homebrew/cask/test/support/Casks/container-tar-gz.rb
deleted file mode 100644
index 58e1d82fd..000000000
--- a/Library/Homebrew/cask/test/support/Casks/container-tar-gz.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'container-tar-gz' do
-  version '1.2.3'
-  sha256 'fab685fabf73d5a9382581ce8698fce9408f5feaa49fa10d9bc6c510493300f5'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/container.tar.gz"
-  homepage 'https://example.com/container-tar-gz'
-
-  app 'container'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-xar.rb b/Library/Homebrew/cask/test/support/Casks/container-xar.rb
deleted file mode 100644
index 35e01d0a8..000000000
--- a/Library/Homebrew/cask/test/support/Casks/container-xar.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'container-xar' do
-  version '1.2.3'
-  sha256 '5bb8e09a6fc630ebeaf266b1fd2d15e2ae7d32d7e4da6668a8093426fa1ba509'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/container.xar"
-  homepage 'https://example.com/container-xar'
-
-  app 'container'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-xz.rb b/Library/Homebrew/cask/test/support/Casks/container-xz.rb
deleted file mode 100644
index b27e908ae..000000000
--- a/Library/Homebrew/cask/test/support/Casks/container-xz.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'container-xz' do
-  version '1.2.3'
-  sha256 '839263f474edde1d54a9101606e6f0dc9d963acc93f6dcc5af8d10ebc3187c02'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/container.xz"
-  homepage 'https://example.com/container-xz'
-
-  depends_on formula: 'xz'
-
-  app 'container-xz--1.2.3'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-multiple.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-multiple.rb
deleted file mode 100644
index db2621074..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-multiple.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-test_cask 'invalid-appcast-multiple' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  appcast 'http://example.com/appcast1.xml',
-          checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-  appcast 'http://example.com/appcast2.xml',
-          checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-  homepage 'http://example.com/invalid-appcast-multiple'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-url.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-url.rb
deleted file mode 100644
index b4c11b1be..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-url.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'invalid-appcast-url' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  appcast 1,
-          checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-  homepage 'http://example.com/invalid-appcast-url'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-conflicts-with-key.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-conflicts-with-key.rb
deleted file mode 100644
index d39d124b0..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-conflicts-with-key.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'invalid-conflicts-with-key' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/invalid-conflicts-with-key'
-
-  conflicts_with no_such_key: 'unar'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-arch-value.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-arch-value.rb
deleted file mode 100644
index b0c919a9b..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-arch-value.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'invalid-depends-on-arch-value' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/invalid-depends-on-arch-value'
-
-  depends_on arch: :no_such_arch
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-key.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-key.rb
deleted file mode 100644
index 05304e806..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-key.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'invalid-depends-on-key' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/invalid-depends-on-key'
-
-  depends_on no_such_key: 'unar'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-bad-release.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-bad-release.rb
deleted file mode 100644
index 183dd5d91..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-bad-release.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'invalid-depends-on-macos-bad-release' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/invalid-depends-on-macos-bad-release'
-
-  depends_on macos: :no_such_release
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-conflicting-forms.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-conflicting-forms.rb
deleted file mode 100644
index b1f763d76..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-conflicting-forms.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-test_cask 'invalid-depends-on-macos-conflicting-forms' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/invalid-depends-on-macos-conflicting-forms'
-
-  depends_on macos: :yosemite
-  depends_on macos: '>= :mavericks'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-x11-value.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-x11-value.rb
deleted file mode 100644
index eefd3ac40..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-x11-value.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'invalid-depends-on-x11-value' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/invalid-depends-on-x11-value'
-
-  depends_on x11: :no_such_value
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb
deleted file mode 100644
index bf14d372b..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-test_cask 'invalid-gpg-conflicting-keys' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/invalid-gpg-conflicting-keys'
-  gpg 'http://example.com/gpg-signature.asc',
-      key_id:  '01234567',
-      key_url: 'http://example.com/gpg-key-url'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-id.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-id.rb
deleted file mode 100644
index 626e02a47..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-id.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'invalid-gpg-key-id' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/invalid-gpg-key-id'
-  gpg 'http://example.com/gpg-signature.asc',
-      key_id: '012'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-url.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-url.rb
deleted file mode 100644
index 77d41ed6b..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-url.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'invalid-gpg-key-url' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/invalid-gpg-key-url'
-  gpg 'http://example.com/gpg-signature.asc',
-      key_url: 1
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-missing-key.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-missing-key.rb
deleted file mode 100644
index 460bcd532..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-missing-key.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-test_cask 'invalid-gpg-missing-key' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/invalid-gpg-missing-keys'
-  gpg 'http://example.com/gpg-signature.asc'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-multiple-stanzas.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-multiple-stanzas.rb
deleted file mode 100644
index 8abc89486..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-multiple-stanzas.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-test_cask 'invalid-gpg-multiple-stanzas' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/invalid-gpg-multiple-stanzas'
-  gpg 'http://example.com/gpg-signature.asc',
-      key_id: '01234567'
-  gpg 'http://example.com/gpg-signature.asc',
-      key_id: '01234567'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-parameter.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-parameter.rb
deleted file mode 100644
index f1abc9225..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-parameter.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'invalid-gpg-parameter' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/invalid-gpg-type'
-  gpg 'http://example.com/gpg-signature.asc',
-      no_such_parameter: :value
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-signature-url.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-signature-url.rb
deleted file mode 100644
index 1b9e7362f..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-signature-url.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'invalid-gpg-signature-url' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/invalid-gpg-signature-url'
-  gpg 1,
-      key_id: '01234567'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-type.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-type.rb
deleted file mode 100644
index 266047617..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-type.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'invalid-gpg-type' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/invalid-gpg-type'
-  gpg 'http://example.com/gpg-signature.asc',
-      no_such_parameter: :value
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-format.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-format.rb
deleted file mode 100644
index a8159c979..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-format.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask => 'invalid-header-format' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-token-mismatch.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-token-mismatch.rb
deleted file mode 100644
index 2b8ad5619..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-token-mismatch.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'invalid-header-token-mismatch-this-text-does-not-belong' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-version.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-version.rb
deleted file mode 100644
index 47851c0e0..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-version.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'invalid-header-version' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-stage-only-conflict.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-stage-only-conflict.rb
deleted file mode 100644
index 84510ac24..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-stage-only-conflict.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-test_cask 'invalid-stage-only-conflict' do
-  version '2.61'
-  sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/transmission-2.61.dmg"
-  homepage 'http://example.com/invalid-stage-only-conflict'
-
-  app 'Transmission.app'
-  stage_only true
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-homepage.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-homepage.rb
deleted file mode 100644
index d4e5ff4a9..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-homepage.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-test_cask 'invalid-two-homepage' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/local-caffeine'
-  homepage 'http://www.example.com/local-caffeine'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-url.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-url.rb
deleted file mode 100644
index 49e470788..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-url.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-test_cask 'invalid-two-url' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  url 'http://example.com/caffeine.zip'
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-version.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-version.rb
deleted file mode 100644
index c9fe37772..000000000
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-version.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-test_cask 'invalid-two-version' do
-  version '1.2.3'
-  version '2.0'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb b/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb
deleted file mode 100644
index 2be9b4397..000000000
--- a/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'local-caffeine' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/local-transmission.rb b/Library/Homebrew/cask/test/support/Casks/local-transmission.rb
deleted file mode 100644
index f5244d0a5..000000000
--- a/Library/Homebrew/cask/test/support/Casks/local-transmission.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'local-transmission' do
-  version '2.61'
-  sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/transmission-2.61.dmg"
-  homepage 'http://example.com/local-transmission'
-
-  app 'Transmission.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/missing-checksum.rb b/Library/Homebrew/cask/test/support/Casks/missing-checksum.rb
deleted file mode 100644
index 5e1886a57..000000000
--- a/Library/Homebrew/cask/test/support/Casks/missing-checksum.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-test_cask 'missing-checksum' do
-  version '1.2.3'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/naked-executable.rb b/Library/Homebrew/cask/test/support/Casks/naked-executable.rb
deleted file mode 100644
index 619c7a5fb..000000000
--- a/Library/Homebrew/cask/test/support/Casks/naked-executable.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'naked-executable' do
-  version '1.2.3'
-  sha256 '306c6ca7407560340797866e077e053627ad409277d1b9da58106fce4cf717cb'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/naked_executable"
-  homepage 'http://example.com/naked-executable'
-
-  container type: :naked
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/nested-app.rb b/Library/Homebrew/cask/test/support/Casks/nested-app.rb
deleted file mode 100644
index 526c7414a..000000000
--- a/Library/Homebrew/cask/test/support/Casks/nested-app.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'nested-app' do
-  version '1.2.3'
-  sha256 '1866dfa833b123bb8fe7fa7185ebf24d28d300d0643d75798bc23730af734216'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/NestedApp.dmg.zip"
-  homepage 'http://example.com/nested-app'
-
-  container nested: 'NestedApp.dmg'
-
-  app 'MyNestedApp.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/no-checksum.rb b/Library/Homebrew/cask/test/support/Casks/no-checksum.rb
deleted file mode 100644
index d9ba354f5..000000000
--- a/Library/Homebrew/cask/test/support/Casks/no-checksum.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'no-checksum' do
-  version '1.2.3'
-  sha256 :no_check
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/no-dsl-version.rb b/Library/Homebrew/cask/test/support/Casks/no-dsl-version.rb
deleted file mode 100644
index ee557b1e4..000000000
--- a/Library/Homebrew/cask/test/support/Casks/no-dsl-version.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'no-dsl-version' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url 'http://example.com/TestCask.dmg'
-  homepage 'http://example.com/'
-
-  app 'TestCask.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/stage-only.rb b/Library/Homebrew/cask/test/support/Casks/stage-only.rb
deleted file mode 100644
index b52b5d3d2..000000000
--- a/Library/Homebrew/cask/test/support/Casks/stage-only.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'stage-only' do
-  version '2.61'
-  sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/transmission-2.61.dmg"
-  homepage 'http://example.com/stage-only'
-
-  stage_only true
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/test-opera-mail.rb b/Library/Homebrew/cask/test/support/Casks/test-opera-mail.rb
deleted file mode 100644
index afc8387c7..000000000
--- a/Library/Homebrew/cask/test/support/Casks/test-opera-mail.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'test-opera-mail' do
-  version '1.0'
-  sha256 'afd192e308f8ea8ddb3d426fd6663d97078570417ee78b8e1fa15f515ae3d677'
-
-  url 'http://get-ash-1.opera.com/pub/opera/mail/1.0/mac/Opera-Mail-1.0-1040.i386.dmg'
-  homepage 'http://www.opera.com/computer/mail'
-
-  app 'Opera Mail.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/test-opera.rb b/Library/Homebrew/cask/test/support/Casks/test-opera.rb
deleted file mode 100644
index ec32828f7..000000000
--- a/Library/Homebrew/cask/test/support/Casks/test-opera.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'test-opera' do
-  version '19.0.1326.47'
-  sha256 '7b91f20ab754f7b3fef8dc346e0393917e11676b74c8f577408841619f76040a'
-
-  url 'http://get.geo.opera.com/pub/opera/desktop/19.0.1326.47/mac/Opera_19.0.1326.47_Setup.dmg'
-  homepage 'http://www.opera.com/'
-
-  app 'Opera.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-accessibility-access.rb b/Library/Homebrew/cask/test/support/Casks/with-accessibility-access.rb
deleted file mode 100644
index 1aa7bc8f7..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-accessibility-access.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-accessibility-access' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url 'http://example.com/TestCask.dmg'
-  homepage 'http://example.com/'
-
-  accessibility_access true
-
-  app 'TestCask.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-alt-target.rb b/Library/Homebrew/cask/test/support/Casks/with-alt-target.rb
deleted file mode 100644
index b75ff320c..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-alt-target.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'with-alt-target' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeine.app', target: 'AnotherName.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-appcast.rb b/Library/Homebrew/cask/test/support/Casks/with-appcast.rb
deleted file mode 100644
index f99f7a93c..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-appcast.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-appcast' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  appcast 'http://example.com/appcast.xml',
-          checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-  homepage 'http://example.com/with-appcast'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-caveats.rb b/Library/Homebrew/cask/test/support/Casks/with-caveats.rb
deleted file mode 100644
index 30d3a49b3..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-caveats.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-test_cask 'with-caveats' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeine.app'
-
-  # simple string is evaluated at compile-time
-  caveats <<-EOS.undent
-    Here are some things you might want to know.
-  EOS
-  # do block is evaluated at install-time
-  caveats do
-    "Cask token: #{token}"
-  end
-  # a do block may print and use a DSL
-  caveats do
-    puts 'Custom text via puts followed by DSL-generated text:'
-    path_environment_variable('/custom/path/bin')
-  end
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-choices.rb b/Library/Homebrew/cask/test/support/Casks/with-choices.rb
deleted file mode 100644
index 1871efab3..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-choices.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-test_cask 'with-choices' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg',
-      choices: [
-                 {
-                   'choiceIdentifier' => 'choice1',
-                   'choiceAttribute'  => 'selected',
-                   'attributeSetting' => 1,
-                 },
-               ]
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-conditional-caveats.rb b/Library/Homebrew/cask/test/support/Casks/with-conditional-caveats.rb
deleted file mode 100644
index d8a3836b8..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-conditional-caveats.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-test_cask 'with-conditional-caveats' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeine.app'
-
-  # a do block may print and use a DSL
-  caveats do
-    puts 'This caveat is conditional' if false # rubocop:disable Lint/LiteralInCondition
-  end
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-conflicts-with.rb b/Library/Homebrew/cask/test/support/Casks/with-conflicts-with.rb
deleted file mode 100644
index a20d932ba..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-conflicts-with.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-conflicts-with' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-conflicts-with'
-
-  conflicts_with formula: 'unar'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch.rb
deleted file mode 100644
index e0c4e3fa7..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-test_cask 'with-depends-on-arch' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-depends-on-arch'
-
-  # covers all known hardware; always succeeds
-  depends_on arch: :intel
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic-helper.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic-helper.rb
deleted file mode 100644
index 327fc4000..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic-helper.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-depends-on-cask-cyclic-helper' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-depends-on-cask-cyclic-helper'
-
-  depends_on cask: 'with-depends-on-cask-cyclic'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic.rb
deleted file mode 100644
index f74d860bf..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-test_cask 'with-depends-on-cask-cyclic' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-depends-on-cask-cyclic'
-
-  depends_on cask: 'local-caffeine'
-  depends_on cask: 'with-depends-on-cask-cyclic-helper'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-multiple.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-multiple.rb
deleted file mode 100644
index bb69b7506..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-multiple.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-test_cask 'with-depends-on-cask-multiple' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-depends-on-cask-multiple'
-
-  depends_on cask: 'local-caffeine'
-  depends_on cask: 'local-transmission'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask.rb
deleted file mode 100644
index 05a180560..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-depends-on-cask' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-depends-on-cask'
-
-  depends_on cask: 'local-transmission'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula-multiple.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula-multiple.rb
deleted file mode 100644
index c99d2dee1..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula-multiple.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-test_cask 'with-depends-on-formula-multiple' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-depends-on-formula-multiple'
-
-  depends_on formula: 'unar'
-  depends_on formula: 'fileutils'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula.rb
deleted file mode 100644
index b0339e68c..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-depends-on-formula' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-depends-on-formula'
-
-  depends_on formula: 'unar'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-array.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-array.rb
deleted file mode 100644
index cae16704c..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-array.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-test_cask 'with-depends-on-macos-array' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-depends-on-macos-array'
-
-  # since all OS releases are included, this should always pass
-  depends_on macos: ['10.4', '10.5', '10.6', '10.7', '10.8', '10.9', '10.10', MacOS.version.to_s]
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-comparison.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-comparison.rb
deleted file mode 100644
index 7f14dd84f..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-comparison.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-depends-on-macos-comparison' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-depends-on-macos-comparison'
-
-  depends_on macos: '>= 10.4'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-failure.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-failure.rb
deleted file mode 100644
index ecefff362..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-failure.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-test_cask 'with-depends-on-macos-failure' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-depends-on-macos-failure'
-
-  # guarantee a mismatched release
-  depends_on macos: MacOS.version.to_s == '10.4' ? '10.5' : '10.4'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-string.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-string.rb
deleted file mode 100644
index 6e370d46a..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-string.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-depends-on-macos-string' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-depends-on-macos-string'
-
-  depends_on macos: MacOS.version.to_s
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-symbol.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-symbol.rb
deleted file mode 100644
index 7f11b6e64..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-symbol.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-depends-on-macos-symbol' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-depends-on-macos-symbol'
-
-  depends_on macos: MacOS.version.to_sym
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11-false.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11-false.rb
deleted file mode 100644
index fc84f2daa..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11-false.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-depends-on-x11-false' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-depends-on-x11-false'
-
-  depends_on x11: false
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11.rb
deleted file mode 100644
index b1a7bad2b..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-depends-on-x11' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-depends-on-x11'
-
-  depends_on x11: true
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-dsl-version.rb b/Library/Homebrew/cask/test/support/Casks/with-dsl-version.rb
deleted file mode 100644
index c16343c4b..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-dsl-version.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask :v1 => 'with-dsl-version' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url 'http://example.com/TestCask.dmg'
-  homepage 'http://example.com/'
-
-  app 'TestCask.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-generic-artifact-no-target.rb b/Library/Homebrew/cask/test/support/Casks/with-generic-artifact-no-target.rb
deleted file mode 100644
index a7d347fb5..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-generic-artifact-no-target.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'with-generic-artifact-no-target' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-generic-artifact'
-
-  artifact 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-generic-artifact.rb b/Library/Homebrew/cask/test/support/Casks/with-generic-artifact.rb
deleted file mode 100644
index e718b994b..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-generic-artifact.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'with-generic-artifact' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-generic-artifact'
-
-  artifact 'Caffeine.app', target: "#{Hbc.appdir}/Caffeine.app"
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-gpg-key-url.rb b/Library/Homebrew/cask/test/support/Casks/with-gpg-key-url.rb
deleted file mode 100644
index 6aa735e1f..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-gpg-key-url.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-gpg-key-url' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-gpg-key-url'
-  gpg 'http://example.com/gpg-signature.asc',
-      key_url: 'http://example.com/gpg-key-url'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-gpg.rb b/Library/Homebrew/cask/test/support/Casks/with-gpg.rb
deleted file mode 100644
index 1f7042515..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-gpg.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-gpg' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-gpg'
-  gpg 'http://example.com/gpg-signature.asc',
-      key_id: '01234567'
-
-  app 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-installable.rb b/Library/Homebrew/cask/test/support/Casks/with-installable.rb
deleted file mode 100644
index d1105b50e..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-installable.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-test_cask 'with-installable' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg'
-
-  uninstall script:     { executable: 'MyFancyPkg/FancyUninstaller.tool', args: %w[--please] },
-            quit:       'my.fancy.package.app',
-            login_item: 'Fancy',
-            delete:     [
-                          '/permissible/absolute/path',
-                          '~/permissible/path/with/tilde',
-                          'impermissible/relative/path',
-                          '/another/impermissible/../relative/path',
-                        ],
-            rmdir:      "#{TEST_FIXTURE_DIR}/cask/empty_directory"
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-installer-manual.rb b/Library/Homebrew/cask/test/support/Casks/with-installer-manual.rb
deleted file mode 100644
index 92e2e09df..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-installer-manual.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'with-installer-manual' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  installer manual: 'Caffeine.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-installer-script.rb b/Library/Homebrew/cask/test/support/Casks/with-installer-script.rb
deleted file mode 100644
index 5e98eab48..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-installer-script.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-test_cask 'with-installer-script' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/with-install-script'
-
-  installer script: '/usr/bin/true',
-            args:   ['--flag']
-  # acceptable alternate form
-  installer script: {
-                      executable: '/usr/bin/false',
-                      args:       ['--flag'],
-                    }
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-macosx-dir.rb b/Library/Homebrew/cask/test/support/Casks/with-macosx-dir.rb
deleted file mode 100644
index 837627119..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-macosx-dir.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'with-macosx-dir' do
-  version '1.2.3'
-  sha256 '5633c3a0f2e572cbf021507dec78c50998b398c343232bdfc7e26221d0a5db4d'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyApp.zip"
-  homepage 'http://example.com/MyFancyApp'
-
-  app 'MyFancyApp/MyFancyApp.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-pkgutil-zap.rb b/Library/Homebrew/cask/test/support/Casks/with-pkgutil-zap.rb
deleted file mode 100644
index 8bb42c447..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-pkgutil-zap.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-test_cask 'with-pkgutil-zap' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'Fancy.pkg'
-
-  zap pkgutil:   'my.fancy.package.*',
-      kext:      'my.fancy.package.kernelextension',
-      launchctl: 'my.fancy.package.service'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-suite.rb b/Library/Homebrew/cask/test/support/Casks/with-suite.rb
deleted file mode 100644
index c36151d52..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-suite.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-test_cask 'with-suite' do
-  version '1.2.3'
-  sha256 'd95dcc12d4e5be0bc3cb9793c4b7e7f69a25f0b3c7418494b0c883957e6eeae4'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine-suite.zip"
-  name 'Caffeine'
-  homepage 'http://example.com/with-suite'
-
-  suite 'Caffeine'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-two-apps-correct.rb b/Library/Homebrew/cask/test/support/Casks/with-two-apps-correct.rb
deleted file mode 100644
index 8eb68d88a..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-two-apps-correct.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-test_cask 'with-two-apps-correct' do
-  version '1.2.3'
-  sha256 '3178fbfd1ea5d87a2a0662a4eb599ebc9a03888e73f37538d9f3f6ee69d2368e'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeines.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeine Mini.app'
-  app 'Caffeine Pro.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-two-apps-incorrect.rb b/Library/Homebrew/cask/test/support/Casks/with-two-apps-incorrect.rb
deleted file mode 100644
index 6bd316dfe..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-two-apps-incorrect.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'with-two-apps-incorrect' do
-  version '1.2.3'
-  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeine.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeine.app', 'Caffeine.app/Contents/MacOS/Caffeine'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-two-apps-subdir.rb b/Library/Homebrew/cask/test/support/Casks/with-two-apps-subdir.rb
deleted file mode 100644
index 202423691..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-two-apps-subdir.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-test_cask 'with-two-apps-subdir' do
-  version '1.2.3'
-  sha256 'd687c22a21c02bd8f07da9302c8292b93a04df9a929e3f04d09aea6c76f75c65'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/caffeines-subdir.zip"
-  homepage 'http://example.com/local-caffeine'
-
-  app 'Caffeines/Caffeine Mini.app'
-  app 'Caffeines/Caffeine Pro.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-delete.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-delete.rb
deleted file mode 100644
index 203f18405..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-delete.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-test_cask 'with-uninstall-delete' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'Fancy.pkg'
-
-  uninstall delete: [
-                      '/permissible/absolute/path',
-                      '~/permissible/path/with/tilde',
-                      'impermissible/relative/path',
-                      '/another/impermissible/../relative/path',
-                    ]
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-early-script.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-early-script.rb
deleted file mode 100644
index a26abab1c..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-early-script.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-uninstall-early-script' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg'
-
-  uninstall early_script: { executable: 'MyFancyPkg/FancyUninstaller.tool', args: %w[--please] }
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-kext.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-kext.rb
deleted file mode 100644
index fa54c7e1f..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-kext.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-uninstall-kext' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'Fancy.pkg'
-
-  uninstall kext: 'my.fancy.package.kernelextension'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-launchctl.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-launchctl.rb
deleted file mode 100644
index 51ad45a09..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-launchctl.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-uninstall-launchctl' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyApp.zip"
-  homepage 'http://example.com/fancy'
-
-  app 'Fancy.app'
-
-  uninstall launchctl: 'my.fancy.package.service'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-login-item.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-login-item.rb
deleted file mode 100644
index 26dca6f1a..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-login-item.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-uninstall-login-item' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg'
-
-  uninstall login_item: 'Fancy'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-pkgutil.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-pkgutil.rb
deleted file mode 100644
index db77a460b..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-pkgutil.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-uninstall-pkgutil' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'Fancy.pkg'
-
-  uninstall pkgutil: 'my.fancy.package.*'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-quit.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-quit.rb
deleted file mode 100644
index 19337b18a..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-quit.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-uninstall-quit' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg'
-
-  uninstall quit: 'my.fancy.package.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-rmdir.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-rmdir.rb
deleted file mode 100644
index 88142ea71..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-rmdir.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-uninstall-rmdir' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg'
-
-  uninstall rmdir: "#{TEST_FIXTURE_DIR}/cask/empty_directory"
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-script.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-script.rb
deleted file mode 100644
index d2e0d6167..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-script.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-uninstall-script' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg'
-
-  uninstall script: { executable: 'MyFancyPkg/FancyUninstaller.tool', args: %w[--please] }
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-signal.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-signal.rb
deleted file mode 100644
index cc32b888a..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-signal.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-test_cask 'with-uninstall-signal' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg'
-
-  uninstall signal: [
-                      ['TERM', 'my.fancy.package.app'],
-                      ['KILL', 'my.fancy.package.app'],
-                    ]
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-uninstall-trash.rb b/Library/Homebrew/cask/test/support/Casks/with-uninstall-trash.rb
deleted file mode 100644
index 4fe58a19a..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-uninstall-trash.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-test_cask 'with-uninstall-trash' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'Fancy.pkg'
-
-  uninstall trash: [
-                     '/permissible/absolute/path',
-                     '~/permissible/path/with/tilde',
-                     'impermissible/relative/path',
-                     '/another/impermissible/../relative/path',
-                   ]
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-delete.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-delete.rb
deleted file mode 100644
index c76a9acb0..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-zap-delete.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-test_cask 'with-zap-delete' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'Fancy.pkg'
-
-  zap delete: [
-                '/permissible/absolute/path',
-                '~/permissible/path/with/tilde',
-                'impermissible/relative/path',
-                '/another/impermissible/../relative/path',
-              ]
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-early-script.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-early-script.rb
deleted file mode 100644
index d35c1809e..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-zap-early-script.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-zap-early-script' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg'
-
-  zap early_script: { executable: 'MyFancyPkg/FancyUninstaller.tool', args: %w[--please] }
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-kext.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-kext.rb
deleted file mode 100644
index 463fe8133..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-zap-kext.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-zap-kext' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'Fancy.pkg'
-
-  zap kext: 'my.fancy.package.kernelextension'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-launchctl.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-launchctl.rb
deleted file mode 100644
index aab285672..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-zap-launchctl.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-zap-launchctl' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyApp.zip"
-  homepage 'http://example.com/fancy'
-
-  app 'Fancy.app'
-
-  zap launchctl: 'my.fancy.package.service'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-login-item.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-login-item.rb
deleted file mode 100644
index d7ba9a65b..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-zap-login-item.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-zap-login-item' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg'
-
-  zap login_item: 'Fancy'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-pkgutil.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-pkgutil.rb
deleted file mode 100644
index 17a667000..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-zap-pkgutil.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-zap-pkgutil' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'Fancy.pkg'
-
-  zap pkgutil: 'my.fancy.package.*'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-quit.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-quit.rb
deleted file mode 100644
index 21f824ae9..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-zap-quit.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-zap-quit' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg'
-
-  zap quit: 'my.fancy.package.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-rmdir.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-rmdir.rb
deleted file mode 100644
index eac02ad0e..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-zap-rmdir.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-zap-rmdir' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg'
-
-  zap rmdir: "#{TEST_FIXTURE_DIR}/cask/empty_directory"
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-script.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-script.rb
deleted file mode 100644
index f8646a267..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-zap-script.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'with-zap-script' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg'
-
-  zap script: { executable: 'MyFancyPkg/FancyUninstaller.tool', args: %w[--please] }
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-signal.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-signal.rb
deleted file mode 100644
index 5accd8337..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-zap-signal.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-test_cask 'with-zap-signal' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg'
-
-  zap signal: [
-                ['TERM', 'my.fancy.package.app'],
-                ['KILL', 'my.fancy.package.app'],
-              ]
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap-trash.rb b/Library/Homebrew/cask/test/support/Casks/with-zap-trash.rb
deleted file mode 100644
index aef4e0eab..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-zap-trash.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-test_cask 'with-zap-trash' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'Fancy.pkg'
-
-  zap trash: [
-               '/permissible/absolute/path',
-               '~/permissible/path/with/tilde',
-               'impermissible/relative/path',
-               '/another/impermissible/../relative/path',
-             ]
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-zap.rb b/Library/Homebrew/cask/test/support/Casks/with-zap.rb
deleted file mode 100644
index 056c90671..000000000
--- a/Library/Homebrew/cask/test/support/Casks/with-zap.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-test_cask 'with-zap' do
-  version '1.2.3'
-  sha256 '8c62a2b791cf5f0da6066a0a4b6e85f62949cd60975da062df44adf887f4370b'
-
-  url "file://#{TEST_FIXTURE_DIR}/cask/MyFancyPkg.zip"
-  homepage 'http://example.com/fancy-pkg'
-
-  pkg 'MyFancyPkg/Fancy.pkg'
-
-  uninstall quit: 'my.fancy.package.app.from.uninstall'
-
-  zap script:     {
-                    executable: 'MyFancyPkg/FancyUninstaller.tool',
-                    args:       %w[--please],
-                  },
-      quit:       'my.fancy.package.app',
-      login_item: 'Fancy',
-      delete:     '~/Library/Preferences/my.fancy.app.plist'
-end
diff --git a/Library/Homebrew/cask/test/test_helper.rb b/Library/Homebrew/cask/test/test_helper.rb
index 7315839f5..641409284 100644
--- a/Library/Homebrew/cask/test/test_helper.rb
+++ b/Library/Homebrew/cask/test/test_helper.rb
@@ -46,7 +46,7 @@ Hbc.caskroom = Hbc.default_caskroom.tap(&:mkpath)
 Hbc.default_tap = Tap.fetch("caskroom", "test").tap do |tap|
   # link test casks
   FileUtils.mkdir_p tap.path.dirname
-  FileUtils.ln_s Pathname.new(__FILE__).dirname.join("support"), tap.path
+  FileUtils.ln_s TEST_FIXTURE_DIR.join("cask"), tap.path
 end
 
 # pretend that the caskroom/cask Tap is installed