diff --git a/deployment/puppet/haproxy/.fixtures.yml b/deployment/puppet/haproxy/.fixtures.yml
new file mode 100644
index 0000000000..8d6f22d6f5
--- /dev/null
+++ b/deployment/puppet/haproxy/.fixtures.yml
@@ -0,0 +1,5 @@
+fixtures:
+  repositories:
+    concat: "git://github.com/ripienaar/puppet-concat.git"
+  symlinks:
+    haproxy: "#{source_dir}"
diff --git a/deployment/puppet/haproxy/Rakefile b/deployment/puppet/haproxy/Rakefile
index aa737b9b33..cd3d379958 100644
--- a/deployment/puppet/haproxy/Rakefile
+++ b/deployment/puppet/haproxy/Rakefile
@@ -1,8 +1 @@
-require 'rake'
-require 'puppet-lint/tasks/puppet-lint'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.rspec_opts = '-c'
-  t.pattern = 'spec/*/*_spec.rb'
-end
+require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/deployment/puppet/haproxy/spec/spec.opts b/deployment/puppet/haproxy/spec/spec.opts
new file mode 100644
index 0000000000..91cd6427ed
--- /dev/null
+++ b/deployment/puppet/haproxy/spec/spec.opts
@@ -0,0 +1,6 @@
+--format
+s
+--colour
+--loadby
+mtime
+--backtrace
diff --git a/deployment/puppet/haproxy/spec/spec_helper.rb b/deployment/puppet/haproxy/spec/spec_helper.rb
index 9dbbf18002..2c6f56649a 100644
--- a/deployment/puppet/haproxy/spec/spec_helper.rb
+++ b/deployment/puppet/haproxy/spec/spec_helper.rb
@@ -1,13 +1 @@
-require 'puppet'
-require 'rubygems'
-require 'rspec-puppet'
-
-fixture_path = File.expand_path(File.join(__FILE__, '..', 'fixtures'))
-RSpec.configure do |c|
- c.module_path = File.join(fixture_path, 'modules')
- c.manifest_dir = File.join(fixture_path, 'manifests')
-end
-
-class Object
-    alias :must :should
-end
+require 'puppetlabs_spec_helper/module_spec_helper'