This should reduce the number of flakes without actually increasing the timeout, so we'll still find out quickly if a test is hanging. The numbers here might need tweaking. Maybe the default two seconds is too short for CI bots.
