Bug 9788: QA followup