1 files changed, 5 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/test_unit/system/system_generator.rb b/railties/lib/rails/generators/test_unit/system/system_generator.rb
index a05f0f924d..e77ccef009 100644
--- a/railties/lib/rails/generators/test_unit/system/system_generator.rb
+++ b/railties/lib/rails/generators/test_unit/system/system_generator.rb
@@ -6,7 +6,11 @@ module TestUnit # :nodoc:
       check_class_collision suffix: "Test"
 
       def create_test_files
-        template "system_test.rb", File.join("test/system", class_path, "#{file_name.pluralize}_test.rb")
+        if !File.exist?(File.join("test/system_test_helper.rb"))
+          template "system_test_helper.rb", File.join("test", "system_test_helper.rb")
+        end
+
+        template "system_test.rb", File.join("test/system", "#{file_name.pluralize}_test.rb")
       end
     end
   end