Re #6314. Try to fix test on Windows & Ubuntu.