diff --git a/.fixtures.yml b/.fixtures.yml
new file mode 100644
index 0000000000..d1b2b8147f
--- /dev/null
+++ b/.fixtures.yml
@@ -0,0 +1,6 @@
+fixtures:
+  repositories:
+    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
+    firewall: "git://github.com/puppetlabs/puppetlabs-firewall.git"
+  symlinks:
+    apache: "#{source_dir}"
diff --git a/.gemfile b/.gemfile
new file mode 100644
index 0000000000..9aad840c0a
--- /dev/null
+++ b/.gemfile
@@ -0,0 +1,5 @@
+source :rubygems
+
+puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
+gem 'puppet', puppetversion
+gem 'puppetlabs_spec_helper', '>= 0.1.0'
diff --git a/Rakefile b/Rakefile
index 3ba1a325f7..cd3d379958 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,14 +1 @@
-require 'rake'
-
-task :default => [:spec]
-
-desc "Run all module spec tests (Requires rspec-puppet gem)"
-task :spec do
-  system("rspec spec")
-end
-
-desc "Build package"
-task :build do
-  system("puppet-module build")
-end
-
+require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/spec/spec.opts b/spec/spec.opts
new file mode 100644
index 0000000000..91cd6427ed
--- /dev/null
+++ b/spec/spec.opts
@@ -0,0 +1,6 @@
+--format
+s
+--colour
+--loadby
+mtime
+--backtrace
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index d2648da2b2..2c6f56649a 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,11 +1 @@
-require 'puppet'
-require 'rubygems'
-require 'rspec-puppet'
-
-def param_value(subject, type, title, param)
-  subject.resource(type, title).send(:parameters)[param.to_sym]
-end
-
-RSpec.configure do |c|
-  c.module_path = File.join(File.dirname(__FILE__), '../../')
-end
+require 'puppetlabs_spec_helper/module_spec_helper'