diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index f2d2306961..13f8deb740 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -98,7 +98,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
   include GeneratorsTestHelper
   arguments [destination_root]
 
-  # brings set up, teardown, and some tests
+  # brings setup, teardown, and some tests
   include SharedGeneratorTests
 
   def default_files
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 4ffb79e8c8..ea6ca1e24d 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -30,7 +30,7 @@ def application_path
     "#{destination_root}/test/dummy"
   end
 
-  # brings set up, teardown, and some tests
+  # brings setup, teardown, and some tests
   include SharedGeneratorTests
 
   def test_invalid_plugin_name_raises_an_error
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index b3125fa37f..c639b185a0 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #
-# Tests, set up, and teardown common to the application and plugin generator suites.
+# Tests, setup, and teardown common to the application and plugin generator suites.
 #
 module SharedGeneratorTests
   def setup