diff --git a/test/integration/http_client_test.rb b/test/integration/http_client_test.rb
index c024d59a61faec08740f5c7d87c187c8283af15e..20a9cf8d625e61897ebdf40f98b5ae271f344c13 100644
--- a/test/integration/http_client_test.rb
+++ b/test/integration/http_client_test.rb
@@ -1,4 +1,5 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[ .. .. lib]))
+# encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..", "lib")
 require 'pathname'
 require 'rubygems'
 require 'test/unit'
diff --git a/test/unit/active_record_test.rb b/test/unit/active_record_test.rb
index 3392765302524d285c3b1d898adc36f579902eca..60e6e4d0d84676f9f5879bafd99ba8d917b5cde8 100644
--- a/test/unit/active_record_test.rb
+++ b/test/unit/active_record_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class ActiveRecordTest < GeocoderTestCase
diff --git a/test/unit/cache_test.rb b/test/unit/cache_test.rb
index d473096443a76f6b66bf464917a1dc00b26b6176..7777fdb2408899ee5fb09295977ed20ac9943a84 100644
--- a/test/unit/cache_test.rb
+++ b/test/unit/cache_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class CacheTest < GeocoderTestCase
diff --git a/test/unit/calculations_test.rb b/test/unit/calculations_test.rb
index 98fdfbcd0155441bab17d3eba962f0a56c8e779e..83b0faf39860b29f18efaa6032458f60d10adf44 100644
--- a/test/unit/calculations_test.rb
+++ b/test/unit/calculations_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class CalculationsTest < GeocoderTestCase
diff --git a/test/unit/configuration_test.rb b/test/unit/configuration_test.rb
index 527a57e7bf674f75c539c29bccb85c91caba8790..e28f831d70eabeb83ddfa3ad07c9408be70ffe12 100644
--- a/test/unit/configuration_test.rb
+++ b/test/unit/configuration_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class ConfigurationTest < GeocoderTestCase
diff --git a/test/unit/error_handling_test.rb b/test/unit/error_handling_test.rb
index faf53192e594c6c78a3d0fa67b22ff0696f83a55..58dc37f8df219a0abf69f0d2e77d810c7127af5d 100644
--- a/test/unit/error_handling_test.rb
+++ b/test/unit/error_handling_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class ErrorHandlingTest < GeocoderTestCase
diff --git a/test/unit/geocoder_test.rb b/test/unit/geocoder_test.rb
index 7dc4e0f5a4860fc44680a6aa500871970a8fd545..754c88dde14f796246d9aa86ca7e224bd5bc2eca 100644
--- a/test/unit/geocoder_test.rb
+++ b/test/unit/geocoder_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class GeocoderTest < GeocoderTestCase
diff --git a/test/unit/https_test.rb b/test/unit/https_test.rb
index 14420dfcd979de9d9cb65be29f9d08dca3c4005c..b8dc52abc3f753641161ccce0b10ce2479fbdc31 100644
--- a/test/unit/https_test.rb
+++ b/test/unit/https_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class HttpsTest < GeocoderTestCase
diff --git a/test/unit/ip_address_test.rb b/test/unit/ip_address_test.rb
index 2e36f8bb8fd1a7afa4239bec32c8fef4d09a50bb..4de712b94cbd53dffe01e88b97df42742e5cd6eb 100644
--- a/test/unit/ip_address_test.rb
+++ b/test/unit/ip_address_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class IpAddressTest < GeocoderTestCase
diff --git a/test/unit/lookup_test.rb b/test/unit/lookup_test.rb
index 0f8dae4be6bcca4944047b672d3f94b92326a27c..6512c8e1b5965b3284df5f20a60bf3fa6e23b579 100644
--- a/test/unit/lookup_test.rb
+++ b/test/unit/lookup_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class LookupTest < GeocoderTestCase
diff --git a/test/unit/lookups/bing_test.rb b/test/unit/lookups/bing_test.rb
index f55e2ef9faabec612eca67bb3520ed73ccb778b5..864bc8ac80868afe174084be23179c72d2f5be0f 100644
--- a/test/unit/lookups/bing_test.rb
+++ b/test/unit/lookups/bing_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
 require 'test_helper'
 
 class BingTest < GeocoderTestCase
