[MERGE] Trivial fixes to test suite

[Andrew Bennetts]

Vincent Ladeuil wrote:
> Well, trivial when each test is run alone in a list by itself,
> hardly noticeable otherwise ;-)
> 
> Not NEWS worthy, will merge in 24h if nobody objects, kthksbye,
> 
>      Vincent

bb:approve

-Andrew.