diff --git a/Rakefile b/Rakefile
index 4b62f2d..bb8e81f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,20 +1,21 @@
 require 'rubygems'
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_autoloader_layout')
 PuppetLint.configuration.send('disable_variable_scope')
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
 
 desc "Validate manifests, templates, and ruby files"
 task :validate do
+  parser_flag = Puppet.version.start_with?('3.') ? '--parser=future' : ''
   Dir['manifests/**/*.pp'].each do |manifest|
-    sh "puppet parser validate --parser=future --noop #{manifest}"
+    sh "puppet parser validate #{parser_flag} --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