diff --git a/ChangeLog b/ChangeLog
index efb45d6bb1..9371a7571d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 19 22:39:04 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
+
+	* test/rinda/test_rinda.rb: DRb.start_service only once in testsuites.
+	  DRb.start_service could handle this.
+
 Thu Feb 19 22:24:04 2004  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 	* lib/soap/mapping/rubytypeFactory.rb: should not dump singleton class.
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index 9d893fcc52..d537eb0ac1 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -360,7 +360,7 @@ class TupleSpaceProxyTest < Test::Unit::TestCase
     @ts = Rinda::TupleSpaceProxy.new(@ts_base)
   end
 
-  @server = DRb.start_service
+  @server = DRb.primary_server || DRb.start_service
 end
 
 end