1 files changed, 13 insertions, 2 deletions
diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
index dd17cb64f4..1dfa3833f0 100644
--- a/activesupport/test/abstract_unit.rb
+++ b/activesupport/test/abstract_unit.rb
@@ -8,7 +8,6 @@ ensure
 end
 
 require 'active_support/core_ext/kernel/reporting'
-require 'active_support/core_ext/string/encoding'
 
 silence_warnings do
   Encoding.default_internal = "UTF-8"
@@ -16,7 +15,6 @@ silence_warnings do
 end
 
 require 'active_support/testing/autorun'
-require 'empty_bool'
 
 ENV['NO_RELOAD'] = '1'
 require 'active_support'
@@ -25,3 +23,16 @@ Thread.abort_on_exception = true
 
 # Show backtraces for deprecated behavior for quicker cleanup.
 ActiveSupport::Deprecation.debug = true
+
+# Disable available locale checks to avoid warnings running the test suite.
+I18n.enforce_available_locales = false
+
+# Skips the current run on Rubinius using Minitest::Assertions#skip
+def rubinius_skip(message = '')
+  skip message if RUBY_ENGINE == 'rbx'
+end
+
+# Skips the current run on JRuby using Minitest::Assertions#skip
+def jruby_skip(message = '')
+  skip message if RUBY_ENGINE == 'jruby'
+end