Bug 859075 - Attempt to make the test more robust.