1 files changed, 10 insertions, 4 deletions
diff --git a/test/cgi/test_cgi_multipart.rb b/test/cgi/test_cgi_multipart.rb
index 1325798e95..989c054f8a 100644
--- a/test/cgi/test_cgi_multipart.rb
+++ b/test/cgi/test_cgi_multipart.rb
@@ -2,6 +2,7 @@ require 'test/unit'
 require 'cgi'
 require 'tempfile'
 require 'stringio'
+require_relative 'update_env'
 
 
 ##
@@ -104,16 +105,21 @@ end
 
 
 class CGIMultipartTest < Test::Unit::TestCase
+  include UpdateEnv
+
 
   def setup
-    ENV['REQUEST_METHOD'] = 'POST'
+    @environ = {}
+    update_env(
+      'REQUEST_METHOD' => 'POST',
+      'CONTENT_TYPE' => nil,
+      'CONTENT_LENGTH' => nil,
+    )
     @tempfiles = []
   end
 
   def teardown
-    %w[ REQUEST_METHOD CONTENT_TYPE CONTENT_LENGTH REQUEST_METHOD ].each do |name|
-      ENV.delete(name)
-    end
+    ENV.update(@environ)
     $stdin.close() if $stdin.is_a?(Tempfile)
     $stdin = STDIN
     @tempfiles.each {|t|