2 files changed, 10 insertions, 16 deletions
diff --git a/test/ruby/test_env.rb b/test/ruby/test_env.rb
index 6effa5197c..070e10464e 100644
--- a/test/ruby/test_env.rb
+++ b/test/ruby/test_env.rb
@@ -10,15 +10,13 @@ class TestEnv < Test::Unit::TestCase
   ]
 
   def assert_invalid_env(msg = nil)
-    failed = {}
-    INVALID_ENVVARS.select do |v|
-      begin
-        assert_raise(ArgumentError) {yield v}
-      rescue MiniTest::Assertion => e
-        failed[v] = e
+    all_assertions(msg) do |a|
+      INVALID_ENVVARS.each do |v|
+        a.for(v) do
+          assert_raise(ArgumentError) {yield v}
+        end
       end
     end
-    assert(failed.empty?, message(msg) {mu_pp(failed)})
   end
 
   def setup
diff --git a/test/ruby/test_yield.rb b/test/ruby/test_yield.rb
index e7d150a08f..5c98bb8850 100644
--- a/test/ruby/test_yield.rb
+++ b/test/ruby/test_yield.rb
@@ -356,16 +356,12 @@ class TestRubyYieldGen < Test::Unit::TestCase
   end
 
   def assert_all_sentences(syntax, *args)
-    fails = []
     syntax = Sentence.expand_syntax(syntax)
-    Sentence.each(syntax, *args) {|t|
-      begin
-        yield t
-      rescue MiniTest::Assertion => e
-        fails << e.message
-      end
-    }
-    assert(fails.empty?, proc {fails.join("\n--------\n")})
+    all_assertions do |a|
+      Sentence.each(syntax, *args) {|t|
+        a.for(t) {yield t}
+      }
+    end
   end
 
   def test_yield