4 files changed, 8 insertions, 8 deletions
diff --git a/test/ruby/test_alias.rb b/test/ruby/test_alias.rb
index 18a7d475e2..4076de051b 100644
--- a/test/ruby/test_alias.rb
+++ b/test/ruby/test_alias.rb
@@ -56,7 +56,7 @@ class TestAlias < Test::Unit::TestCase
     d = lambda {
       $SAFE = 4
       dclass = Class.new(C)
-      dclass.funcall(:alias_method, :mm, :m)
+      dclass.send!(:alias_method, :mm, :m)
       dclass.new
     }.call
     assert_raise(SecurityError) { d.mm }
diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb
index c419bd8d4e..164f13f716 100644
--- a/test/ruby/test_dir.rb
+++ b/test/ruby/test_dir.rb
@@ -10,10 +10,10 @@ class TestDir < Test::Unit::TestCase
   def setup
     Dir.mkdir(ROOT)
     for i in ?a..?z
-      if i % 2 == 0
-        FileUtils.touch(File.join(ROOT, i.chr))
+      if i.ord % 2 == 0
+        FileUtils.touch(File.join(ROOT, i))
       else
-        FileUtils.mkdir(File.join(ROOT, i.chr))
+        FileUtils.mkdir(File.join(ROOT, i))
       end
     end
   end
@@ -31,7 +31,7 @@ class TestDir < Test::Unit::TestCase
         break unless name = dir.read
         cache << [pos, name]
       end
-      for x,y in cache.sort_by {|x| x[0] % 3 } # shuffle
+      for x,y in cache.sort_by {|z| z[0] % 3 } # shuffle
         dir.seek(x)
         assert_equal(y, dir.read)
       end
diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb
index e79d1c82ec..22cc4456d3 100644
--- a/test/ruby/test_eval.rb
+++ b/test/ruby/test_eval.rb
@@ -124,7 +124,7 @@ class TestEval < Test::Unit::TestCase
       obj.class.class_variable_set :@@cvar, 13
           # Use same value with env. See also test_instance_variable_cvar.
       obj.class.const_set :Const, 15 unless obj.class.const_defined?(:Const)
-      funcall mid, obj
+      send! mid, obj
     end
   end
 
@@ -364,7 +364,7 @@ class TestEval < Test::Unit::TestCase
     assert_nothing_raised {
       def temporally_method_for_test_eval_and_define_method(&block)
         lambda {
-          class << Object.new; self end.funcall(:define_method, :zzz, &block)
+          class << Object.new; self end.send!(:define_method, :zzz, &block)
         }
       end
       v = eval("temporally_method_for_test_eval_and_define_method {}")
diff --git a/test/ruby/test_primitive.rb b/test/ruby/test_primitive.rb
index 85a8be9f94..68c53b0bd7 100644
--- a/test/ruby/test_primitive.rb
+++ b/test/ruby/test_primitive.rb
@@ -50,7 +50,7 @@ class TestRubyPrimitive < Test::Unit::TestCase
     assert_equal 3, A::B::C::Const
     assert_equal 3, A::B::C.new.const
     assert_equal 1, ::TestRubyPrimitive::A::Const
-    A::B::C.funcall(:remove_const, :Const)
+    A::B::C.send!(:remove_const, :Const)
     assert_equal 2, A::B::C.new.const
     assert_raise(TypeError) {
       C::CONST