diff --git a/spec/controllers/internal_users_controller_spec.rb b/spec/controllers/internal_users_controller_spec.rb
index f57ebb4b..5cdeb2fa 100644
--- a/spec/controllers/internal_users_controller_spec.rb
+++ b/spec/controllers/internal_users_controller_spec.rb
@@ -166,6 +166,8 @@ describe InternalUsersController do
   describe 'GET #forgot_password' do
     context 'when no user is logged in' do
       before(:each) do
+        allow(controller).to receive(:set_raven_context).and_return(nil)
+
         expect(controller).to receive(:current_user).and_return(nil)
         get :forgot_password
       end
@@ -176,6 +178,8 @@ describe InternalUsersController do
 
     context 'when a user is already logged in' do
       before(:each) do
+        allow(controller).to receive(:set_raven_context).and_return(nil)
+
         expect(controller).to receive(:current_user).and_return(user)
         get :forgot_password
       end
diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
index 6692e56b..0f51fbbc 100644
--- a/spec/controllers/sessions_controller_spec.rb
+++ b/spec/controllers/sessions_controller_spec.rb
@@ -154,7 +154,10 @@ describe SessionsController do
 
   describe 'DELETE #destroy' do
     let(:user) { double }
-    before(:each) { expect(controller).to receive(:current_user).at_least(:once).and_return(user) }
+    before(:each) {
+      allow(controller).to receive(:set_raven_context).and_return(nil)
+      expect(controller).to receive(:current_user).at_least(:once).and_return(user)
+    }
 
     context 'with an internal user' do
       before(:each) do
@@ -217,6 +220,8 @@ describe SessionsController do
   describe 'GET #new' do
     context 'when no user is logged in' do
       before(:each) do
+        allow(controller).to receive(:set_raven_context).and_return(nil)
+
         expect(controller).to receive(:current_user).and_return(nil)
         get :new
       end
@@ -227,6 +232,8 @@ describe SessionsController do
 
     context 'when a user is already logged in' do
       before(:each) do
+        allow(controller).to receive(:set_raven_context).and_return(nil)
+
         expect(controller).to receive(:current_user).and_return(FactoryBot.build(:teacher))
         get :new
       end