6 files changed, 12 insertions, 12 deletions
diff --git a/test/dbm/test_dbm.rb b/test/dbm/test_dbm.rb
index cec2b20f91..04ec0973db 100644
--- a/test/dbm/test_dbm.rb
+++ b/test/dbm/test_dbm.rb
@@ -12,7 +12,7 @@ if defined? DBM
   class TestDBM < Test::Unit::TestCase
     def TestDBM.uname_s
       require 'rbconfig'
-      case Config::CONFIG['host_os']
+      case RbConfig::CONFIG['host_os']
       when 'cygwin'
         require 'Win32API'
         uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
@@ -21,7 +21,7 @@ if defined? DBM
 
         utsname.unpack('A20' * 5)[0]
       else
-        Config::CONFIG['host_os']
+        RbConfig::CONFIG['host_os']
       end
     end
     SYSTEM = uname_s
diff --git a/test/gdbm/test_gdbm.rb b/test/gdbm/test_gdbm.rb
index db4a656436..45fc93bccf 100644
--- a/test/gdbm/test_gdbm.rb
+++ b/test/gdbm/test_gdbm.rb
@@ -12,7 +12,7 @@ if defined? GDBM
   class TestGDBM < Test::Unit::TestCase
     def TestGDBM.uname_s
       require 'rbconfig'
-      case Config::CONFIG['host_os']
+      case RbConfig::CONFIG['host_os']
       when 'cygwin'
         require 'Win32API'
         uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
@@ -21,7 +21,7 @@ if defined? GDBM
 
         utsname.unpack('A20' * 5)[0]
       else
-        Config::CONFIG['host_os']
+        RbConfig::CONFIG['host_os']
       end
     end
     SYSTEM = uname_s
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index cf7f6e9887..bbcab83d06 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -20,8 +20,8 @@ module EnvUtil
     begin
       require "rbconfig"
       File.join(
-        Config::CONFIG["bindir"],
-	Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
+        RbConfig::CONFIG["bindir"],
+	RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]
       )
     rescue LoadError
       "ruby"
diff --git a/test/soap/calc/test_calc_cgi.rb b/test/soap/calc/test_calc_cgi.rb
index d28830629f..dc701978c4 100644
--- a/test/soap/calc/test_calc_cgi.rb
+++ b/test/soap/calc/test_calc_cgi.rb
@@ -12,8 +12,8 @@ module Calc
 class TestCalcCGI < Test::Unit::TestCase
   # This test shuld be run after installing ruby.
   RUBYBIN = File.join(
-    Config::CONFIG["bindir"],
-    Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
+    RbConfig::CONFIG["bindir"],
+    RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]
   )
   RUBYBIN << " -d" if $DEBUG
 
diff --git a/test/soap/header/test_authheader_cgi.rb b/test/soap/header/test_authheader_cgi.rb
index d70b022ad8..8d41837f58 100644
--- a/test/soap/header/test_authheader_cgi.rb
+++ b/test/soap/header/test_authheader_cgi.rb
@@ -14,8 +14,8 @@ module Header
 class TestAuthHeaderCGI < Test::Unit::TestCase
   # This test shuld be run after installing ruby.
   RUBYBIN = File.join(
-    Config::CONFIG["bindir"],
-    Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
+    RbConfig::CONFIG["bindir"],
+    RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]
   )
   RUBYBIN << " -d" if $DEBUG
   
diff --git a/test/soap/ssl/test_ssl.rb b/test/soap/ssl/test_ssl.rb
index f0a1e18971..772b77c940 100644
--- a/test/soap/ssl/test_ssl.rb
+++ b/test/soap/ssl/test_ssl.rb
@@ -16,8 +16,8 @@ class TestSSL < Test::Unit::TestCase
   DIR = File.dirname(File.expand_path(__FILE__))
   require 'rbconfig'
   RUBY = File.join(
-    Config::CONFIG["bindir"],
-    Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]
+    RbConfig::CONFIG["bindir"],
+    RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]
   )
 
   def setup