3 files changed, 11 insertions, 21 deletions
diff --git a/test/t/exception.rb b/test/t/exception.rb
index 0ce742527..c670d15cd 100644
--- a/test/t/exception.rb
+++ b/test/t/exception.rb
@@ -345,13 +345,13 @@ assert('Exception#inspect without message') do
 end
 
 assert('Exception#backtrace') do
-  begin
-    raise "get backtrace"
-  rescue => e
-    e.backtrace
+  assert_nothing_raised do
+    begin
+      raise "get backtrace"
+    rescue => e
+      e.backtrace
+    end
   end
-
-  true
 end
 
 assert('Raise in ensure') do
diff --git a/test/t/kernel.rb b/test/t/kernel.rb
index c6b65ddf7..17f776683 100644
--- a/test/t/kernel.rb
+++ b/test/t/kernel.rb
@@ -528,20 +528,6 @@ assert('Kernel#global_variables') do
   end
 end
 
-assert('Kernel#__method__') do
-  assert_equal(:m, Class.new {def m; __method__; end}.new.m)
-  assert_equal(:m, Class.new {define_method(:m) {__method__}}.new.m)
-  c = Class.new do
-    [:m1, :m2].each do |m|
-      define_method(m) do
-        __method__
-      end
-    end
-  end
-  assert_equal(:m1, c.new.m1)
-  assert_equal(:m2, c.new.m2)
-end
-
 assert('Kernel#define_singleton_method') do
   o = Object.new
   ret = o.define_singleton_method(:test_method) do
diff --git a/test/t/string.rb b/test/t/string.rb
index a2a020a79..5ecb51530 100644
--- a/test/t/string.rb
+++ b/test/t/string.rb
@@ -476,7 +476,11 @@ assert('String#upcase!', '15.2.10.5.43') do
 end
 
 assert('String#inspect', '15.2.10.5.46') do
-  ("\1" * 100).inspect  # should not raise an exception - regress #1210
+  # should not raise an exception - regress #1210
+  assert_nothing_raised do
+  ("\1" * 100).inspect
+  end
+
   assert_equal "\"\\000\"", "\0".inspect
 end