1 files changed, 6 insertions, 4 deletions
diff --git a/test/cgi/test_cgi_header.rb b/test/cgi/test_cgi_header.rb
index 9022301153..91086c4f27 100644
--- a/test/cgi/test_cgi_header.rb
+++ b/test/cgi/test_cgi_header.rb
@@ -1,23 +1,25 @@
 require 'test/unit'
 require 'cgi'
 require 'time'
+require_relative 'update_env'
 
 
 class CGIHeaderTest < Test::Unit::TestCase
+  include UpdateEnv
 
 
   def setup
-    @environ = {
+    @environ = {}
+    update_env(
       'SERVER_PROTOCOL' => 'HTTP/1.1',
       'REQUEST_METHOD'  => 'GET',
       'SERVER_SOFTWARE' => 'Apache 2.2.0',
-    }
-    ENV.update(@environ)
+    )
   end
 
 
   def teardown
-    @environ.each do |key, val| ENV.delete(key) end
+    ENV.update(@environ)
   end