(#20308) Try again to fix fileset tests on Windows