Fix tests on travis#465

Perhaps it's a bit aggressive fix...