diff --git a/test/test_helper.rb b/test/test_helper.rb
index bee6fdcf9..1b70baf49 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -47,6 +47,7 @@ class ActiveSupport::TestCase
 
   teardown do
     travel_back
+    Setting.address_processing = false
   end
 end
 
@@ -60,9 +61,14 @@ class ApplicationIntegrationTest < ActionDispatch::IntegrationTest
     WebMock.reset!
     Capybara.reset_sessions!
     Capybara.use_default_driver
+    Setting.address_processing = false
   end
 end
 
 class EppTestCase < ActionDispatch::IntegrationTest
   include Assertions::EppAssertions
+
+  teardown do
+    Setting.address_processing = false
+  end
 end