Use ActiveSupport's silence_warnings method.

test/unit/error_handling_test.rb

@@ -9,15 +9,13 @@ class ErrorHandlingTest < GeocoderTestCase
   end
 
   def test_does_not_choke_on_timeout
-    # keep test output clean: suppress timeout warning
-    orig = $VERBOSE; $VERBOSE = nil
-    Geocoder::Lookup.all_services_except_test.each do |l|
-      Geocoder.configure(:lookup => l)
-      set_api_key!(l)
-      assert_nothing_raised { Geocoder.search("timeout") }
+    silence_warnings do
+      Geocoder::Lookup.all_services_except_test.each do |l|
+        Geocoder.configure(:lookup => l)
+        set_api_key!(l)
+        assert_nothing_raised { Geocoder.search("timeout") }
+      end
     end
-  ensure
-    $VERBOSE = orig
   end
 
   def test_always_raise_timeout_error

test/unit/lookup_test.rb

@@ -68,16 +68,14 @@ class LookupTest < GeocoderTestCase
   end
 
   def test_returns_empty_array_on_invalid_key
-    # keep test output clean: suppress timeout warning
-    orig = $VERBOSE; $VERBOSE = nil
-    #Geocoder::Lookup.all_services_except_test.each do |l|
-    [:bing, :yahoo, :yandex, :maxmind, :cloudmade, :baidu, :baidu_ip].each do |l|
-      Geocoder.configure(:lookup => l)
-      set_api_key!(l)
-      assert_equal [], Geocoder.search("invalid key")
+    silence_warnings do
+      #Geocoder::Lookup.all_services_except_test.each do |l|
+      [:bing, :yahoo, :yandex, :maxmind, :cloudmade, :baidu, :baidu_ip].each do |l|
+        Geocoder.configure(:lookup => l)
+        set_api_key!(l)
+        assert_equal [], Geocoder.search("invalid key")
+      end
     end
-  ensure
-    $VERBOSE = orig
   end
 
   def test_does_not_choke_on_nil_address

test/unit/lookups/yahoo_test.rb

@@ -14,11 +14,9 @@ class YahooTest < GeocoderTestCase
   end
 
   def test_error
-    # keep test output clean: suppress timeout warning
-    orig = $VERBOSE; $VERBOSE = nil
-    assert_equal [], Geocoder.search("error")
-  ensure
-    $VERBOSE = orig
+    silence_warnings do
+      assert_equal [], Geocoder.search("error")
+    end
   end
 
   def test_result_components