diff --git a/spec/support/system_helpers.rb b/spec/support/system_helpers.rb
index 18889844f8..ffbba177b3 100644
--- a/spec/support/system_helpers.rb
+++ b/spec/support/system_helpers.rb
@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
 module SystemHelpers
-  def admin_user
-    Fabricate(:admin_user)
-  end
-
   def submit_button
     I18n.t('generic.save_changes')
   end
diff --git a/spec/system/admin/announcements/previews_spec.rb b/spec/system/admin/announcements/previews_spec.rb
index 524dd23718..0c9a931cb2 100644
--- a/spec/system/admin/announcements/previews_spec.rb
+++ b/spec/system/admin/announcements/previews_spec.rb
@@ -3,6 +3,7 @@
 require 'rails_helper'
 
 RSpec.describe 'Admin Announcements Mail Previews' do
+  let(:admin_user) { Fabricate(:admin_user) }
   let(:announcement) { Fabricate(:announcement, notification_sent_at: nil) }
 
   before { sign_in(admin_user) }
diff --git a/spec/system/admin/relationships_spec.rb b/spec/system/admin/relationships_spec.rb
index 2d64857c48..ba90fe156e 100644
--- a/spec/system/admin/relationships_spec.rb
+++ b/spec/system/admin/relationships_spec.rb
@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 RSpec.describe 'Admin Relationships' do
+  let(:admin_user) { Fabricate(:admin_user) }
+
   before { sign_in(admin_user) }
 
   describe 'Viewing account relationships page' do
diff --git a/spec/system/admin/settings/about_spec.rb b/spec/system/admin/settings/about_spec.rb
index c7405a8d5a..93ee3f6864 100644
--- a/spec/system/admin/settings/about_spec.rb
+++ b/spec/system/admin/settings/about_spec.rb
@@ -3,9 +3,14 @@
 require 'rails_helper'
 
 RSpec.describe 'Admin::Settings::About' do
+  let(:admin_user) { Fabricate(:admin_user) }
+
+  before { sign_in(admin_user) }
+
   it 'Saves changes to about settings' do
-    sign_in admin_user
     visit admin_settings_about_path
+    expect(page)
+      .to have_title(I18n.t('admin.settings.about.title'))
 
     fill_in extended_description_field,
             with: 'new site description'
diff --git a/spec/system/admin/settings/appearance_spec.rb b/spec/system/admin/settings/appearance_spec.rb
index 56af58c812..2f6e67979e 100644
--- a/spec/system/admin/settings/appearance_spec.rb
+++ b/spec/system/admin/settings/appearance_spec.rb
@@ -3,9 +3,14 @@
 require 'rails_helper'
 
 RSpec.describe 'Admin::Settings::Appearance' do
+  let(:admin_user) { Fabricate(:admin_user) }
+
+  before { sign_in(admin_user) }
+
   it 'Saves changes to appearance settings' do
-    sign_in admin_user
     visit admin_settings_appearance_path
+    expect(page)
+      .to have_title(I18n.t('admin.settings.appearance.title'))
 
     fill_in custom_css_field,
             with: 'html { display: inline; }'
diff --git a/spec/system/admin/settings/branding_spec.rb b/spec/system/admin/settings/branding_spec.rb
index 5cd9319ce0..78364669e9 100644
--- a/spec/system/admin/settings/branding_spec.rb
+++ b/spec/system/admin/settings/branding_spec.rb
@@ -3,9 +3,14 @@
 require 'rails_helper'
 
 RSpec.describe 'Admin::Settings::Branding' do
+  let(:admin_user) { Fabricate(:admin_user) }
+
+  before { sign_in(admin_user) }
+
   it 'Saves changes to branding settings' do
-    sign_in admin_user
     visit admin_settings_branding_path
+    expect(page)
+      .to have_title(I18n.t('admin.settings.branding.title'))
 
     fill_in short_description_field,
             with: 'new key value'
