 -        rep
        end
      end
-
+ 
 diff --git a/tool/lib/tracepointchecker.rb b/tool/lib/tracepointchecker.rb
 index 3254e59357..87aa027aa8 100644
 --- a/tool/lib/tracepointchecker.rb

         report.sort_by!{|r| r.start_with?("Skipped:") ? 0 : \
                            (r.start_with?("Failure:") ? 1 : 2) }
         failed(nil)
@@ -775,6 +786,7 @@ def output
       end

       def _prepare_run(suites, type)
+        @assert = options[:assert]
         options[:job_status] ||= :replace if @tty && !@verbose
         case options[:color]
         when :always
@@ -1199,13 +1211,17 @@ def puke klass, meth, e
         # TODO:
         #   this overriding is for minitest feature that skip messages are
         #   hidden when not verbose (-v), note this is temporally.

+++ b/tool/lib/zombie_hunter.rb
@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# The assertions called in after_teardown are offset in minitest/unit.rb
+# so that assertions counts with and without this are the same.  If the
+# count changes, please adjust the code in unit.rb, search for zombie
