Code review comment for lp://staging/~lifeless/bzr-builder/fix-tests

I can't land this currently as it is a 2a branch and the trunk of the
project is not.

I just sent the notification I will upload in a week. If you wish to
see this land before that please push an old-format branch.

Thanks,

James