diff --git a/Library/Homebrew/test/cask/cli/info_spec.rb b/Library/Homebrew/test/cask/cli/info_spec.rb
index 12e93709ff..e3ece577ab 100644
--- a/Library/Homebrew/test/cask/cli/info_spec.rb
+++ b/Library/Homebrew/test/cask/cli/info_spec.rb
@@ -12,7 +12,7 @@ describe Hbc::CLI::Info, :cask do
       local-caffeine: 1.2.3
       http://example.com/local-caffeine
       Not installed
-      From: https://github.com/Homebrew/homebrew-cask-spec/blob/master/Casks/local-caffeine.rb
+      From: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/local-caffeine.rb
       ==> Name
       None
       ==> Artifacts
@@ -26,7 +26,7 @@ describe Hbc::CLI::Info, :cask do
         local-caffeine: 1.2.3
         http://example.com/local-caffeine
         Not installed
-        From: https://github.com/Homebrew/homebrew-cask-spec/blob/master/Casks/local-caffeine.rb
+        From: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/local-caffeine.rb
         ==> Name
         None
         ==> Artifacts
@@ -34,7 +34,7 @@ describe Hbc::CLI::Info, :cask do
         local-transmission: 2.61
         http://example.com/local-transmission
         Not installed
-        From: https://github.com/Homebrew/homebrew-cask-spec/blob/master/Casks/local-transmission.rb
+        From: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/local-transmission.rb
         ==> Name
         None
         ==> Artifacts
@@ -56,7 +56,7 @@ describe Hbc::CLI::Info, :cask do
       with-caveats: 1.2.3
       http://example.com/local-caffeine
       Not installed
-      From: https://github.com/Homebrew/homebrew-cask-spec/blob/master/Casks/with-caveats.rb
+      From: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/with-caveats.rb
       ==> Name
       None
       ==> Artifacts
@@ -82,7 +82,7 @@ describe Hbc::CLI::Info, :cask do
       with-conditional-caveats: 1.2.3
       http://example.com/local-caffeine
       Not installed
-      From: https://github.com/Homebrew/homebrew-cask-spec/blob/master/Casks/with-conditional-caveats.rb
+      From: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/with-conditional-caveats.rb
       ==> Name
       None
       ==> Artifacts
@@ -97,7 +97,7 @@ describe Hbc::CLI::Info, :cask do
       with-languages: 1.2.3
       http://example.com/local-caffeine
       Not installed
-      From: https://github.com/Homebrew/homebrew-cask-spec/blob/master/Casks/with-languages.rb
+      From: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/with-languages.rb
       ==> Name
       None
       ==> Languages
@@ -114,7 +114,7 @@ describe Hbc::CLI::Info, :cask do
       without-languages: 1.2.3
       http://example.com/local-caffeine
       Not installed
-      From: https://github.com/Homebrew/homebrew-cask-spec/blob/master/Casks/without-languages.rb
+      From: https://github.com/Homebrew/homebrew-cask/blob/master/Casks/without-languages.rb
       ==> Name
       None
       ==> Artifacts
diff --git a/Library/Homebrew/test/cask/cli/style_spec.rb b/Library/Homebrew/test/cask/cli/style_spec.rb
index ae5e24d2ec..8e6655bde5 100644
--- a/Library/Homebrew/test/cask/cli/style_spec.rb
+++ b/Library/Homebrew/test/cask/cli/style_spec.rb
@@ -89,7 +89,7 @@ describe Hbc::CLI::Style, :cask do
         end
       end
 
-      it { is_expected.to contain_exactly(a_path_ending_with("/homebrew/homebrew-cask-spec/Casks"), a_path_ending_with("/third-party/homebrew-tap/Casks")) }
+      it { is_expected.to contain_exactly(a_path_ending_with("/homebrew/homebrew-cask/Casks"), a_path_ending_with("/third-party/homebrew-tap/Casks")) }
     end
 
     context "when at least one cask token is a path that exists" do
diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb b/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
index 69c5952de2..392f197256 100644
--- a/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
+++ b/Library/Homebrew/test/support/helper/spec/shared_context/homebrew_cask.rb
@@ -25,7 +25,7 @@ RSpec.shared_context "Homebrew-Cask" do
 
       [Hbc::Config.global.binarydir, Hbc::Caskroom.path, Hbc::Cache.path].each(&:mkpath)
 
-      Hbc.default_tap = Tap.fetch("Homebrew", "cask-spec").tap do |tap|
+      Hbc.default_tap.tap do |tap|
         FileUtils.mkdir_p tap.path.dirname
         FileUtils.ln_sf TEST_FIXTURE_DIR.join("cask"), tap.path
       end