BTW this commit is part of rebasing the minitest branch, but there are now some specs failing on MRI too, so that's going to take a little bit longer to finish.