2 files changed, 5 insertions, 8 deletions
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index 34ead0a4c0..6637c2cae9 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -1405,8 +1405,7 @@ class CookiesTest < ActionController::TestCase
 
     assert_equal "5-2-Stable Chocolate Cookies", cookies.encrypted[:favorite]
 
-    freeze_time do
-      travel 1001.years
+    travel 1001.years do
       assert_nil cookies.encrypted[:favorite]
     end
 
@@ -1422,8 +1421,7 @@ class CookiesTest < ActionController::TestCase
 
     assert_equal "5-2-Stable Choco Chip Cookie", cookies.signed[:favorite]
 
-    freeze_time do
-      travel 1001.years
+    travel 1001.years do
       assert_nil cookies.signed[:favorite]
     end
 
@@ -1439,8 +1437,7 @@ class CookiesTest < ActionController::TestCase
 
     assert_equal "5-2-Stable Chocolate Cookies", cookies.encrypted[:favorite]
 
-    freeze_time do
-      travel 1001.years
+    travel 1001.years do
       assert_nil cookies.encrypted[:favorite]
     end
 
@@ -1456,8 +1453,7 @@ class CookiesTest < ActionController::TestCase
 
     assert_equal "5-2-Stable Choco Chip Cookie", cookies.signed[:favorite]
 
-    freeze_time do
-      travel 1001.years
+    travel 1001.years do
       assert_nil cookies.signed[:favorite]
     end
 
diff --git a/actionpack/test/dispatch/exception_wrapper_test.rb b/actionpack/test/dispatch/exception_wrapper_test.rb
index 600280d6b3..668469a01d 100644
--- a/actionpack/test/dispatch/exception_wrapper_test.rb
+++ b/actionpack/test/dispatch/exception_wrapper_test.rb
@@ -20,6 +20,7 @@ module ActionDispatch
 
     setup do
       @cleaner = ActiveSupport::BacktraceCleaner.new
+      @cleaner.remove_filters!
       @cleaner.add_silencer { |line| line !~ /^lib/ }
     end