Fix buildbotcustom tests after changes from bug 986990.