Fix travis tests for 2.2