diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index 80ccf377d9b83..bf2659058d31b 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -124,7 +124,7 @@ def content_for(name, content = nil, &block)
 
       # Use an alternate output buffer for the duration of the block.
       # Defaults to a new empty string.
-      def with_output_buffer(buf = ActiveSupport::SafeBuffer.new) #:nodoc:
+      def with_output_buffer(buf = '') #:nodoc:
         self.output_buffer, old_buffer = buf, output_buffer
         yield
         output_buffer
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 61749b278086d..049314c4c0e34 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -53,7 +53,7 @@ def initialize
     setup :setup_with_controller
     def setup_with_controller
       @controller = TestController.new
-      @output_buffer = ''.html_safe
+      @output_buffer = ''
       @rendered = ''
 
       self.class.send(:include_helper_modules!)
diff --git a/actionpack/test/controller/capture_test.rb b/actionpack/test/controller/capture_test.rb
index 6dfa0995ebb73..56e37018c76c7 100644
--- a/actionpack/test/controller/capture_test.rb
+++ b/actionpack/test/controller/capture_test.rb
@@ -36,7 +36,7 @@ def setup
 
   def test_simple_capture
     get :capturing
-    assert_equal "Dreamy days", @response.body.strip
+    assert_equal "<p>Dreamy days</p>", @response.body.strip
   end
 
   def test_content_for
diff --git a/actionpack/test/fixtures/test/capturing.erb b/actionpack/test/fixtures/test/capturing.erb
index 1addaa40d9305..cdca9763f3e4b 100644
--- a/actionpack/test/fixtures/test/capturing.erb
+++ b/actionpack/test/fixtures/test/capturing.erb
@@ -1,4 +1,4 @@
 <% days = capture do %>
-  Dreamy days
+  <p>Dreamy days</p>
 <% end %>
-<%= days %>
\ No newline at end of file
+<%= days %>