diff --git a/.gitignore b/.gitignore
index d0aec6d79..aa8a040a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *.swp
 pkg/
 Gemfile.lock
+.rspec_system
+spec/fixtures
diff --git a/.nodeset.yml b/.nodeset.yml
new file mode 100644
index 000000000..767f9cd2f
--- /dev/null
+++ b/.nodeset.yml
@@ -0,0 +1,31 @@
+---
+default_set: 'centos-64-x64'
+sets:
+  'centos-59-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'centos-59-x64'
+  'centos-64-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'centos-64-x64'
+  'fedora-18-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'fedora-18-x64'
+  'debian-607-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'debian-607-x64'
+  'debian-70rc1-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'debian-70rc1-x64'
+  'ubuntu-server-10044-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'ubuntu-server-10044-x64'
+  'ubuntu-server-12042-x64':
+    nodes:
+      "main.foo.vm":
+        prefab: 'ubuntu-server-12042-x64'
diff --git a/Gemfile b/Gemfile
index 0c9691d2b..fd321c0f3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,10 +1,14 @@
 source 'https://rubygems.org'
 
 group :development, :test do
-  gem 'rake',                   :require => false
-  gem 'rspec-puppet',           :require => false
-  gem 'puppetlabs_spec_helper', :require => false
-  gem 'puppet-lint',            :require => false
+  gem 'rake',                    :require => false
+  gem 'rspec-puppet',            :require => false
+  gem 'puppetlabs_spec_helper',  :require => false
+  gem 'rspec-system',            :require => false
+  gem 'rspec-system-puppet',     :require => false
+  gem 'rspec-system-serverspec', :require => false
+  gem 'serverspec',              :require => false
+  gem 'puppet-lint',             :require => false
 end
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
diff --git a/Rakefile b/Rakefile
index cd3d37995..bb60173e5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1 +1,2 @@
 require 'puppetlabs_spec_helper/rake_tasks'
+require 'rspec-system/rake_task'
diff --git a/spec/spec_helper_system.rb b/spec/spec_helper_system.rb
new file mode 100644
index 000000000..39516ecb8
--- /dev/null
+++ b/spec/spec_helper_system.rb
@@ -0,0 +1,28 @@
+require 'rspec-system/spec_helper'
+require 'rspec-system-puppet/helpers'
+require 'rspec-system-serverspec/helpers'
+
+include RSpecSystemPuppet::Helpers
+
+include Serverspec::Helper::RSpecSystem
+include Serverspec::Helper::DetectOS
+
+RSpec.configure do |c|
+  # Project root
+  proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+  # Enable colour
+  c.tty = true
+
+  c.include RSpecSystemPuppet::Helpers
+
+  # This is where we 'setup' the nodes before running our tests
+  c.before :suite do
+    # Install puppet
+    puppet_install
+
+    # Install modules and dependencies
+    puppet_module_install(:source => proj_root, :module_name => 'mysql')
+    shell('puppet module install puppetlabs-stdlib')
+  end
+end
diff --git a/spec/system/mysql_spec.rb b/spec/system/mysql_spec.rb
new file mode 100644
index 000000000..f1f578f43
--- /dev/null
+++ b/spec/system/mysql_spec.rb
@@ -0,0 +1,28 @@
+require 'spec_helper_system'
+
+describe 'mysql class' do
+  describe 'running puppet code' do
+    # Using puppet_apply as a helper
+    it 'should work with no errors' do
+      pp = <<-EOS
+        class { 'mysql': }
+      EOS
+
+      # Run it twice and test for idempotency
+      puppet_apply(pp) do |r|
+        r.exit_code.should_not == 1
+        r.refresh
+        r.exit_code.should be_zero
+      end
+    end
+  end
+
+  describe package('mysql') do
+    it { should be_installed }
+  end
+
+  describe service('mysqld') do
+    it { should_not be_running }
+    it { should_not be_enabled }
+  end
+end