Bug 21576: Keep compatibility with QA script