diff --git a/actionview/test/template/javascript_helper_test.rb b/actionview/test/template/javascript_helper_test.rb
index 4703111741b393d9f6859a8c1cb7fffa98cb20b2..9ba7f64ad1360d9f35e32b47b0caa4009d9181c3 100644
--- a/actionview/test/template/javascript_helper_test.rb
+++ b/actionview/test/template/javascript_helper_test.rb
@@ -12,14 +12,14 @@ def update_details(details)
     yield if block_given?
   end
 
-  def setup
-    super
+  setup do
+    @old_escape_html_entities_in_json = ActiveSupport.escape_html_entities_in_json
     ActiveSupport.escape_html_entities_in_json  = true
     @template = self
   end
 
   def teardown
-    ActiveSupport.escape_html_entities_in_json  = false
+    ActiveSupport.escape_html_entities_in_json = @old_escape_html_entities_in_json
   end
 
   def test_escape_javascript