diff --git a/Library/Homebrew/test/cask/cask_loader_spec.rb b/Library/Homebrew/test/cask/cask_loader_spec.rb
index ccaa8d16aa..42ed564eee 100644
--- a/Library/Homebrew/test/cask/cask_loader_spec.rb
+++ b/Library/Homebrew/test/cask/cask_loader_spec.rb
@@ -85,6 +85,7 @@ describe Cask::CaskLoader, :cask do
         before do
           (old_tap.path/"tap_migrations.json").write tap_migrations.to_json
           old_tap.clear_cache
+          default_tap.clear_cache
         end
 
         it "does not warn when loading the short token" do
@@ -104,6 +105,22 @@ describe Cask::CaskLoader, :cask do
             described_class.for("#{old_tap}/#{token}")
           end.to output(%r{Cask #{old_tap}/#{token} was renamed to #{token}\.}).to_stderr
         end
+
+        # FIXME
+        # context "when there is an infinite tap migration loop" do
+        #   before do
+        #     (default_tap.path/"tap_migrations.json").write({
+        #       token => old_tap.name,
+        #     }.to_json)
+        #     default_tap.clear_cache
+        #   end
+        #
+        #   it "stops recursing" do
+        #     expect do
+        #       described_class.for("#{default_tap}/#{token}")
+        #     end.not_to output.to_stderr
+        #   end
+        # end
       end
     end
   end
diff --git a/Library/Homebrew/test/formulary_spec.rb b/Library/Homebrew/test/formulary_spec.rb
index 86988f0533..2e70d2728d 100644
--- a/Library/Homebrew/test/formulary_spec.rb
+++ b/Library/Homebrew/test/formulary_spec.rb
@@ -540,7 +540,7 @@ describe Formulary do
       end
 
       context "when a formula is migrated to the default tap" do
-        let(:token) { "local-caffeine" }
+        let(:token) { "foo" }
         let(:tap_migrations) do
           {
             token => default_tap.name,
@@ -553,6 +553,7 @@ describe Formulary do
           old_tap.path.mkpath
           (old_tap.path/"tap_migrations.json").write tap_migrations.to_json
           old_tap.clear_cache
+          default_tap.clear_cache
         end
 
         it "does not warn when loading the short token" do
@@ -572,6 +573,22 @@ describe Formulary do
             described_class.loader_for("#{old_tap}/#{token}")
           end.to output(%r{Formula #{old_tap}/#{token} was renamed to #{token}\.}).to_stderr
         end
+
+        # FIXME
+        # context "when there is an infinite tap migration loop" do
+        #   before do
+        #     (default_tap.path/"tap_migrations.json").write({
+        #       token => old_tap.name,
+        #     }.to_json)
+        #     default_tap.clear_cache
+        #   end
+        #
+        #   it "stops recursing" do
+        #     expect do
+        #       described_class.loader_for("#{default_tap}/#{token}")
+        #     end.not_to output.to_stderr
+        #   end
+        # end
       end
     end
   end