diff --git a/test/test_cli.rb b/test/test_cli.rb
index c8726ea3..4710b7ce 100644
--- a/test/test_cli.rb
+++ b/test/test_cli.rb
@@ -439,4 +439,25 @@ class TestCLI < Minitest::Test
     ENV.delete 'APP_ENV'
     ENV.delete 'RAILS_ENV'
   end
-end
\ No newline at end of file
+
+  def test_environment_rack_env
+    ENV['RACK_ENV'] = @environment
+
+    cli = Puma::CLI.new []
+    cli.send(:setup_options)
+
+    assert_equal @environment, cli.instance_variable_get(:@conf).environment.call
+  end
+
+  def test_environment_rails_env
+    ENV.delete 'RACK_ENV'
+    ENV['RAILS_ENV'] = @environment
+
+    cli = Puma::CLI.new []
+    cli.send(:setup_options)
+
+    assert_equal @environment, cli.instance_variable_get(:@conf).environment.call
+  ensure
+    ENV.delete 'RAILS_ENV'
+  end
+end