NO-SNOW: fix test failures (#4295)