4 files changed, 23 insertions, 13 deletions
diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb
index 792cdcb7c7..c95b900235 100644
--- a/test/drb/drbtest.rb
+++ b/test/drb/drbtest.rb
@@ -12,9 +12,15 @@ class DRbService
   )
   @@ruby += " -d" if $DEBUG
   @@dir = File.dirname(File.expand_path(__FILE__))
+  def self.manager
+    @@manager
+  end
+  def self.add_service_command(nm)
+    DRb::ExtServManager.command[nm] = "#{@@ruby} #{@@dir}/#{nm}"
+  end
 
   %w(ut_drb.rb ut_array.rb ut_port.rb ut_large.rb ut_safe1.rb ut_eval.rb).each do |nm|
-    DRb::ExtServManager.command[nm] = "#{@@ruby} #{@@dir}/#{nm}"
+    add_service_command(nm)
   end
   @server = @@server = DRb::DRbServer.new(nil, @@manager, {})
   def self.manager
diff --git a/test/drb/test_drbssl.rb b/test/drb/test_drbssl.rb
index b5dd68f6a7..c12a43bb75 100644
--- a/test/drb/test_drbssl.rb
+++ b/test/drb/test_drbssl.rb
@@ -10,7 +10,7 @@ if Object.const_defined?("OpenSSL")
 
 class DRbSSLService < DRbService
   %w(ut_drb_drbssl.rb ut_array_drbssl.rb).each do |nm|
-    DRb::ExtServManager.command[nm] = "#{@@ruby} #{@@dir}/#{nm}"
+    add_service_command(nm)
   end
   config = Hash.new
 
@@ -30,7 +30,7 @@ class DRbSSLService < DRbService
   end
 
   uri = ARGV.shift if $0 == __FILE__
-  @server = DRb::DRbServer.new(uri || 'drbssl://:0', @@manager, config)
+  @server = DRb::DRbServer.new(uri || 'drbssl://:0', self.manager, config)
 end
 
 class TestDRbSSLCore < Test::Unit::TestCase
diff --git a/test/drb/test_drbunix.rb b/test/drb/test_drbunix.rb
index e35a7bd580..eeaa9c93ef 100644
--- a/test/drb/test_drbunix.rb
+++ b/test/drb/test_drbunix.rb
@@ -10,11 +10,11 @@ if Object.const_defined?("UNIXServer")
 
 class DRbUNIXService < DRbService
   %w(ut_drb_drbunix.rb ut_array_drbunix.rb).each do |nm|
-    DRb::ExtServManager.command[nm] = "#{@@ruby} #{@@dir}/#{nm}"
+    add_service_command(nm)
   end
 
   uri = ARGV.shift if $0 == __FILE__
-  @server = DRb::DRbServer.new(uri || 'drbunix:', @@manager, {})
+  @server = DRb::DRbServer.new(uri || 'drbunix:', self.manager, {})
 end
 
 class TestDRbUNIXCore < Test::Unit::TestCase
diff --git a/test/ruby/test_variable.rb b/test/ruby/test_variable.rb
index 8726160826..32e2030a23 100644
--- a/test/ruby/test_variable.rb
+++ b/test/ruby/test_variable.rb
@@ -25,8 +25,11 @@ class TestVariable < Test::Unit::TestCase
   end
 
   class Titans < Gods
-    @@rule = "Cronus"
-    include Olympians           	# OK to cause warning (intentional)
+    @@rule = "Cronus"			# do not affect @@rule in Gods
+    include Olympians
+    def ruler4
+      @@rule
+    end
   end
 
   def test_variable
@@ -41,13 +44,14 @@ class TestVariable < Test::Unit::TestCase
     $_ = foobar
     assert_equal(foobar, $_)
 
-    assert_equal("Cronus", Gods.new.ruler0)
-    assert_equal("Cronus", Gods.ruler1)
-    assert_equal("Cronus", Gods.ruler2)
-    assert_equal("Cronus", Titans.ruler1)
-    assert_equal("Cronus", Titans.ruler2)
+    assert_equal("Uranus", Gods.new.ruler0)
+    assert_equal("Uranus", Gods.ruler1)
+    assert_equal("Uranus", Gods.ruler2)
+    assert_equal("Uranus", Titans.ruler1)
+    assert_equal("Uranus", Titans.ruler2)
     atlas = Titans.new
-    assert_equal("Cronus", atlas.ruler0)
+    assert_equal("Uranus", atlas.ruler0)
     assert_equal("Zeus", atlas.ruler3)
+    assert_equal("Cronus", atlas.ruler4)
   end
 end