diff --git a/lib/puppetlabs_spec_helper/rake_tasks.rb b/lib/puppetlabs_spec_helper/rake_tasks.rb
index db0c197c..3949b91f 100644
--- a/lib/puppetlabs_spec_helper/rake_tasks.rb
+++ b/lib/puppetlabs_spec_helper/rake_tasks.rb
@@ -10,6 +10,12 @@
   t.pattern = 'spec/{classes,defines,unit,functions,hosts,integration}/**/*_spec.rb'
 end
 
+desc "Run beaker acceptance tests"
+RSpec::Core::RakeTask.new(:beaker) do |t|
+  t.rspec_opts = ['--color']
+  t.pattern = 'spec/acceptance'
+end
+
 desc "Generate code coverage information"
 RSpec::Core::RakeTask.new(:coverage) do |t|
   t.rcov = true
@@ -99,6 +105,14 @@ def fixtures(category)
   Rake::Task[:spec_clean].invoke
 end
 
+desc "List available beaker nodesets"
+task :beaker_nodes do
+  Dir['spec/acceptance/nodesets/*.yml'].sort!.select { |node|
+    node.slice!('.yml')
+    puts File.basename(node)
+  }
+end
+
 desc "Build puppet module package"
 task :build do
   # This will be deprecated once puppet-module is a face.