3 files changed, 5 insertions, 1 deletions
diff --git a/activesupport/test/dependencies_test.rb b/activesupport/test/dependencies_test.rb
index ef017d7436..2ddbce5150 100644
--- a/activesupport/test/dependencies_test.rb
+++ b/activesupport/test/dependencies_test.rb
@@ -24,11 +24,13 @@ class DependenciesTest < Test::Unit::TestCase
     old_mechanism, ActiveSupport::Dependencies.mechanism = ActiveSupport::Dependencies.mechanism, :load
     this_dir = File.dirname(__FILE__)
     parent_dir = File.dirname(this_dir)
+    path_copy = $LOAD_PATH.dup
     $LOAD_PATH.unshift(parent_dir) unless $LOAD_PATH.include?(parent_dir)
     prior_autoload_paths = ActiveSupport::Dependencies.autoload_paths
     ActiveSupport::Dependencies.autoload_paths = from.collect { |f| "#{this_dir}/#{f}" }
     yield
   ensure
+    $LOAD_PATH.replace(path_copy)
     ActiveSupport::Dependencies.autoload_paths = prior_autoload_paths
     ActiveSupport::Dependencies.mechanism = old_mechanism
     ActiveSupport::Dependencies.explicitly_unloadable_constants = []
diff --git a/activesupport/test/load_paths_test.rb b/activesupport/test/load_paths_test.rb
index 36e3726a02..a2d8da726a 100644
--- a/activesupport/test/load_paths_test.rb
+++ b/activesupport/test/load_paths_test.rb
@@ -10,6 +10,7 @@ class LoadPathsTest < Test::Unit::TestCase
     }
     load_paths_count[File.expand_path('../../lib', __FILE__)] -= 1
 
-    assert load_paths_count.select { |k, v| v > 1 }.empty?, $LOAD_PATH.inspect
+    filtered = load_paths_count.select { |k, v| v > 1 }
+    assert filtered.empty?, filtered.inspect
   end
 end
diff --git a/activesupport/test/xml_mini/jdom_engine_test.rb b/activesupport/test/xml_mini/jdom_engine_test.rb
index b745228994..6b1edcbc9b 100644
--- a/activesupport/test/xml_mini/jdom_engine_test.rb
+++ b/activesupport/test/xml_mini/jdom_engine_test.rb
@@ -1,5 +1,6 @@
 require 'abstract_unit'
 require 'active_support/xml_mini'
+require 'active_support/core_ext/hash/conversions'
 
 if RUBY_PLATFORM =~ /java/