PIP2-14 Fix travis test failures