NO-SNOW: fix release test failures (#4298)