Prevent more tests from failing on travis-ci