diff --git a/spec/features/consumer/account/settings_spec.rb b/spec/features/consumer/account/settings_spec.rb
index e9001f177c4..32dc8d35349 100644
--- a/spec/features/consumer/account/settings_spec.rb
+++ b/spec/features/consumer/account/settings_spec.rb
@@ -33,7 +33,6 @@
     end
 
     it "allows the user to change their password" do
-      allow(Spree::Auth::Config).to receive(:[]).with(:signout_after_password_change).and_return(false)
       initial_password = user.encrypted_password
 
       fill_in 'user_password', with: 'NewPassword'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 328c2aaac30..6b73d23fb04 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -120,6 +120,7 @@ def restart_phantomjs
       spree_config.allow_backorders = false
     end
 
+    Spree::Auth::Config[:signout_after_password_change] = false
     Spree::Api::Config[:requires_authentication] = true
   end