Hopefully fix random test failures

See: https://revive.beccati.com/bamboo/browse/REV-DAILY-P54P-187/test/case/2753123