diff --git a/ChangeLog b/ChangeLog
index 828067bff1..2018d11b6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Thu Apr  8 19:45:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Apr  8 20:25:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (extmake): skip uncompiled extensions.
 
@@ -13,11 +13,14 @@ Thu Apr  8 19:45:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* test/runner.rb: do nothing while cross-compiling.
 
 	* test/drb/drbtest.rb, test/soap/calc/test_calc_cgi.rb: use envutil to
-	  know ruby binary.
+	  know ruby binary, and restore $: after require.
 
 	* test/ruby/envutil.rb: give priority to RUBY environment variable to
 	  use just compiled binary and libraries.
 
+	* test/drb/drbtest.rb, test/soap/calc/test_calc_cgi.rb: restore $:
+	  after require.
+
 Thu Apr  8 19:03:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_binmode): inverted condition.  [ruby-dev:23349]
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index dad26759c0..e90b2ad566 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -2,8 +2,13 @@ require 'test/unit'
 require 'drb/drb'
 require 'drb/extservm'
 require 'timeout'
-$:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
-require 'envutil'
+begin
+  loadpath = $:.dup
+  $:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
+  require 'envutil'
+ensure
+  $:.replace(loadpath)
+end
 
 class DRbService
   @@manager = DRb::ExtServManager.new
diff --git a/test/soap/calc/test_calc_cgi.rb b/test/soap/calc/test_calc_cgi.rb
index 6b26329460..4dbf96468b 100644
--- a/test/soap/calc/test_calc_cgi.rb
+++ b/test/soap/calc/test_calc_cgi.rb
@@ -2,8 +2,13 @@ require 'test/unit'
 require 'soap/rpc/driver'
 require 'logger'
 require 'webrick'
-$:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
-require 'envutil'
+begin
+  loadpath = $:.dup
+  $:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
+  require 'envutil'
+ensure
+  $:.replace(loadpath)
+end
 
 
 module SOAP