Update .travis.yml, backport spec fix for 2.0+