diff --git a/Library/Homebrew/cask/test/cask/dsl/caveats_test.rb b/Library/Homebrew/cask/spec/cask/dsl/caveats_spec.rb
similarity index 91%
rename from Library/Homebrew/cask/test/cask/dsl/caveats_test.rb
rename to Library/Homebrew/cask/spec/cask/dsl/caveats_spec.rb
index 37845e7c3d..777491d66e 100644
--- a/Library/Homebrew/cask/test/cask/dsl/caveats_test.rb
+++ b/Library/Homebrew/cask/spec/cask/dsl/caveats_spec.rb
@@ -1,4 +1,4 @@
-require "test_helper"
+require "spec_helper"
 
 describe Hbc::DSL::Caveats do
   let(:cask) { Hbc::CaskLoader.load_from_file(TEST_FIXTURE_DIR/"cask/Casks/basic-cask.rb") }
diff --git a/Library/Homebrew/cask/spec/spec_helper.rb b/Library/Homebrew/cask/spec/spec_helper.rb
index 13ed746b58..0a7327b087 100644
--- a/Library/Homebrew/cask/spec/spec_helper.rb
+++ b/Library/Homebrew/cask/spec/spec_helper.rb
@@ -17,7 +17,7 @@ $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.join("cask", "lib").to_s)
 
 require "test/support/helper/shutup"
 
-Pathname.glob(HOMEBREW_LIBRARY_PATH.join("cask", "spec", "support", "*.rb")).each(&method(:require))
+Pathname.glob(HOMEBREW_LIBRARY_PATH.join("cask", "spec", "support", "**", "*.rb")).each(&method(:require))
 
 require "hbc"
 
diff --git a/Library/Homebrew/cask/spec/support/shared_examples/dsl_base.rb b/Library/Homebrew/cask/spec/support/shared_examples/dsl_base.rb
new file mode 100644
index 0000000000..400ff40f62
--- /dev/null
+++ b/Library/Homebrew/cask/spec/support/shared_examples/dsl_base.rb
@@ -0,0 +1,23 @@
+require "hbc/dsl/base"
+
+shared_examples Hbc::DSL::Base do
+  it "supports the token method" do
+    expect(dsl.token).to eq(cask.token)
+  end
+
+  it "supports the version method" do
+    expect(dsl.version).to eq(cask.version)
+  end
+
+  it "supports the caskroom_path method" do
+    expect(dsl.caskroom_path).to eq(cask.caskroom_path)
+  end
+
+  it "supports the staged_path method" do
+    expect(dsl.staged_path).to eq(cask.staged_path)
+  end
+
+  it "supports the appdir method" do
+    expect(dsl.appdir).to eq(cask.appdir)
+  end
+end
diff --git a/Library/Homebrew/cask/test/support/shared_examples/dsl_base.rb b/Library/Homebrew/cask/test/support/shared_examples/dsl_base.rb
deleted file mode 100644
index 28115bb4b5..0000000000
--- a/Library/Homebrew/cask/test/support/shared_examples/dsl_base.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-require "test_helper"
-
-shared_examples_for Hbc::DSL::Base do
-  it "supports the token method" do
-    dsl.token.must_equal cask.token
-  end
-
-  it "supports the version method" do
-    dsl.version.must_equal cask.version
-  end
-
-  it "supports the caskroom_path method" do
-    dsl.caskroom_path.must_equal cask.caskroom_path
-  end
-
-  it "supports the staged_path method" do
-    dsl.staged_path.must_equal cask.staged_path
-  end
-
-  it "supports the appdir method" do
-    dsl.appdir.must_equal cask.appdir
-  end
-end
diff --git a/Library/Homebrew/cask/test/test_helper.rb b/Library/Homebrew/cask/test/test_helper.rb
index f600a1c5c8..57b468d0f8 100644
--- a/Library/Homebrew/cask/test/test_helper.rb
+++ b/Library/Homebrew/cask/test/test_helper.rb
@@ -93,7 +93,6 @@ end
 
 # Extend MiniTest API with support for RSpec-style shared examples
 require "support/shared_examples"
-require "support/shared_examples/dsl_base.rb"
 require "support/shared_examples/staged.rb"
 
 require "support/fake_dirs"