Bug 5877 QA follow-up