A possible fix for the intermittent CI test failures