diff --git a/mrbgems/mruby-test/mrbgem.rake b/mrbgems/mruby-test/mrbgem.rake
index 536d2b6ba..c8070dd01 100644
--- a/mrbgems/mruby-test/mrbgem.rake
+++ b/mrbgems/mruby-test/mrbgem.rake
@@ -66,33 +66,27 @@ MRuby::Gem::Specification.new('mruby-test') do |spec|
         f.puts %Q[void mrb_t_pass_result(mrb_state *dst, mrb_state *src);]
         f.puts %Q[void GENERATED_TMP_mrb_#{g.funcname}_gem_test(mrb_state *mrb) {]
         unless g.test_rbfiles.empty?
-          f.puts %Q[  mrb_state *mrb2;]
           unless g.test_args.empty?
             f.puts %Q[  mrb_value test_args_hash;]
           end
+          f.puts %Q[  mrb_state *mrb2 = mrb_open_core(mrb_default_allocf, NULL);]
+          f.puts %Q[  if (mrb2 == NULL) {]
+          f.puts %Q[    fprintf(stderr, "Invalid mrb_state, exiting \%s", __func__);]
+          f.puts %Q[    exit(EXIT_FAILURE);]
+          f.puts %Q[  }]
+          f.puts %Q[  mrb_const_set(mrb2, mrb_obj_value(mrb2->object_class), mrb_intern_lit(mrb2, "GEMNAME"), mrb_str_new(mrb2, "#{g.name}", #{g.name.length}));]
+          if test_preload.nil?
+            f.puts %Q[  mrb_load_irep(mrb2, mrbtest_assert_irep);]
+          else
+            f.puts %Q[  mrb_load_irep(mrb2, gem_test_irep_#{g.funcname}_preload);]
+          end
+          dep_list.each do |d|
+            f.puts %Q[  GENERATED_TMP_mrb_#{d.funcname}_gem_init(mrb2);]
+            f.puts %Q[  mrb_state_atexit(mrb2, GENERATED_TMP_mrb_#{d.funcname}_gem_final);]
+          end
+          f.puts %Q[  mrb_init_test_driver(mrb2, mrb_test(mrb_gv_get(mrb, mrb_intern_lit(mrb, "$mrbtest_verbose"))));]
+          f.puts %Q[  ]
           g.test_rbfiles.count.times do |i|
-            f.puts %Q[  mrb2 = mrb_open_core(mrb_default_allocf, NULL);]
-            f.puts %Q[  if (mrb2 == NULL) {]
-            f.puts %Q[    fprintf(stderr, "Invalid mrb_state, exiting \%s", __func__);]
-            f.puts %Q[    exit(EXIT_FAILURE);]
-            f.puts %Q[  }]
-            dep_list.each do |d|
-              f.puts %Q[  GENERATED_TMP_mrb_#{d.funcname}_gem_init(mrb2);]
-              f.puts %Q[  mrb_state_atexit(mrb2, GENERATED_TMP_mrb_#{d.funcname}_gem_final);]
-            end
-            f.puts %Q[  mrb_init_test_driver(mrb2, mrb_test(mrb_gv_get(mrb, mrb_intern_lit(mrb, "$mrbtest_verbose"))));]
-            if test_preload.nil?
-              f.puts %Q[  mrb_load_irep(mrb2, mrbtest_assert_irep);]
-            else
-              f.puts %Q[  mrb_load_irep(mrb2, gem_test_irep_#{g.funcname}_preload);]
-            end
-            f.puts %Q[  if (mrb2->exc) {]
-            f.puts %Q[    mrb_print_error(mrb2);]
-            f.puts %Q[    mrb_close(mrb2);]
-            f.puts %Q[    exit(EXIT_FAILURE);]
-            f.puts %Q[  }]
-            f.puts %Q[  mrb_const_set(mrb2, mrb_obj_value(mrb2->object_class), mrb_intern_lit(mrb2, "GEMNAME"), mrb_str_new(mrb2, "#{g.name}", #{g.name.length}));]
-
             unless g.test_args.empty?
               f.puts %Q[  test_args_hash = mrb_hash_new_capa(mrb2, #{g.test_args.length}); ]
               g.test_args.each do |arg_name, arg_value|
@@ -104,13 +98,16 @@ MRuby::Gem::Specification.new('mruby-test') do |spec|
             end
 
             f.puts %Q[  mrb_#{g.funcname}_gem_test(mrb2);] if g.custom_test_init?
-
             f.puts %Q[  mrb_load_irep(mrb2, gem_test_irep_#{g.funcname}_#{i});]
+            f.puts %Q[  if (mrb2->exc) {]
+            f.puts %Q[    mrb_print_error(mrb2);]
+            f.puts %Q[    mrb_close(mrb2);]
+            f.puts %Q[    exit(EXIT_FAILURE);]
+            f.puts %Q[  }]
             f.puts %Q[  ]
-
-            f.puts %Q[  mrb_t_pass_result(mrb, mrb2);]
-            f.puts %Q[  mrb_close(mrb2);]
           end
+          f.puts %Q[  mrb_t_pass_result(mrb, mrb2);]
+          f.puts %Q[  mrb_close(mrb2);]
         end
         f.puts %Q[}]
       end