3 files changed, 11 insertions, 11 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 4369e8362b..689173f184 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -446,13 +446,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file 'lib/test_file.rb', 'heres test data'
   end
 
-  def test_test_unit_is_removed_from_frameworks_if_skip_test_unit_is_given
-    run_generator [destination_root, "--skip-test-unit"]
+  def test_tests_are_removed_from_frameworks_if_skip_test_is_given
+    run_generator [destination_root, "--skip-test"]
     assert_file "config/application.rb", /#\s+require\s+["']rails\/test_unit\/railtie["']/
   end
 
-  def test_no_active_record_or_test_unit_if_skips_given
-    run_generator [destination_root, "--skip-test-unit", "--skip-active-record"]
+  def test_no_active_record_or_tests_if_skips_given
+    run_generator [destination_root, "--skip-test", "--skip-active-record"]
     assert_file "config/application.rb", /#\s+require\s+["']rails\/test_unit\/railtie["']/
     assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
     assert_file "config/application.rb", /\s+require\s+["']active_job\/railtie["']/
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index 318ea5b2cb..f67be97e79 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -112,7 +112,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
 
   def test_ensure_that_test_dummy_can_be_generated_from_a_template
     FileUtils.cd(Rails.root)
-    run_generator([destination_root, "-m", "lib/create_test_dummy_template.rb", "--skip-test-unit"])
+    run_generator([destination_root, "-m", "lib/create_test_dummy_template.rb", "--skip-test"])
     assert_file "spec/dummy"
     assert_no_file "test"
   end
@@ -321,7 +321,7 @@ class PluginGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_creating_dummy_without_tests_but_with_dummy_path
-    run_generator [destination_root, "--dummy_path", "spec/dummy", "--skip-test-unit"]
+    run_generator [destination_root, "--dummy_path", "spec/dummy", "--skip-test"]
     assert_file "spec/dummy"
     assert_file "spec/dummy/config/application.rb"
     assert_no_file "test"
@@ -333,14 +333,14 @@ class PluginGeneratorTest < Rails::Generators::TestCase
 
   def test_ensure_that_gitignore_can_be_generated_from_a_template_for_dummy_path
     FileUtils.cd(Rails.root)
-    run_generator([destination_root, "--dummy_path", "spec/dummy", "--skip-test-unit"])
+    run_generator([destination_root, "--dummy_path", "spec/dummy", "--skip-test"])
     assert_file ".gitignore" do |contents|
       assert_match(/spec\/dummy/, contents)
     end
   end
 
-  def test_skipping_test_unit
-    run_generator [destination_root, "--skip-test-unit"]
+  def test_skipping_test_files
+    run_generator [destination_root, "--skip-test"]
     assert_no_file "test"
     assert_file "bukkits.gemspec" do |contents|
       assert_no_match(/s.test_files = Dir\["test\/\*\*\/\*"\]/, contents)
diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb
index b998fef42e..68f07f29d7 100644
--- a/railties/test/generators/shared_generator_tests.rb
+++ b/railties/test/generators/shared_generator_tests.rb
@@ -47,8 +47,8 @@ module SharedGeneratorTests
     assert_match(/Invalid value for \-\-database option/, content)
   end
 
-  def test_test_unit_is_skipped_if_required
-    run_generator [destination_root, "--skip-test-unit"]
+  def test_test_files_are_skipped_if_required
+    run_generator [destination_root, "--skip-test"]
     assert_no_file "test"
   end