diff --git a/.travis.yml b/.travis.yml
index 95d6331e0dcfbf0b7ddd3f7e6aece64c7c7eccaa..ad8756158e7e3c9273cd261e198c6cfe8bcdf70c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
 ---
 language: ruby
+sudo: false
+cache: bundler
 bundler_args: --without system_tests
 script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec fakeroot rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"]
 matrix:
diff --git a/Gemfile b/Gemfile
index f9c2b63940bc5d98500983b694c662e5e6165f98..b83f8b695021c24450056a4400178d21724029b7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ group :development, :unit_tests do
   gem 'rake',                    :require => false
   gem 'rspec-puppet',            :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git'
   gem 'puppetlabs_spec_helper',  :require => false
-  gem 'puppet-lint',             :require => false
+  gem 'puppet-lint', '< 1.1.0',  :require => false
   gem 'simplecov',               :require => false
   gem 'rspec-puppet-facts',      :require => false
   gem 'json',                    :require => false
diff --git a/Rakefile b/Rakefile
index 5cf3aa81825b8ced1a3a3ca11d3947291234b4b6..a81b2c6fc4c1dad08bb195a5f503005157620c0d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,7 +4,9 @@ require 'puppet-lint/tasks/puppet-lint'
 PuppetLint.configuration.fail_on_warnings
 PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
+PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"]
+
+PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"]
 
 desc "Lint metadata.json file"
 task :metadata do