diff --git a/ChangeLog b/ChangeLog
index 16f446e461..a8a91f5814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 13 23:55:59 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* test/ruby/envutil.rb: use Config::CONFIG["ruby_install_name"],
+	  not "ruby".
+
 Mon Oct 13 23:57:29 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_feature_p): match by classified suffix.
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 186fcae1e6..4bae3d9e3b 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -5,9 +5,17 @@ module EnvUtil
       if File.exist? miniruby or File.exist? miniruby+".exe"
         return File.expand_path(miniruby)
       end
-      miniruby = "../"+miniruby
+      miniruby = File.join("..", miniruby)
+    end
+    begin
+      require "rbconfig"
+      File.join(
+        Config::CONFIG["bindir"],
+	Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
+      )
+    rescue LoadError
+      "ruby"
     end
-    "ruby"
   end
   module_function :rubybin
 end