Cherry pick two patches by Simon McVittie to fix the trash test on Launchpad autobuilders

@smcv would you mind me cherry-picking your proposed patches (with oholy's suggested change)?

It's built fine on Launchpad.