Try to make test more reliable (saw some sporadic failures on buildbots)