diff --git a/geokit-rails.gemspec b/geokit-rails.gemspec
index 584d5b3..e0e2ccf 100644
--- a/geokit-rails.gemspec
+++ b/geokit-rails.gemspec
@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov-rcov"
   spec.add_development_dependency 'net-http'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rexml'
   spec.add_development_dependency 'test-unit'
   spec.add_development_dependency "mocha", "~> 0.9"
   spec.add_development_dependency 'coveralls_reborn'
diff --git a/lib/geokit-rails/ip_geocode_lookup.rb b/lib/geokit-rails/ip_geocode_lookup.rb
index 827bf74..6756007 100644
--- a/lib/geokit-rails/ip_geocode_lookup.rb
+++ b/lib/geokit-rails/ip_geocode_lookup.rb
@@ -1,4 +1,3 @@
-require 'yaml'
 require 'active_support/concern'
 
 module Geokit
diff --git a/test/boot.rb b/test/boot.rb
index d0d87a9..b694e05 100644
--- a/test/boot.rb
+++ b/test/boot.rb
@@ -20,7 +20,11 @@
 $LOAD_PATH << (PLUGIN_ROOT + 'test/models')
 
 config_file = PLUGIN_ROOT + 'test/database.yml'
-db_config   = YAML::load(IO.read(config_file))
+if defined?(YAML.safe_load)
+  db_config   = YAML.safe_load(IO.read(config_file), aliases: true)
+else
+  db_config   = YAML::load(IO.read(config_file))
+end
 logger_file = PLUGIN_ROOT + "test/#{ADAPTER}-debug.log"
 schema_file = PLUGIN_ROOT + 'test/schema.rb'