1 files changed, 7 insertions, 1 deletions
diff --git a/railties/lib/rails/test_unit/runner.rb b/railties/lib/rails/test_unit/runner.rb
index c5bf97bfc9..baf33b4468 100644
--- a/railties/lib/rails/test_unit/runner.rb
+++ b/railties/lib/rails/test_unit/runner.rb
@@ -7,12 +7,17 @@ module Rails
   class TestRunner
     class Options
       def self.parse(args)
-        options = { backtrace: false, name: nil }
+        options = { backtrace: false, name: nil, environment: "test" }
 
         opt_parser = ::OptionParser.new do |opts|
           opts.banner = "Usage: bin/rails test [options] [file or directory]"
 
           opts.separator ""
+          opts.on("-e", "--environment [ENV]",
+                  "run tests in the ENV environment") do |env|
+            options[:environment] = env.strip
+          end
+          opts.separator ""
           opts.separator "Filter options:"
           opts.separator ""
           opts.separator <<-DESC
@@ -70,6 +75,7 @@ module Rails
 
     def run
       $rails_test_runner = self
+      ENV["RAILS_ENV"] = @options[:environment]
       run_tests
     end