diff --git a/spec/system/admin/settings/content_retention_spec.rb b/spec/system/admin/settings/content_retention_spec.rb
index f788f8eea0..b813c4fa5b 100644
--- a/spec/system/admin/settings/content_retention_spec.rb
+++ b/spec/system/admin/settings/content_retention_spec.rb
@@ -3,9 +3,14 @@
 require 'rails_helper'
 
 RSpec.describe 'Admin::Settings::ContentRetention' do
+  let(:admin_user) { Fabricate(:admin_user) }
+
+  before { sign_in(admin_user) }
+
   it 'Saves changes to content retention settings' do
-    sign_in admin_user
     visit admin_settings_content_retention_path
+    expect(page)
+      .to have_title(I18n.t('admin.settings.content_retention.title'))
 
     fill_in media_cache_retention_period_field,
             with: '2'
diff --git a/spec/system/admin/settings/discovery_spec.rb b/spec/system/admin/settings/discovery_spec.rb
index f000d18370..f6909da9be 100644
--- a/spec/system/admin/settings/discovery_spec.rb
+++ b/spec/system/admin/settings/discovery_spec.rb
@@ -3,9 +3,14 @@
 require 'rails_helper'
 
 RSpec.describe 'Admin::Settings::Discovery' do
+  let(:admin_user) { Fabricate(:admin_user) }
+
+  before { sign_in(admin_user) }
+
   it 'Saves changes to discovery settings' do
-    sign_in admin_user
     visit admin_settings_discovery_path
+    expect(page)
+      .to have_title(I18n.t('admin.settings.discovery.title'))
 
     check trends_box
 
diff --git a/spec/system/admin/settings/registrations_spec.rb b/spec/system/admin/settings/registrations_spec.rb
index d026b07c85..9b8bef4172 100644
--- a/spec/system/admin/settings/registrations_spec.rb
+++ b/spec/system/admin/settings/registrations_spec.rb
@@ -3,9 +3,14 @@
 require 'rails_helper'
 
 RSpec.describe 'Admin::Settings::Registrations' do
+  let(:admin_user) { Fabricate(:admin_user) }
+
+  before { sign_in(admin_user) }
+
   it 'Saves changes to registrations settings' do
-    sign_in admin_user
     visit admin_settings_registrations_path
+    expect(page)
+      .to have_title(I18n.t('admin.settings.registrations.title'))
 
     select open_mode_option,
            from: registrations_mode_field
diff --git a/spec/system/admin/terms_of_service/drafts_spec.rb b/spec/system/admin/terms_of_service/drafts_spec.rb
index 3c272694cb..cf4c10ce00 100644
--- a/spec/system/admin/terms_of_service/drafts_spec.rb
+++ b/spec/system/admin/terms_of_service/drafts_spec.rb
@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 RSpec.describe 'Admin TermsOfService Drafts' do
+  let(:admin_user) { Fabricate(:admin_user) }
+
   before { sign_in(admin_user) }
 
   describe 'Managing TOS drafts' do
diff --git a/spec/system/admin/terms_of_service/generates_spec.rb b/spec/system/admin/terms_of_service/generates_spec.rb
index 2307d245b0..aece7a0474 100644
--- a/spec/system/admin/terms_of_service/generates_spec.rb
+++ b/spec/system/admin/terms_of_service/generates_spec.rb
@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 RSpec.describe 'Admin TermsOfService Generates' do
+  let(:admin_user) { Fabricate(:admin_user) }
+
   before { sign_in(admin_user) }
 
   describe 'Generating a TOS policy' do
diff --git a/spec/system/admin/terms_of_service/previews_spec.rb b/spec/system/admin/terms_of_service/previews_spec.rb
index f6030c62a9..df72e601dc 100644
--- a/spec/system/admin/terms_of_service/previews_spec.rb
+++ b/spec/system/admin/terms_of_service/previews_spec.rb
@@ -4,6 +4,7 @@ require 'rails_helper'
 
 RSpec.describe 'Admin TermsOfService Previews' do
   let(:terms_of_service) { Fabricate(:terms_of_service, notification_sent_at: nil) }
+  let(:admin_user) { Fabricate(:admin_user) }
 
   before { sign_in(admin_user) }