2 files changed, 9 insertions, 0 deletions
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index 1da108f1e1..c414732f92 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -203,7 +203,9 @@ module ApplicationTests
       test 'db:setup loads schema and seeds database' do
         begin
           @old_rails_env = ENV["RAILS_ENV"]
+          @old_rack_env = ENV["RACK_ENV"]
           ENV.delete "RAILS_ENV"
+          ENV.delete "RACK_ENV"
 
           app_file 'db/schema.rb', <<-RUBY
             ActiveRecord::Schema.define(version: "1") do
@@ -223,6 +225,7 @@ module ApplicationTests
           end
         ensure
           ENV["RAILS_ENV"] = @old_rails_env
+          ENV["RACK_ENV"] = @old_rack_env
         end
       end
     end
diff --git a/railties/test/application/runner_test.rb b/railties/test/application/runner_test.rb
index b59202e68e..6595c40f8b 100644
--- a/railties/test/application/runner_test.rb
+++ b/railties/test/application/runner_test.rb
@@ -79,5 +79,11 @@ module ApplicationTests
         assert_match "production", Dir.chdir(app_path) { `bundle exec rails runner "puts Rails.env"` }
       end
     end
+
+    def test_environment_with_rack_env
+      with_rack_env "production" do
+        assert_match "production", Dir.chdir(app_path) { `bundle exec rails runner "puts Rails.env"` }
+      end
+    end
   end
 end