Handle latest testtools changes.