Fix issues with integration tests on Travis