Bug 17602: (RM follow-up) QA tool issues