2 files changed, 6 insertions, 9 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index fb6961d4a3..23b6330805 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -12,8 +12,12 @@ $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')
 
 ENV['TMPDIR'] = File.join(File.dirname(__FILE__), 'tmp')
 
-if defined?(Encoding.default_internal)
+require 'active_support/core_ext/string/encoding'
+if "ruby".encoding_aware?
+  # These are the normal settings that will be set up by Railties
+  # TODO: Have these tests support other combinations of these values
   Encoding.default_internal = "UTF-8"
+  Encoding.default_external = "UTF-8"
 end
 
 require 'test/unit'
diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
index 18e0e83ec3..fbc9350c69 100644
--- a/actionpack/test/template/template_test.rb
+++ b/actionpack/test/template/template_test.rb
@@ -1,12 +1,5 @@
 require "abstract_unit"
 
-if "ruby".encoding_aware?
-  # These are the normal settings that will be set up by Railties
-  # TODO: Have these tests support other combinations of these values
-  Encoding.default_internal = "UTF-8"
-  Encoding.default_external = "UTF-8"
-end
-
 class TestERBTemplate < ActiveSupport::TestCase
   ERBHandler = ActionView::Template::Handlers::ERB
 
@@ -136,4 +129,4 @@ class TestERBTemplate < ActiveSupport::TestCase
       Encoding.default_external = old
     end
   end
-end
-\ No newline at end of file
+end