Fix some failing travis CI tests: [#81223932]

https://www.pivotaltracker.com/story/show/81223932