Investigate travis failures II

Part of #1172