Bug 7677: QA followup