2 files changed, 8 insertions, 10 deletions
diff --git a/Library/Homebrew/cask/spec/cask/cli_spec.rb b/Library/Homebrew/cask/spec/cask/cli_spec.rb
index 9964275f1..6b2313a41 100644
--- a/Library/Homebrew/cask/spec/cask/cli_spec.rb
+++ b/Library/Homebrew/cask/spec/cask/cli_spec.rb
@@ -39,17 +39,17 @@ describe Hbc::CLI do
     end
 
     it "respects the env variable when choosing what appdir to create" do
-      with_environment "HOMEBREW_CASK_OPTS" => "--appdir=/custom/appdir" do
-        expect(Hbc).to receive(:appdir=).with(Pathname("/custom/appdir"))
-        described_class.process("noop")
-      end
+      allow(ENV).to receive(:[])
+      allow(ENV).to receive(:[]).with("HOMEBREW_CASK_OPTS").and_return("--appdir=/custom/appdir")
+      expect(Hbc).to receive(:appdir=).with(Pathname.new("/custom/appdir"))
+      described_class.process("noop")
     end
 
     it "respects the env variable when choosing a non-default Caskroom location" do
-      with_environment "HOMEBREW_CASK_OPTS" => "--caskroom=/custom/caskdir" do
-        expect(Hbc).to receive(:caskroom=).with(Pathname("/custom/caskdir"))
-        described_class.process("noop")
-      end
+      allow(ENV).to receive(:[])
+      allow(ENV).to receive(:[]).with("HOMEBREW_CASK_OPTS").and_return("--caskroom=/custom/caskdir")
+      expect(Hbc).to receive(:caskroom=).with(Pathname.new("/custom/caskdir"))
+      described_class.process("noop")
     end
 
     it "exits with a status of 1 when something goes wrong" do
diff --git a/Library/Homebrew/cask/spec/spec_helper.rb b/Library/Homebrew/cask/spec/spec_helper.rb
index 458fe00f4..162cb3b8f 100644
--- a/Library/Homebrew/cask/spec/spec_helper.rb
+++ b/Library/Homebrew/cask/spec/spec_helper.rb
@@ -15,7 +15,6 @@ require "global"
 # add Homebrew-Cask to load path
 $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.join("cask", "lib").to_s)
 
-require "test/support/helper/env"
 require "test/support/helper/shutup"
 
 Pathname.glob(HOMEBREW_LIBRARY_PATH.join("cask", "spec", "support", "*.rb")).each(&method(:require))
@@ -38,6 +37,5 @@ end
 
 RSpec.configure do |config|
   config.order = :random
-  config.include(Test::Helper::Env)
   config.include(Test::Helper::Shutup)
 end