diff --git a/activerecord/test/cases/aggregations_test.rb b/activerecord/test/cases/aggregations_test.rb
index 5bd8f76ba246a53e8296f23860955ca9e494b6fe..48b06a767f0180090be444fc786d131c0b28b1a8 100644
--- a/activerecord/test/cases/aggregations_test.rb
+++ b/activerecord/test/cases/aggregations_test.rb
@@ -114,6 +114,8 @@ def test_nil_return_from_converter_is_respected_when_allow_nil_is_true
     customers(:david).save
     customers(:david).reload
     assert_nil customers(:david).non_blank_gps_location
+  ensure
+    Customer.gps_conversion_was_run = nil
   end
 
   def test_nil_return_from_converter_results_in_failure_when_allow_nil_is_false