diff --git a/test/unit/lookups/dstk_test.rb b/test/unit/lookups/dstk_test.rb
index 2e73e4479c550d1239f099d6d5de39dadf2ba27c..840174e902744ed29ea8c0bb47e50be0107c2b3a 100644
--- a/test/unit/lookups/dstk_test.rb
+++ b/test/unit/lookups/dstk_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
 require 'test_helper'
 
 class DstkTest < GeocoderTestCase
diff --git a/test/unit/lookups/esri_test.rb b/test/unit/lookups/esri_test.rb
index 8d6bcbe1e14f8b253b31115606d568d9b067b482..625fff7dc90f8f2d1df3e7125d570ba4e2f81f9e 100644
--- a/test/unit/lookups/esri_test.rb
+++ b/test/unit/lookups/esri_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
 require 'test_helper'
 
 class EsriTest < GeocoderTestCase
diff --git a/test/unit/lookups/freegeoip_test.rb b/test/unit/lookups/freegeoip_test.rb
index 565efb6b859154ce3708abe60154707a64b3ddd5..5d6da52a8036d2e27ea0c7de6d496fcf586cfc34 100644
--- a/test/unit/lookups/freegeoip_test.rb
+++ b/test/unit/lookups/freegeoip_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
 require 'test_helper'
 
 class FreegeoipTest < GeocoderTestCase
diff --git a/test/unit/lookups/geocoder_ca_test.rb b/test/unit/lookups/geocoder_ca_test.rb
index 927faaf0b3876641f7e3359df3365322c71289d0..45b88e734d7831169bd962f486c3bdc1a58e4cf7 100644
--- a/test/unit/lookups/geocoder_ca_test.rb
+++ b/test/unit/lookups/geocoder_ca_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
 require 'test_helper'
 
 class GeocoderCaTest < GeocoderTestCase
diff --git a/test/unit/lookups/geocodio_test.rb b/test/unit/lookups/geocodio_test.rb
index bbf370a9fbecaf0bfef1c77fc3803232ee90d741..68280c08db28b4a2e22255eca90ca5ac7d298118 100644
--- a/test/unit/lookups/geocodio_test.rb
+++ b/test/unit/lookups/geocodio_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
 require 'test_helper'
 
 class GeocodioTest < GeocoderTestCase
diff --git a/test/unit/lookups/google_premier_test.rb b/test/unit/lookups/google_premier_test.rb
index c96c4a1ff212a7df5105599b50e0376ac16f4ab8..517e78cf140ea43f96c55ac62b45f185c580eda3 100644
--- a/test/unit/lookups/google_premier_test.rb
+++ b/test/unit/lookups/google_premier_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
 require 'test_helper'
 
 class GooglePremierTest < GeocoderTestCase
diff --git a/test/unit/lookups/google_test.rb b/test/unit/lookups/google_test.rb
index fec7acb3244450ed1822438e7dfb8701f605233f..35960a5151d50d4e397cfeabc888fa7df1096742 100644
--- a/test/unit/lookups/google_test.rb
+++ b/test/unit/lookups/google_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
 require 'test_helper'
 
 class GoogleTest < GeocoderTestCase
diff --git a/test/unit/lookups/mapquest_test.rb b/test/unit/lookups/mapquest_test.rb
index 07e4bbb6f59b0576a0663612625d8573ecb7d6dc..1f6b22b14a6a71d6dd1a40033d2f233eb134c97d 100644
--- a/test/unit/lookups/mapquest_test.rb
+++ b/test/unit/lookups/mapquest_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
 require 'test_helper'
 
 class MapquestTest < GeocoderTestCase
diff --git a/test/unit/lookups/maxmind_local_test.rb b/test/unit/lookups/maxmind_local_test.rb
index 28ca402075cc006c0928c309d5eb4713a2b82caa..c71b880e249c02d59f7b534b880c407220d14624 100644
--- a/test/unit/lookups/maxmind_local_test.rb
+++ b/test/unit/lookups/maxmind_local_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
 require 'test_helper'
 
 class MaxmindLocalTest < GeocoderTestCase
diff --git a/test/unit/lookups/maxmind_test.rb b/test/unit/lookups/maxmind_test.rb
index 6fc6cb02456d35a6f2ade84b4f0bf50cfc44210c..46e560bbeb784c74f483641199679a9cb222d890 100644
--- a/test/unit/lookups/maxmind_test.rb
+++ b/test/unit/lookups/maxmind_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
 require 'test_helper'
 
 class MaxmindTest < GeocoderTestCase
