1 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/test/cases/column_test.rb b/activerecord/test/cases/column_test.rb
index 5ab2f18e9d..2a6d8cc2ab 100644
--- a/activerecord/test/cases/column_test.rb
+++ b/activerecord/test/cases/column_test.rb
@@ -112,13 +112,11 @@ module ActiveRecord
       end
 
       def test_string_to_time_with_timezone
-        old = ActiveRecord::Base.default_timezone
         [:utc, :local].each do |zone|
-          ActiveRecord::Base.default_timezone = zone
-          assert_equal Time.utc(2013, 9, 4, 0, 0, 0), Column.string_to_time("Wed, 04 Sep 2013 03:00:00 EAT")
+          with_timezone_config default: zone do
+            assert_equal Time.utc(2013, 9, 4, 0, 0, 0), Column.string_to_time("Wed, 04 Sep 2013 03:00:00 EAT")
+          end
         end
-      rescue
-        ActiveRecord::Base.default_timezone = old
       end
     end
   end