diff --git a/examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake b/examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake
index 067aa2cba29f26fa84cbbcb8798442a6ab30b0eb..35dbe5e189f2aa43389d17036989b61da0156860 100644
--- a/examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake
+++ b/examples/mrbgems/c_and_ruby_extension_example/mrbgem.rake
@@ -18,6 +18,6 @@ MRuby::Gem::Specification.new('c_and_ruby_extension_example') do |spec|
   # spec.test_objs = Dir.glob("#{dir}/test/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(dir).pathmap("#{build_dir}/%X")) }
   # spec.test_preload = 'test/assert.rb'
 
-  # Values accessible as $test_args inside test scripts
+  # Values accessible as TEST_ARGS inside test scripts
   # spec.test_args = {'tmp_dir' => Dir::tmpdir}
 end
diff --git a/examples/mrbgems/c_extension_example/mrbgem.rake b/examples/mrbgems/c_extension_example/mrbgem.rake
index f565642226abfcd99f6365dc5bbfa9a25eec98da..8c132b2338ffb5b0a23358d927a12678bcc339ac 100644
--- a/examples/mrbgems/c_extension_example/mrbgem.rake
+++ b/examples/mrbgems/c_extension_example/mrbgem.rake
@@ -18,6 +18,6 @@ MRuby::Gem::Specification.new('c_extension_example') do |spec|
   # spec.test_objs = Dir.glob("#{dir}/test/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(dir).pathmap("#{build_dir}/%X")) }
   # spec.test_preload = 'test/assert.rb'
 
-  # Values accessible as $test_args inside test scripts
+  # Values accessible as TEST_ARGS inside test scripts
   # spec.test_args = {'tmp_dir' => Dir::tmpdir}
 end
diff --git a/examples/mrbgems/ruby_extension_example/mrbgem.rake b/examples/mrbgems/ruby_extension_example/mrbgem.rake
index 4429460e975cc56b162bfa0bb544b96bd66081d5..3a80b5cd7fada476af88a08de9627459f1a5c2ea 100644
--- a/examples/mrbgems/ruby_extension_example/mrbgem.rake
+++ b/examples/mrbgems/ruby_extension_example/mrbgem.rake
@@ -18,6 +18,6 @@ MRuby::Gem::Specification.new('ruby_extension_example') do |spec|
   # spec.test_objs = Dir.glob("#{dir}/test/*.{c,cpp,m,asm,S}").map { |f| objfile(f.relative_path_from(dir).pathmap("#{build_dir}/%X")) }
   # spec.test_preload = 'test/assert.rb'
 
-  # Values accessible as $test_args inside test scripts
+  # Values accessible as TEST_ARGS inside test scripts
   # spec.test_args = {'tmp_dir' => Dir::tmpdir}
 end
diff --git a/tasks/mrbgems_test.rake b/tasks/mrbgems_test.rake
index b1c31855692550199bc10eecff7ba83b2efda26d..80c309c4412b748eb43d110cfebdb80bd1a76790 100644
--- a/tasks/mrbgems_test.rake
+++ b/tasks/mrbgems_test.rake
@@ -40,7 +40,7 @@ MRuby.each_target do
                 escaped_arg_value = arg_value.gsub('\\', '\\\\\\\\').gsub('"', '\"')
                 f.puts %Q[  mrb_hash_set(mrb2, test_args_hash, mrb_str_new(mrb2, "#{escaped_arg_name.to_s}", #{escaped_arg_name.to_s.length}), mrb_str_new(mrb2, "#{escaped_arg_value.to_s}", #{escaped_arg_value.to_s.length})); ]
               end
-              f.puts %Q[  mrb_gv_set(mrb2, mrb_intern(mrb2, "$test_args"), test_args_hash); ]
+              f.puts %Q[  mrb_const_set(mrb2, mrb_obj_value(mrb2->object_class), mrb_intern(mrb2, "TEST_ARGS"), test_args_hash); ]
             end
 
             f.puts %Q[  mrb_#{g.funcname}_gem_test(mrb2);] unless g.test_objs.empty?