Merge pull request #5611
f0b8afc tests: fix spurious windows test failures after 012598880c (Cory Fields)