diff --git a/example_app_generator/spec/verify_mailer_preview_path_spec.rb b/example_app_generator/spec/verify_mailer_preview_path_spec.rb
index 9f21bc01e..68bb840a4 100644
--- a/example_app_generator/spec/verify_mailer_preview_path_spec.rb
+++ b/example_app_generator/spec/verify_mailer_preview_path_spec.rb
@@ -33,6 +33,8 @@ def capture_exec(*ops)
               .reject { |line| line =~ /DEPRECATION WARNING/ }
               .reject { |line| line =~ /warning: previous/ }
               .reject { |line| line =~ /warning: already/ }
+              .reject { |line| line =~ /but will no longer be part of the default gems / }
+              .reject { |line| line =~ /You can add .* to your Gemfile/ }
               .join
               .chomp
     CaptureExec.new(out, $?.exitstatus)
diff --git a/features/backtrace_filtering.feature b/features/backtrace_filtering.feature
index 58ef79802..360481a3f 100644
--- a/features/backtrace_filtering.feature
+++ b/features/backtrace_filtering.feature
@@ -39,9 +39,9 @@ Feature: Backtrace filtering
   Scenario: Using the bare `rspec` command
     When I run `rspec`
     Then the output should contain "1 example, 1 failure"
-    And the output should not contain "activesupport"
+    And the output should not contain "actionpack"
 
   Scenario: Using `rspec --backtrace`
     When I run `rspec --backtrace`
     Then the output should contain "1 example, 1 failure"
-    And the output should contain "activesupport"
+    And the output should contain "actionpack"
diff --git a/spec/rspec/rails/matchers/have_enqueued_mail_spec.rb b/spec/rspec/rails/matchers/have_enqueued_mail_spec.rb
index cc4b05a06..0503080ba 100644
--- a/spec/rspec/rails/matchers/have_enqueued_mail_spec.rb
+++ b/spec/rspec/rails/matchers/have_enqueued_mail_spec.rb
@@ -373,7 +373,13 @@ def self.name; "NonMailerJob"; end
       }
     end
 
-    context 'when parameterized', skip: !RSpec::Rails::FeatureCheck.has_action_mailer_parameterized? do
+    context 'when parameterized' do
+      before do
+        unless RSpec::Rails::FeatureCheck.has_action_mailer_parameterized?
+          skip "This version of Rails does not support parameterized mailers"
+        end
+      end
+
       it "passes when mailer is parameterized" do
         expect {
           TestMailer.with('foo' => 'bar').test_email.deliver_later