Fixup autopkgtests for new upstream version