Friendlier testsuite (#12230)

Here are the changes described in #12230.