Bug 9697: Follow-up - making QA script and tests happy