Comment 1 for bug 1346444

This review is in a very advanced state, and it improves testing while not adding any new feature.

I would consider it for RC1, input from the rest of the team is welcome (assuming it is acceptable as it adds dependencies in test-requirements)