Bug 21835: (QA follow-up) Fix failing test