diff --git a/.travis.yml b/.travis.yml
index 0b9e331..a344ecf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,23 @@
 ---
 language: ruby
 bundler_args: --without development
 before_install: rm Gemfile.lock || true
 rvm:
   - 1.9.3
   - 2.1.0
+env:
+  - PUPPET_VERSION="~> 3.2.0"
+  - PUPPET_VERSION="~> 3.3.0"
+  - PUPPET_VERSION="~> 3.4.0"
+  - PUPPET_VERSION="~> 3.5.0"
+  - PUPPET_VERSION="~> 3.6.0"
+  - PUPPET_VERSION="~> 3.7.0"
+matrix:
+  exclude:
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 3.2.0"
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 3.3.0"
+    - rvm: 2.1.0
+      env: PUPPET_VERSION="~> 3.4.0"
 script: bundle exec rake spec
diff --git a/Gemfile b/Gemfile
index 8aac9c1..3e72d45 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,17 +1,17 @@
 source 'https://rubygems.org'
 
 group :test do
   gem 'rake'
   gem 'puppet', ENV['PUPPET_VERSION'] || '~> 3.7.0'
-  gem 'rspec-puppet'
+  gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git', :ref => 'v2.0.0'
   gem 'puppetlabs_spec_helper'
 end
 
 group :development do
   gem 'travis'
   gem 'travis-lint'
   gem 'vagrant-wrapper'
   gem 'puppet-blacksmith'
   gem 'guard-rake'
   gem 'metadata-json-lint'
 end
diff --git a/spec/classes/munin_master_spec.rb b/spec/classes/munin_master_spec.rb
index 81e1aae..f8728e5 100644
--- a/spec/classes/munin_master_spec.rb
+++ b/spec/classes/munin_master_spec.rb
@@ -1,165 +1,155 @@
 require 'spec_helper'
 
 describe 'munin::master' do
 
   [ :CentOS, :Debian, :RedHat, :Ubuntu ].each do |sc|
     context "Check for supported operatingsystem #{sc}" do
       include_context sc
       it { should compile }
       it { should contain_class('munin::master') }
       it {
         should contain_package('munin')
         should contain_file('/etc/munin/munin.conf')
         should contain_file('/etc/munin/munin-conf.d')
           .with_ensure('directory')
       }
     end
   end
 
   [ :SmartOS ].each do |sc|
     context "Check for supported operatingsystem #{sc}" do
       include_context sc
       it { should compile }
       it { should contain_class('munin::master') }
       it {
         should contain_package('munin')
         should contain_file('/opt/local/etc/munin/munin.conf')
         should contain_file('/opt/local/etc/munin/munin-conf.d')
           .with_ensure('directory')
       }
     end
   end
 
   context 'with default params' do
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/graph_strategy\s+cgi/)
         .with_content(/html_strategy\s+cgi/)
     }
   end
 
   context 'with html_strategy => cron' do
     let (:params) { { :html_strategy => 'cron' } }
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/html_strategy\s+cron/)
     }
   end
 
   context 'with graph_strategy => cron' do
     let (:params) { { :graph_strategy => 'cron' } }
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/graph_strategy\s+cron/)
     }
   end
 
   context 'with dbdir => /var/lib/munin' do
     let (:params) { { :dbdir => '/var/lib/munin' } }
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/dbdir\s+\/var\/lib\/munin/)
     }
   end
 
   context 'with htmldir => /var/www/munin' do
     let (:params) { { :htmldir => '/var/www/munin' } }
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/htmldir\s+\/var\/www\/munin/)
     }
   end
 
   context 'with logdir => /var/log/munin' do
     let (:params) { { :dbdir => '/var/log/munin' } }
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/dbdir\s+\/var\/log\/munin/)
     }
   end
 
   context 'with rudir => /var/run/munin' do
     let (:params) { { :dbdir => '/var/run/munin' } }
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/dbdir\s+\/var\/run\/munin/)
     }
   end
 
   context 'with tls => enabled' do
     let(:params) {
       {
         :tls => 'enabled',
         :tls_certificate => '/path/to/certificate.pem',
         :tls_private_key => '/path/to/key.pem',
         :tls_verify_certificate => 'yes',
       }
     }
 
     it { should compile }
     it {
       should contain_file('/etc/munin/munin.conf')
         .with_content(/tls = enabled/)
         .with_content(/tls_certificate = \/path\/to\/certificate\.pem/)
         .with_content(/tls_private_key = \/path\/to\/key\.pem/)
         .with_content(/tls_verify_certificate = yes/)
     }
   end
 
   context 'with extra_config' do
     token = '1b7febce-bb2d-4c18-b889-84c73538a900'
     let(:params) do
       { :extra_config => [ token ] }
     end
     it { should compile }
     it do
       should contain_file('/etc/munin/munin.conf')
               .with_content(/#{token}/)
     end
   end
 
   context 'with extra_config set to a string' do
     token = '1b7febce-bb2d-4c18-b889-84c73538a900'
     let(:params) do
       { :extra_config => token }
     end
-    it do
-      expect { should compile }
-        .to raise_error(Puppet::Error, /is not an Array/)
-    end
-
+    it { should raise_error(Puppet::Error, /is not an Array/) }
   end
 
   ['test.example.com', 'invalid/hostname.example.com'].each do |param|
     context "with host_name => #{param}" do
       let(:params) do
         { :host_name => param }
       end
       if param =~ /invalid/
-        it do
-          expect { should compile }
-            .to raise_error(Puppet::Error, /valid domain name/)
-        end
+        it { should raise_error(Puppet::Error, /valid domain name/) }
       else
         it { should compile }
       end
     end
   end
 
   %w( enabled disabled mine unclaimed invalid ).each do |param|
     context "with collect_nodes => #{param}" do
       let(:params) do
         { :collect_nodes => param }
       end
       if param == 'invalid'
-        it do
-          expect { should compile }
-            .to raise_error(Puppet::Error, /validate_re/)
-        end
+        it { should raise_error(Puppet::Error, /validate_re/) }
       else
         it { should compile }
       end
     end
   end
 
 end