diff --git a/ChangeLog b/ChangeLog
index 9f83c395dd..a3cf5489f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jan  3 11:03:37 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/test_drb.rb: move TestDRbReusePort to new file. 
+	  [ruby-dev:25238]
+
+	* test/drb/drbtest.rb: change timeout.
+
+	* test/drb/ignore_test_drb.rb: new file.
+
 Mon Jan  3 07:27:46 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
 	* lib/webrick/httpauth/htpasswd.rb (WEBrick::Htpasswd#reload):
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index 89551df005..b7c259085e 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -31,7 +31,7 @@ class DRbService
     @server || @@server
   end
   def self.ext_service(name)
-    timeout(5, RuntimeError) do
+    timeout(10, RuntimeError) do
       manager.service(name)
     end
   end
diff --git a/test/drb/ignore_test_drb.rb b/test/drb/ignore_test_drb.rb
new file mode 100644
index 0000000000..d0bb1f49b0
--- /dev/null
+++ b/test/drb/ignore_test_drb.rb
@@ -0,0 +1,24 @@
+require 'drbtest'
+
+class TestDRbReusePort < Test::Unit::TestCase
+  include DRbAry
+
+  def setup
+    @ext = DRbService.ext_service('ut_port.rb')
+    @there = @ext.front
+  end
+
+  def teardown
+    return unless @ext
+    @ext.stop_service
+    while true
+      sleep 0.1
+      begin
+        @ext.alive?
+      rescue DRb::DRbConnError
+        break
+      end
+    end
+  end
+end
+
diff --git a/test/drb/test_drb.rb b/test/drb/test_drb.rb
index f5261bfb70..d86bce883a 100644
--- a/test/drb/test_drb.rb
+++ b/test/drb/test_drb.rb
@@ -191,14 +191,6 @@ class TestDRbMServer < Test::Unit::TestCase
   end
 end
 
-class TestDRbReusePort < TestDRbAry
-  def setup
-    sleep 1.2
-    @ext = DRbService.ext_service('ut_port.rb')
-    @there = @ext.front
-  end
-end
-
 class TestDRbSafe1 < TestDRbAry
   def setup
     @ext = DRbService.ext_service('ut_safe1.rb')