This should fix the windows tests. Re #7253