2 files changed, 2 insertions, 2 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 6fab874f23..ce2eb85da7 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -272,4 +272,4 @@ module Test
   end
 end
 
-at_exit{Test::Unit::AutoRunner.run($0) unless(Test::Unit.run?)}
+at_exit{Test::Unit::AutoRunner.run($0) unless($! || Test::Unit.run?)}
diff --git a/lib/test/unit/assertionfailederror.rb b/lib/test/unit/assertionfailederror.rb
index 9b9e53f16c..0854203675 100644
--- a/lib/test/unit/assertionfailederror.rb
+++ b/lib/test/unit/assertionfailederror.rb
@@ -8,7 +8,7 @@ module Test
   module Unit
 
     # Thrown by Test::Unit::Assertions when an assertion fails.
-    class AssertionFailedError < Exception
+    class AssertionFailedError < StandardError
     end
   end
 end