diff --git a/spec/controllers/devise_overrides/sessions_controller_spec.rb b/spec/controllers/devise_overrides/sessions_controller_spec.rb
index 68d668d45..a32138275 100644
--- a/spec/controllers/devise_overrides/sessions_controller_spec.rb
+++ b/spec/controllers/devise_overrides/sessions_controller_spec.rb
@@ -165,9 +165,8 @@ RSpec.describe DeviseOverrides::SessionsController, type: :controller do
   end
 
   describe 'session limit enforcement' do
-    before { stub_const('DeviseOverrides::SessionsController::MAX_SESSIONS', 5) }
-
     let(:user) { create(:user, password: 'Test@123456') }
+    let(:session_limit) { described_class::MAX_SESSIONS }
     let(:browser_ua) { 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.2.1 Safari/605.1.15' }
     let(:mobile_ua) { 'okhttp/4.9.3' }
 
@@ -195,9 +194,9 @@ RSpec.describe DeviseOverrides::SessionsController, type: :controller do
 
       it 'does not count expired tokens toward the cap' do
         request.env['HTTP_USER_AGENT'] = browser_ua
-        # 3 expired + 2 active = 5 raw entries, but only 2 active
+        # Raw token count reaches the cap, but three tokens are expired
         3.times { |i| seed_token("expired#{i}", expiry_offset_days: -1, with_session: false) }
-        2.times { |i| seed_token("active#{i}", expiry_offset_days: 30) }
+        (session_limit - 3).times { |i| seed_token("active#{i}", expiry_offset_days: 30) }
 
         post :create, params: login_params
 
@@ -208,7 +207,7 @@ RSpec.describe DeviseOverrides::SessionsController, type: :controller do
     context 'when at the limit from a browser with full tracking' do
       before do
         request.env['HTTP_USER_AGENT'] = browser_ua
-        5.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+        session_limit.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
       end
 
       it 'returns 409 with the session list (picker)' do
@@ -217,7 +216,7 @@ RSpec.describe DeviseOverrides::SessionsController, type: :controller do
         expect(response).to have_http_status(:conflict)
         body = response.parsed_body
         expect(body['sessions_limit_reached']).to be true
-        expect(body['sessions'].size).to eq(5)
+        expect(body['sessions'].size).to eq(session_limit)
       end
 
       it 'does not create a new session row' do
@@ -228,7 +227,7 @@ RSpec.describe DeviseOverrides::SessionsController, type: :controller do
     context 'when at the limit from a non-browser client' do
       before do
         request.env['HTTP_USER_AGENT'] = mobile_ua
-        5.times { |i| seed_token("c#{i}", expiry_offset_days: 30 + i, with_session: false) }
+        session_limit.times { |i| seed_token("c#{i}", expiry_offset_days: 30 + i, with_session: false) }
       end
 
       it 'silently evicts the oldest token and lets login proceed' do
@@ -242,9 +241,9 @@ RSpec.describe DeviseOverrides::SessionsController, type: :controller do
     context 'when at the limit but tracking is partial (legacy tokens present)' do
       before do
         request.env['HTTP_USER_AGENT'] = browser_ua
-        # one tracked, four legacy (no user_session rows)
+        # One tracked session, with the remaining tokens having no user_session rows
         seed_token('tracked', expiry_offset_days: 60, with_session: true)
-        4.times { |i| seed_token("legacy#{i}", expiry_offset_days: 10 + i, with_session: false) }
+        (session_limit - 1).times { |i| seed_token("legacy#{i}", expiry_offset_days: 10 + i, with_session: false) }
       end
 
       it 'silent-evicts instead of showing a partial picker' do
@@ -266,10 +265,10 @@ RSpec.describe DeviseOverrides::SessionsController, type: :controller do
     context 'when at the limit with full tracking (no legacy gap)' do
       before do
         request.env['HTTP_USER_AGENT'] = mobile_ua
-        # Five tracked sessions, varying activity timestamps
-        5.times do |i|
+        # Tracked sessions with varying activity timestamps
+        session_limit.times do |i|
           seed_token("tracked#{i}", expiry_offset_days: 30)
-          user.user_sessions.find_by(client_id: "tracked#{i}").update!(last_activity_at: (5 - i).days.ago)
+          user.user_sessions.find_by(client_id: "tracked#{i}").update!(last_activity_at: (session_limit - i).days.ago)
         end
       end
 
@@ -277,7 +276,7 @@ RSpec.describe DeviseOverrides::SessionsController, type: :controller do
         post :create, params: login_params
 
         expect(response).to have_http_status(:success)
-        # tracked0 had the oldest last_activity_at (5 days ago)
+        # tracked0 has the oldest last_activity_at
         expect(user.reload.tokens.keys).not_to include('tracked0')
         expect(user.user_sessions.exists?(client_id: 'tracked0')).to be false
       end
@@ -286,7 +285,7 @@ RSpec.describe DeviseOverrides::SessionsController, type: :controller do
     context 'with revoke_session_id during login' do
       before do
         request.env['HTTP_USER_AGENT'] = browser_ua
-        5.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+        session_limit.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
       end
 
       it 'revokes the chosen session and proceeds with login' do
@@ -303,7 +302,7 @@ RSpec.describe DeviseOverrides::SessionsController, type: :controller do
     context 'with revoke_all_sessions during login' do
       before do
         request.env['HTTP_USER_AGENT'] = browser_ua
-        5.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
+        session_limit.times { |i| seed_token("c#{i}", expiry_offset_days: 30) }
       end
 
       it 'wipes all sessions and tokens, then proceeds with login' do
diff --git a/spec/enterprise/jobs/captain/llm/conversation_faq_job_spec.rb b/spec/enterprise/jobs/captain/llm/conversation_faq_job_spec.rb
index 8925363e5..520f57fa1 100644
--- a/spec/enterprise/jobs/captain/llm/conversation_faq_job_spec.rb
+++ b/spec/enterprise/jobs/captain/llm/conversation_faq_job_spec.rb
@@ -50,7 +50,9 @@ RSpec.describe Captain::Llm::ConversationFaqJob, type: :job do
 
         expect do
           described_class.new.perform(conversation, assistant)
-        end.to raise_error(MutexApplicationJob::LockAcquisitionError)
+        end.to(raise_error do |error|
+          expect(error.class.name).to eq('MutexApplicationJob::LockAcquisitionError')
+        end)
       end
     end
   end