diff --git a/spec/controllers/auth/confirmations_controller_spec.rb b/spec/controllers/auth/confirmations_controller_spec.rb
deleted file mode 100644
index 09a178f0e8..0000000000
--- a/spec/controllers/auth/confirmations_controller_spec.rb
+++ /dev/null
@@ -1,100 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe Auth::ConfirmationsController do
-  render_views
-
-  describe 'GET #new' do
-    it 'returns http success' do
-      request.env['devise.mapping'] = Devise.mappings[:user]
-      get :new
-      expect(response).to have_http_status(200)
-    end
-  end
-
-  describe 'GET #show' do
-    context 'when user is unconfirmed' do
-      let!(:user) { Fabricate(:user, confirmation_token: 'foobar', confirmed_at: nil) }
-
-      before do
-        allow(BootstrapTimelineWorker).to receive(:perform_async)
-        request.env['devise.mapping'] = Devise.mappings[:user]
-        get :show, params: { confirmation_token: 'foobar' }
-      end
-
-      it 'redirects to login and queues worker' do
-        expect(response)
-          .to redirect_to(new_user_session_path)
-        expect(BootstrapTimelineWorker)
-          .to have_received(:perform_async).with(user.account_id)
-      end
-    end
-
-    context 'when user is unconfirmed and unapproved' do
-      let!(:user) { Fabricate(:user, confirmation_token: 'foobar', confirmed_at: nil, approved: false) }
-
-      before do
-        allow(BootstrapTimelineWorker).to receive(:perform_async)
-        request.env['devise.mapping'] = Devise.mappings[:user]
-        get :show, params: { confirmation_token: 'foobar' }
-      end
-
-      it 'redirects to login and confirms user' do
-        expect(response).to redirect_to(new_user_session_path)
-        expect(user.reload.confirmed_at).to_not be_nil
-      end
-    end
-
-    context 'when user is already confirmed' do
-      let!(:user) { Fabricate(:user) }
-
-      before do
-        allow(BootstrapTimelineWorker).to receive(:perform_async)
-        request.env['devise.mapping'] = Devise.mappings[:user]
-        sign_in(user, scope: :user)
-        get :show, params: { confirmation_token: 'foobar' }
-      end
-
-      it 'redirects to root path' do
-        expect(response).to redirect_to(root_path)
-      end
-    end
-
-    context 'when user is already confirmed but unapproved' do
-      let!(:user) { Fabricate(:user, approved: false) }
-
-      before do
-        allow(BootstrapTimelineWorker).to receive(:perform_async)
-        request.env['devise.mapping'] = Devise.mappings[:user]
-        user.approved = false
-        user.save!
-        sign_in(user, scope: :user)
-        get :show, params: { confirmation_token: 'foobar' }
-      end
-
-      it 'redirects to settings' do
-        expect(response).to redirect_to(edit_user_registration_path)
-      end
-    end
-
-    context 'when user is updating email' do
-      let!(:user) { Fabricate(:user, confirmation_token: 'foobar', unconfirmed_email: 'new-email@example.com') }
-
-      before do
-        allow(BootstrapTimelineWorker).to receive(:perform_async)
-        request.env['devise.mapping'] = Devise.mappings[:user]
-        get :show, params: { confirmation_token: 'foobar' }
-      end
-
-      it 'redirects to login, confirms email, does not queue worker' do
-        expect(response)
-          .to redirect_to(new_user_session_path)
-        expect(user.reload.unconfirmed_email)
-          .to be_nil
-        expect(BootstrapTimelineWorker)
-          .to_not have_received(:perform_async)
-      end
-    end
-  end
-end
diff --git a/spec/requests/auth/confirmations_spec.rb b/spec/requests/auth/confirmations_spec.rb
new file mode 100644
index 0000000000..09633a4119
--- /dev/null
+++ b/spec/requests/auth/confirmations_spec.rb
@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Auth Confirmation' do
+  describe 'GET /auth/confirmation/new' do
+    it 'returns http success' do
+      get new_user_confirmation_path
+
+      expect(response)
+        .to have_http_status(200)
+    end
+  end
+
+  describe 'GET /auth/confirmation' do
+    context 'when user is unconfirmed' do
+      let!(:user) { Fabricate(:user, confirmation_token: 'foobar', confirmed_at: nil) }
+
+      it 'redirects to login and queues worker' do
+        get user_confirmation_path(confirmation_token: 'foobar')
+
+        expect(response)
+          .to redirect_to(new_user_session_path)
+        expect(BootstrapTimelineWorker)
+          .to have_enqueued_sidekiq_job(user.account_id)
+      end
+    end
+
+    context 'when user is unconfirmed and unapproved' do
+      let!(:user) { Fabricate(:user, confirmation_token: 'foobar', confirmed_at: nil, approved: false) }
+
+      it 'redirects to login and confirms user' do
+        expect { get user_confirmation_path(confirmation_token: 'foobar') }
+          .to change { user.reload.confirmed_at }.to(be_present)
+
+        expect(response)
+          .to redirect_to(new_user_session_path)
+      end
+    end
+
+    context 'when user is already confirmed' do
+      let!(:user) { Fabricate(:user) }
+
+      before { sign_in(user) }
+
+      it 'redirects to root path' do
+        get user_confirmation_path(confirmation_token: 'foobar')
+
+        expect(response)
+          .to redirect_to(root_path)
+      end
+    end
+
+    context 'when user is already confirmed but unapproved' do
+      let!(:user) { Fabricate(:user, approved: false) }
+
+      before do
+        user.approved = false
+        user.save!
+        sign_in(user, scope: :user)
+      end
+
+      it 'redirects to settings' do
+        get user_confirmation_path(confirmation_token: 'foobar')
+
+        expect(response)
+          .to redirect_to(edit_user_registration_path)
+      end
+    end
+
+    context 'when user is updating email' do
+      let!(:user) { Fabricate(:user, confirmation_token: 'foobar', unconfirmed_email: 'new-email@example.com') }
+
+      it 'redirects to login, confirms email, does not queue worker' do
+        expect { get user_confirmation_path(confirmation_token: 'foobar') }
+          .to change { user.reload.unconfirmed_email }.to(be_nil)
+
+        expect(response)
+          .to redirect_to(new_user_session_path)
+        expect(BootstrapTimelineWorker)
+          .to_not have_enqueued_sidekiq_job
+      end
+    end
+  end
+end