1 files changed, 3 insertions, 1 deletions
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index eb0666a0e6..00313a3237 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -457,7 +457,9 @@ module Test
                 bang = $1
                 worker.status = :ready
                 if @tasks.empty?
-                  break unless @workers.find{|x| x.status == :running }
+                  unless @workers.find{|x| [:running, :prepare].include? x.status}
+                    break
+                  end
                 else
                   if @options[:separate] && bang.empty?
                     @workers_hash.delete worker.io