diff --git a/.fixtures b/.fixtures
new file mode 100644
index 0000000..eb97446
--- /dev/null
+++ b/.fixtures
@@ -0,0 +1,5 @@
+fixtures:
+  repositories:
+    concat: git://github.com/x-way/puppet-concat.git
+  symlinks:
+    interfaces: "#{source_dir}"
diff --git a/.travis.yml b/.travis.yml
index 1993674..208de6d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+language: ruby
 rvm:
   - 1.8.7
   - 1.9.3
@@ -8,5 +9,6 @@
   - PUPPET_VERSION=2.6.2
   - PUPPET_VERSION=2.7.14
   - PUPPET_VERSION=3.1.1
-before_script:
-  - 'git clone git://github.com/x-way/puppet-concat.git spec/fixtures/modules/concat'
+script:
+  - "rake lint"
+  - "rake spec"
diff --git a/Rakefile b/Rakefile
index 733330f..14f1c24 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,17 +1,2 @@
-require 'rake'
-
-begin
-  require 'rspec/core/rake_task'
-  require 'puppet-lint/tasks/puppet-lint'
-rescue LoadError
-  require 'rubygems'
-  retry
-end
-
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = 'spec/*/*_spec.rb'
-end
-
-task :test => [:spec, :lint]
-
-task :default => :test
+require 'rubygems'
+require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8c3a6cb..dc7e9f4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,2 @@
-require 'rspec-puppet'
-
-RSpec.configure do |c|
-  c.module_path = File.expand_path(File.join(__FILE__, '..', 'fixtures', 'modules'))
-  c.manifest_dir = File.expand_path(File.join(__FILE__, '..', 'fixtures', 'manifests'))
-end
+require 'rubygems'
+require 'puppetlabs_spec_helper/module_spec_helper'