diff --git a/Rakefile b/Rakefile
index 520801b..525c688 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,19 +1,45 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 
 require 'puppet-lint/tasks/puppet-lint'
-PuppetLint.configuration.send('disable_80chars')
-PuppetLint.configuration.send('disable_2sp_soft_tabs')
-PuppetLint.configuration.send('disable_documentation')
+require 'puppet-syntax/tasks/puppet-syntax'
 
 desc "Validate manifests, templates, and ruby files"
 task :validate do
   Dir['manifests/**/*.pp'].each do |manifest|
     sh "puppet parser validate --noop #{manifest}"
   end
   Dir['spec/**/*.rb','lib/**/*.rb'].each do |ruby_file|
     sh "ruby -c #{ruby_file}" unless ruby_file =~ /spec\/fixtures/
   end
   Dir['templates/**/*.erb'].each do |template|
     sh "erb -P -x -T '-' #{template} | ruby -c"
   end
 end
+
+# workaround for https://github.com/rodjek/puppet-lint/issues/331
+Rake::Task[:lint].clear
+
+PuppetLint.configuration.relative = true
+PuppetLint.configuration.send("disable_80chars")
+PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"
+PuppetLint.configuration.fail_on_warnings = true
+
+exclude_paths = [
+  'pkg/**/*',
+  'vendor/**/*',
+  'spec/**/*',
+]
+PuppetLint.configuration.ignore_paths = exclude_paths
+PuppetSyntax.exclude_paths = exclude_paths
+
+task :metadata do
+  sh 'metadata-json-lint metadata.json'
+end
+
+desc 'Run syntax, lint, and spec tests.'
+task :test => [
+  :syntax,
+  :lint,
+  :spec,
+  :metadata,
+]