Yet some *more* travis fixes

Change-Id: I633a2a09f0f3c874507723918b07ff5c186ed7aa