Bug 10240: QA follow-up