Bug 14570: (follow-up) fix qa FAIL tests