Bug 7180: QA followup