1 files changed, 10 insertions, 5 deletions
diff --git a/railties/lib/rails/test_unit/testing.rake b/railties/lib/rails/test_unit/testing.rake
index 4c157c1262..ef19bd7626 100644
--- a/railties/lib/rails/test_unit/testing.rake
+++ b/railties/lib/rails/test_unit/testing.rake
@@ -4,15 +4,15 @@ require "rails/test_unit/minitest_plugin"
 
 task default: :test
 
-desc "Runs all tests in test folder"
+desc "Runs all tests in test folder except system ones"
 task :test do
   $: << "test"
-  pattern = if ENV.key?("TEST")
-    ENV["TEST"]
+
+  if ENV.key?("TEST")
+    Minitest.rake_run([ENV["TEST"]])
   else
-    "test"
+    Minitest.rake_run(["test"], ["test/system/**/*"])
   end
-  Minitest.rake_run([pattern])
 end
 
 namespace :test do
@@ -47,4 +47,9 @@ namespace :test do
     $: << "test"
     Minitest.rake_run(["test/controllers", "test/mailers", "test/functional"])
   end
+
+  task system: "test:prepare" do
+    $: << "test"
+    Minitest.rake_run(["test/system"])
+  end
 end