This seems to fix the test failure I hit in bug 818385.
Please add 'CC-ARCHES' to the keywords field on the bug if you agree.
amd64 done
arm64 done
x86 stable
arm done all arches done