fix win64 test failures from #8420