diff --git a/Library/Homebrew/cask/spec/cask/scopes_spec.rb b/Library/Homebrew/cask/spec/cask/scopes_spec.rb
index 12c1a697f7..abf4b6401b 100644
--- a/Library/Homebrew/cask/spec/cask/scopes_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/scopes_spec.rb
@@ -1,39 +1,31 @@
 describe Hbc::Scopes do
   describe "installed" do
-    let(:fake_caskroom) { Pathname(Dir.mktmpdir) }
-
-    before do
-      allow(Hbc).to receive(:caskroom) { fake_caskroom }
-    end
-
-    after do
-      fake_caskroom.rmtree
-    end
-
     it "returns a list installed Casks by loading Casks for all the dirs that exist in the caskroom" do
       allow(Hbc).to receive(:load) { |token| "loaded-#{token}" }
 
-      fake_caskroom.join("cask-bar").mkdir
-      fake_caskroom.join("cask-foo").mkdir
+      Hbc.caskroom.join("cask-bar").mkpath
+      Hbc.caskroom.join("cask-foo").mkpath
 
       installed_casks = Hbc.installed
 
       expect(Hbc).to have_received(:load).with("cask-bar")
       expect(Hbc).to have_received(:load).with("cask-foo")
-      expect(installed_casks).to eq(%w[
-                                      loaded-cask-bar
-                                      loaded-cask-foo
-                                    ])
+      expect(installed_casks).to eq(
+        %w[
+          loaded-cask-bar
+          loaded-cask-foo
+        ]
+      )
     end
 
     it "optimizes performance by resolving to a fully qualified path before calling Hbc.load" do
-      fake_tapped_cask_dir = Pathname(Dir.mktmpdir).join("Casks")
+      fake_tapped_cask_dir = Pathname.new(Dir.mktmpdir).join("Casks")
       absolute_path_to_cask = fake_tapped_cask_dir.join("some-cask.rb")
 
       allow(Hbc).to receive(:load)
       allow(Hbc).to receive(:all_tapped_cask_dirs) { [fake_tapped_cask_dir] }
 
-      fake_caskroom.join("some-cask").mkdir
+      Hbc.caskroom.join("some-cask").mkdir
       fake_tapped_cask_dir.mkdir
       FileUtils.touch(absolute_path_to_cask)
 
diff --git a/Library/Homebrew/cask/spec/spec_helper.rb b/Library/Homebrew/cask/spec/spec_helper.rb
index eefee3d60e..dc9edec3d2 100644
--- a/Library/Homebrew/cask/spec/spec_helper.rb
+++ b/Library/Homebrew/cask/spec/spec_helper.rb
@@ -34,4 +34,10 @@ end
 RSpec.configure do |config|
   config.order = :random
   config.include(Test::Helper::Shutup)
+  config.after(:each) do
+    FileUtils.rm_rf [
+      Hbc.appdir.children,
+      Hbc.caskroom.children,
+    ]
+  end
 end