diff --git a/test/test_helper.rb b/test/test_helper.rb
index a6195686211cb97e6185ee2d737a21d47a1725f7..a59a6f1c4d862118925a19419362752c980d56a0 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -319,15 +319,10 @@ class GeocoderTestCase < Test::Unit::TestCase
 
   def setup
     super
+    Geocoder::Configuration.instance.set_defaults
     Geocoder.configure(:maxmind => {:service => :city_isp_org})
   end
 
-  def teardown
-    Geocoder.send(:remove_const, :Configuration)
-    load "geocoder/configuration.rb"
-    super
-  end
-
   def geocoded_object_params(abbrev)
     {
       :msg => ["Madison Square Garden", "4 Penn Plaza, New York, NY"]