diff --git a/test/runner.rb b/test/runner.rb
index f9ed25a931..aa78c4eadb 100644
--- a/test/runner.rb
+++ b/test/runner.rb
@@ -6,4 +6,14 @@ rcsid = %w$Id$
 Version = rcsid[2].scan(/\d+/).collect!(&method(:Integer)).freeze
 Release = rcsid[3].freeze
 
-exit Test::Unit::AutoRunner.run(true, File.dirname($0))
+# this allows minitest and test/unit to run side by side.  test/unit
+# tests with fork/signal were triggering minitest multiple times.
+require 'minitest/unit'
+MiniTest::Unit.disable_autorun
+
+args = ARGV.dup
+result = Test::Unit::AutoRunner.run(true, File.dirname($0))
+result &&= MiniTest::Unit.new.run(args)
+
+exit result
+