Bug 29697: (QA follow-up) Make tests less fragile