2 files changed, 9 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/test_unit/system/templates/system_test.rb b/railties/lib/rails/generators/test_unit/system/templates/system_test.rb
index a74e0bb23d..bc3abd25d9 100644
--- a/railties/lib/rails/generators/test_unit/system/templates/system_test.rb
+++ b/railties/lib/rails/generators/test_unit/system/templates/system_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require "system_test_helper"
 
 class <%= class_name.pluralize %>Test < ActionSystemTestCase
   # test 'the truth' do
diff --git a/railties/lib/rails/generators/test_unit/system/templates/system_test_helper.rb b/railties/lib/rails/generators/test_unit/system/templates/system_test_helper.rb
new file mode 100644
index 0000000000..77c4738d6f
--- /dev/null
+++ b/railties/lib/rails/generators/test_unit/system/templates/system_test_helper.rb
@@ -0,0 +1,8 @@
+require "test_helper"
+
+class ActionSystemTestCase < ActionSystemTest::Base
+  teardown do
+    take_failed_screenshot
+    Capybara.reset_sessions!
+  end
+end