Trying to fix test failure on builder machines