diff --git a/test/unit/lookups/nominatim_test.rb b/test/unit/lookups/nominatim_test.rb
index 310fa38109c3003513b05431a8c8e530523c4b98..067a46e32d59198987f450edc663661a7a8047d3 100644
--- a/test/unit/lookups/nominatim_test.rb
+++ b/test/unit/lookups/nominatim_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
 require 'test_helper'
 
 class NominatimTest < GeocoderTestCase
diff --git a/test/unit/lookups/yahoo_test.rb b/test/unit/lookups/yahoo_test.rb
index f299b7b731da0587977dbeed49143f5fb9cdebaa..3bdef12d92d616c847c0d0e2bf6eefb99f6f29c3 100644
--- a/test/unit/lookups/yahoo_test.rb
+++ b/test/unit/lookups/yahoo_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..", "..")
 require 'test_helper'
 
 class YahooTest < GeocoderTestCase
diff --git a/test/unit/method_aliases_test.rb b/test/unit/method_aliases_test.rb
index d33afc4835101678788ec4f0d675a0535686a732..242978d1be1a43fe02c1e1478e4a7edc33640ec6 100644
--- a/test/unit/method_aliases_test.rb
+++ b/test/unit/method_aliases_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class MethodAliasesTest < GeocoderTestCase
diff --git a/test/unit/model_test.rb b/test/unit/model_test.rb
index a4f5d9f72a95a6ade9bb2fe8cd6b7e1e3d3b9905..126461c264e54832902d699842d17c540f56eca0 100644
--- a/test/unit/model_test.rb
+++ b/test/unit/model_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class ModelTest < GeocoderTestCase
diff --git a/test/unit/mongoid_test.rb b/test/unit/mongoid_test.rb
index 78fd4a043acd8a07d2640fc167daf15e3d5dd01e..f5a031486aa7cc28630b8c17ed8cb30133dce6b9 100644
--- a/test/unit/mongoid_test.rb
+++ b/test/unit/mongoid_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'mongoid_test_helper'
 
 class MongoidTest < GeocoderTestCase
diff --git a/test/unit/near_test.rb b/test/unit/near_test.rb
index 090838694685b030346f99447906b20c3609764a..354ba350b518e36eb54ede609696586d69403522 100644
--- a/test/unit/near_test.rb
+++ b/test/unit/near_test.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class NearTest < GeocoderTestCase
diff --git a/test/unit/oauth_util_test.rb b/test/unit/oauth_util_test.rb
index d70e333f8df183ecd3489539105d9c35329e9777..2fa2dc6db983b1f6e2aca16292f36c928854e2ad 100644
--- a/test/unit/oauth_util_test.rb
+++ b/test/unit/oauth_util_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 require 'cgi'
 require 'uri'
diff --git a/test/unit/proxy_test.rb b/test/unit/proxy_test.rb
index 23d8789a2379c72ed591224fe14b109cf616a06b..bb9f88159975d357cd2fd5810b59324435f150be 100644
--- a/test/unit/proxy_test.rb
+++ b/test/unit/proxy_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class ProxyTest < GeocoderTestCase
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index 77c9839e0804dc4d23c2b1686dd1b7d232fb5bc0..0b38903840bb11266f6ff8d69b93612093982c6c 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class QueryTest < GeocoderTestCase
diff --git a/test/unit/request_test.rb b/test/unit/request_test.rb
index 6ffe6b7d399a87e2e6d0ecb53db6896ae92acb9b..1fc363f7165b56ed0a889e1be196ffdfc665ba09 100644
--- a/test/unit/request_test.rb
+++ b/test/unit/request_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class RequestTest < GeocoderTestCase
diff --git a/test/unit/result_test.rb b/test/unit/result_test.rb
index 631f3e7bba4a268244b7101c63f801abbd49abea..82764d81aa2ffc814461afedde3d897b86fdeb47 100644
--- a/test/unit/result_test.rb
+++ b/test/unit/result_test.rb
@@ -1,4 +1,5 @@
 # encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class ResultTest < GeocoderTestCase
diff --git a/test/unit/test_mode_test.rb b/test/unit/test_mode_test.rb
index df0c5480f47befd5241705c2987d0f1c637aab96..38b054c04bfe7a8eefc9f5a5e896f2eddf844acd 100644
--- a/test/unit/test_mode_test.rb
+++ b/test/unit/test_mode_test.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+$: << File.join(File.dirname(__FILE__), "..")
 require 'test_helper'
 
 class TestModeTest < GeocoderTestCase