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 aec415a4e5..0514957d9c 100644
--- a/railties/lib/rails/generators/test_unit/system/system_generator.rb
+++ b/railties/lib/rails/generators/test_unit/system/system_generator.rb
@@ -10,7 +10,7 @@ module TestUnit # :nodoc:
           template "application_system_test_case.rb", File.join("test", "application_system_test_case.rb")
         end
 
-        template "system_test.rb", File.join("test/system", "#{file_name.pluralize}_test.rb")
+        template "system_test.rb", File.join("test/system", class_path, "#{file_name.pluralize}_test.rb")
       end
     end
   end
diff --git a/railties/test/generators/system_test_generator_test.rb b/railties/test/generators/system_test_generator_test.rb
index e8e561ec49..4622360244 100644
--- a/railties/test/generators/system_test_generator_test.rb
+++ b/railties/test/generators/system_test_generator_test.rb
@@ -9,4 +9,9 @@ class SystemTestGeneratorTest < Rails::Generators::TestCase
     run_generator
     assert_file "test/system/users_test.rb", /class UsersTest < ApplicationSystemTestCase/
   end
+
+  def test_namespaced_system_test_skeleton_is_created
+    run_generator %w(admin/user)
+    assert_file "test/system/admin/users_test.rb", /class Admin::UsersTest < ApplicationSystemTestCase/
+  end
 end