diff --git a/.travis.yml b/.travis.yml
index ae03401..4abb33d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,38 @@
 sudo: false
 language: ruby
 cache: bundler
-bundler_args: --without system_tests development
+bundler_args: "--without system_tests development"
 before_install:
 - bundle -v
 - rm Gemfile.lock || true
 - gem update --system
 - gem update bundler
 - gem --version
 - bundle -v
 script:
 - bundle exec rake $CHECK
 matrix:
   fast_finish: true
   include:
   - rvm: 2.3.1
-    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
+    env: PUPPET_VERSION="~> 5.0" STRICT_VARIABLES="yes" CHECK=test
   - rvm: 2.3.1
-    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=build FORGEDEPLOY=true
+    env: PUPPET_VERSION="~> 5.0" STRICT_VARIABLES="yes" CHECK=rubocop
   - rvm: 2.3.1
-    env: PUPPET_VERSION="~> 5.0" STRICT_VARIABLES="yes" CHECK=test
+    env: PUPPET_VERSION="~> 5.0" STRICT_VARIABLES="yes" CHECK=build FORGEDEPLOY=true
   - rvm: 2.5.3
     env: PUPPET_VERSION="~> 6.1" STRICT_VARIABLES="yes" CHECK=test
   - rvm: 2.5.3
     env: PUPPET_VERSION="~> 6.1" STRICT_VARIABLES="yes" CHECK=rubocop
 notifications:
   email: false
 deploy:
   provider: puppetforge
   user: saz
   password:
     secure: DQ/x19HAzJkgKB8Gv/AKCouP7LguQtWjRI7AI/0sdDSUYHcMd1AffF0vtjXpOjIN0+HPHi117JKmmiUotWmCAOJOIhUsMcBQ9nTEQDwPMTrW14BDCOyCHzzN4EC5PbMVenMN6smy+8KGMiG0XoXsvk58PSMzSsjbVwLiZRASTr0=
   on:
     tags: true
     all_branches: true
     rvm: 2.3.1
     condition: "$FORGEDEPLOY = true"
diff --git a/Rakefile b/Rakefile
index 5c10c3f..f86e5d3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,42 +1,43 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet_blacksmith/rake_tasks'
 require 'voxpupuli/release/rake_tasks'
 
 if RUBY_VERSION >= '2.2.0'
   require 'rubocop/rake_task'
 
   RuboCop::RakeTask.new(:rubocop) do |task|
     # These make the rubocop experience maybe slightly less terrible
     task.options = ['-D', '-S', '-E']
   end
 end
 
+PuppetLint.configuration.log_format = '%{path}:%{linenumber}:%{check}:%{KIND}:%{message}'
 PuppetLint.configuration.fail_on_warnings = true
 PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_140chars')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_documentation')
 PuppetLint.configuration.send('disable_single_quote_string_with_variables')
 
-exclude_paths = %w(
+exclude_paths = %w[
   pkg/**/*
   vendor/**/*
   .vendor/**/*
   spec/**/*
-)
+]
 PuppetLint.configuration.ignore_paths = exclude_paths
 PuppetSyntax.exclude_paths = exclude_paths
 
 desc 'Run acceptance tests'
 RSpec::Core::RakeTask.new(:acceptance) do |t|
   t.pattern = 'spec/acceptance'
 end
 
 desc 'Run tests metadata_lint, lint, syntax, spec'
 task test: [
   :metadata_lint,
   :lint,
   :syntax,
-  :spec,
+  :spec
 ]
 # vim: syntax=ruby