diff --git a/lib/rails/generators/pages_core/rspec/rspec_generator.rb b/lib/rails/generators/pages_core/rspec/rspec_generator.rb
index 48f43357..8fa85465 100644
--- a/lib/rails/generators/pages_core/rspec/rspec_generator.rb
+++ b/lib/rails/generators/pages_core/rspec/rspec_generator.rb
@@ -23,14 +23,12 @@ def setup_test_gems
       def setup_rspec
         create_file File.join(".rspec"), "--format Fuubar\n--colour\n" \
                                          "--require spec_helper"
-        create_file File.join("spec/controllers/.keep")
         create_file File.join("spec/mailers/preview/.keep")
         create_file File.join("spec/models/.keep")
         create_file File.join("spec/system/.keep")
         template "spec_helper.rb", File.join("spec/spec_helper.rb")
         template "rails_helper.rb", File.join("spec/rails_helper.rb")
         template "factories.rb", File.join("spec/factories.rb")
-        template "mailer_macros.rb", File.join("spec/support/mailer_macros.rb")
         template("page_templates_spec.rb",
                  File.join("spec/system/page_templates_spec.rb"))
       end
diff --git a/lib/rails/generators/pages_core/rspec/templates/mailer_macros.rb b/lib/rails/generators/pages_core/rspec/templates/mailer_macros.rb
deleted file mode 100644
index 49482060..00000000
--- a/lib/rails/generators/pages_core/rspec/templates/mailer_macros.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module MailerMacros
-  def last_email
-    ActionMailer::Base.deliveries.last
-  end
-
-  def reset_email
-    ActionMailer::Base.deliveries = []
-  end
-end
diff --git a/lib/rails/generators/pages_core/rspec/templates/rails_helper.rb b/lib/rails/generators/pages_core/rspec/templates/rails_helper.rb
index ee3426bc..cdb7698d 100644
--- a/lib/rails/generators/pages_core/rspec/templates/rails_helper.rb
+++ b/lib/rails/generators/pages_core/rspec/templates/rails_helper.rb
@@ -6,16 +6,16 @@
 require "simplecov"
 SimpleCov.start "rails" if ARGV.grep(/spec\.rb/).empty?
 
+require "spec_helper"
 require File.expand_path("../config/environment", __dir__)
 
 # Prevent database truncation if the environment is production
 if Rails.env.production?
   abort("The Rails environment is running in production mode!")
 end
-require "spec_helper"
 require "rspec/rails"
-# Add additional requires below this line. Rails is not loaded until this point!
 
+# Add additional requires below this line. Rails is not loaded until this point!
 require "shoulda-matchers"
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
@@ -41,7 +41,7 @@
 
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = Rails.root.join("spec/fixtures")
+  # config.fixture_paths = [Rails.root.join("spec/fixtures")]
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
@@ -69,7 +69,6 @@
   # config.filter_gems_from_backtrace("gem name")
 
   config.include ActiveJob::TestHelper
-  config.include MailerMacros
 
   # Use FactoryBot shorthand
   config.include FactoryBot::Syntax::Methods