diff --git a/spec/classes/munin_master_spec.rb b/spec/classes/munin_master_spec.rb
index fc892a0..df595a7 100644
--- a/spec/classes/munin_master_spec.rb
+++ b/spec/classes/munin_master_spec.rb
@@ -1,196 +1,192 @@
 require 'spec_helper'
 
 t_conf_dir = {}
 t_conf_dir.default = '/etc/munin'
 t_conf_dir['Solaris'] = '/opt/local/etc/munin'
 t_conf_dir['FreeBSD'] = '/usr/local/etc/munin'
 
 t_package = {}
 t_package.default = 'munin'
 t_package['FreeBSD'] = 'munin-master'
 
 describe 'munin::master' do
   on_supported_os.each do |os, facts|
     # Avoid testing on distributions similar to RedHat and Debian
     next if os =~ %r{^(ubuntu|centos|scientific|oraclelinux)-}
 
-    # No need to test all os versions as long as os version is not
-    # used in the params class
-    next if os =~ %r{^(debian-[67]|redhat-[56]|freebsd-9)-}
-
     context "on #{os}" do
       let(:facts) do
         facts
       end
 
       conf_dir = t_conf_dir[facts[:osfamily]]
       package = t_package[facts[:osfamily]]
 
       it { is_expected.to compile.with_all_deps }
 
       it { is_expected.to contain_package(package) }
 
       context 'with default params' do
         it do
           is_expected.to contain_file("#{conf_dir}/munin.conf")
             .with_content(%r{graph_strategy\s+cgi})
             .with_content(%r{html_strategy\s+cgi})
         end
 
         it do
           is_expected.to contain_file("#{conf_dir}/munin-conf.d")
             .with_ensure('directory')
         end
       end
 
       context 'with html_strategy => cron' do
         let(:params) { { html_strategy: 'cron' } }
 
         it { is_expected.to compile.with_all_deps }
         it do
           is_expected.to contain_file("#{conf_dir}/munin.conf")
             .with_content(%r{html_strategy\s+cron})
         end
       end
 
       context 'with graph_strategy => cron' do
         let(:params) { { graph_strategy: 'cron' } }
 
         it { is_expected.to compile.with_all_deps }
         it do
           is_expected.to contain_file("#{conf_dir}/munin.conf")
             .with_content(%r{graph_strategy\s+cron})
         end
       end
 
       context 'with dbdir => /var/lib/munin' do
         let(:params) { { dbdir: '/var/lib/munin' } }
 
         it { is_expected.to compile.with_all_deps }
         it do
           is_expected.to contain_file("#{conf_dir}/munin.conf")
             .with_content(%r{dbdir\s+/var/lib/munin})
         end
       end
 
       context 'with htmldir => /var/www/munin' do
         let(:params) { { htmldir: '/var/www/munin' } }
 
         it { is_expected.to compile.with_all_deps }
         it do
           is_expected.to contain_file("#{conf_dir}/munin.conf")
             .with_content(%r{htmldir\s+/var/www/munin})
         end
       end
 
       context 'with logdir => /var/log/munin' do
         let(:params) { { dbdir: '/var/log/munin' } }
 
         it { is_expected.to compile.with_all_deps }
         it do
           is_expected.to contain_file("#{conf_dir}/munin.conf")
             .with_content(%r{dbdir\s+/var/log/munin})
         end
       end
 
       context 'with rundir => /var/run/munin' do
         let(:params) { { dbdir: '/var/run/munin' } }
 
         it { is_expected.to compile.with_all_deps }
         it do
           is_expected.to contain_file("#{conf_dir}/munin.conf")
             .with_content(%r{dbdir\s+/var/run/munin})
         end
       end
 
       context 'with tls => enabled' do
         let(:params) do
           {
             tls: 'enabled',
             tls_certificate: '/path/to/certificate.pem',
             tls_private_key: '/path/to/key.pem',
             tls_verify_certificate: 'yes',
           }
         end
 
         it { is_expected.to compile.with_all_deps }
         it do
           is_expected.to contain_file("#{conf_dir}/munin.conf")
             .with_content(%r{tls = enabled})
             .with_content(%r{tls_certificate = /path/to/certificate\.pem})
             .with_content(%r{tls_private_key = /path/to/key\.pem})
             .with_content(%r{tls_verify_certificate = yes})
         end
       end
 
       context 'with node_definitions' do
         let(:params) do
           {
             node_definitions: {
               'node-a' => {
                 'address' => 'munin://node-a.example.com',
               },
               'node-b' => {
                 'address' => 'munin://node-b.example.com',
               },
             },
           }
         end
 
         it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_munin__master__node_definition('node-a') }
         it { is_expected.to contain_munin__master__node_definition('node-b') }
       end
 
       context 'with extra_config' do
         token = '1b7febce-bb2d-4c18-b889-84c73538a900'
         let(:params) do
           { extra_config: [token] }
         end
 
         it { is_expected.to compile.with_all_deps }
         it do
           is_expected.to contain_file("#{conf_dir}/munin.conf")
             .with_content(%r{#{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 { is_expected.to raise_error(Puppet::Error, %r{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 =~ %r{invalid}
             it { is_expected.to raise_error(Puppet::Error, %r{valid domain name}) }
           else
             it { is_expected.to compile.with_all_deps }
           end
         end
       end
 
       ['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 { is_expected.to raise_error(Puppet::Error, %r{validate_re}) }
           else
             it { is_expected.to compile.with_all_deps }
           end
         end
       end
     end
   end
 end
diff --git a/spec/classes/munin_node_spec.rb b/spec/classes/munin_node_spec.rb
index 65fff6d..cd2ac9e 100644
--- a/spec/classes/munin_node_spec.rb
+++ b/spec/classes/munin_node_spec.rb
@@ -1,186 +1,182 @@
 require 'spec_helper'
 
 t_conf_dir = {}
 t_conf_dir.default = '/etc/munin'
 t_conf_dir['DragonFly'] = '/usr/local/etc/munin'
 t_conf_dir['FreeBSD'] = '/usr/local/etc/munin'
 t_conf_dir['Solaris'] = '/opt/local/etc/munin'
 
 describe 'munin::node' do
   on_supported_os.each do |os, facts|
     # Avoid testing on distributions similar to RedHat and Debian
     next if os =~ %r{^(ubuntu|centos|scientific|oraclelinux)-}
 
-    # No need to test all os versions as long as os version is not
-    # used in the params class
-    next if os =~ %r{^(debian-[67]|redhat-[56]|freebsd-9)-}
-
     context "on #{os}" do
       let(:facts) { facts }
 
       it { is_expected.to compile.with_all_deps }
 
       it { is_expected.to contain_package('munin-node') }
 
       munin_confdir = t_conf_dir[facts[:osfamily]]
 
       munin_node_conf = "#{munin_confdir}/munin-node.conf"
       munin_plugin_dir = "#{munin_confdir}/plugins"
       munin_plugin_conf_dir = "#{munin_confdir}/plugin-conf.d"
 
       munin_node_service =
         case facts[:osfamily]
         when 'Solaris' then 'smf:/munin-node'
         else 'munin-node'
         end
 
       log_dir =
         case facts[:osfamily]
         when 'Solaris' then '/var/opt/log/munin'
         when 'RedHat' then '/var/log/munin-node'
         else '/var/log/munin'
         end
 
       it { is_expected.to contain_service(munin_node_service) }
       it { is_expected.to contain_file(munin_node_conf) }
 
       context 'with no parameters' do
         it { is_expected.to compile.with_all_deps }
         it do
           is_expected.to contain_service(munin_node_service)
             .without_ensure
         end
         it do
           is_expected.to contain_file(munin_node_conf)
             .with_content(%r{host_name\s+foo.example.com})
             .with_content(%r{log_file\s+#{log_dir}/munin-node.log})
         end
       end
 
       context 'with parameter allow' do
         let(:params) do
           { allow: ['2001:db8:1::',
                     '2001:db8:2::/64',
                     '192.0.2.129',
                     '192.0.2.0/25',
                     '192\.0\.2'] }
         end
 
         it { is_expected.to compile.with_all_deps }
         it do
           is_expected.to contain_file(munin_node_conf)
             .with_content(%r{^cidr_allow 192\.0\.2\.0/25$})
             .with_content(%r{^cidr_allow 2001:db8:2::/64$})
             .with_content(%r{^allow \^192\\\.0\\\.2\\\.129\$$})
             .with_content(%r{^allow 192\\.0\\.2$})
             .with_content(%r{^allow \^2001:db8:1::\$$})
         end
       end
 
       context 'with parameter host_name' do
         let(:params) do
           { host_name: 'something.example.com' }
         end
 
         it { is_expected.to compile.with_all_deps }
         it do
           is_expected.to contain_file(munin_node_conf)
             .with_content(%r{host_name\s+something.example.com})
         end
       end
 
       context 'with parameter service_ensure' do
         let(:params) do
           { service_ensure: 'running' }
         end
 
         it { is_expected.to compile.with_all_deps }
         it do
           is_expected.to contain_service('munin-node')
             .with_ensure('running')
         end
       end
 
       context 'logging to syslog' do
         context 'defaults' do
           let(:params) do
             { log_destination: 'syslog' }
           end
 
           it { is_expected.to compile.with_all_deps }
           it do
             is_expected.to contain_file(munin_node_conf)
               .with_content(%r{log_file\s+Sys::Syslog})
           end
         end
 
         context 'with syslog options' do
           let(:params) do
             { log_destination: 'syslog',
               syslog_facility: 'local1' }
           end
 
           it { is_expected.to compile.with_all_deps }
           it do
             is_expected.to contain_file(munin_node_conf)
               .with_content(%r{log_file\s+Sys::Syslog})
               .with_content(%r{syslog_facility\s+local1})
           end
         end
 
         context 'with syslog_facility set to wrong value ' do
           let(:params) do
             { log_destination: 'syslog',
               syslog_facility: 'wrong' }
           end
 
           it { expect { is_expected.to compile.with_all_deps }.to raise_error(%r{validate_re}) }
         end
       end
 
       context 'purge_configs' do
         context 'set' do
           let(:params) { { purge_configs: true } }
 
           it { is_expected.to compile.with_all_deps }
           it do
             is_expected.to contain_file(munin_plugin_dir)
               .with_ensure('directory')
               .with_recurse(true)
               .with_purge(true)
           end
           it do
             is_expected.to contain_file(munin_plugin_conf_dir)
               .with_ensure('directory')
               .with_recurse(true)
               .with_purge(true)
           end
         end
         context 'unset' do
           it { is_expected.to compile.with_all_deps }
           it { is_expected.not_to contain_file(munin_plugin_dir) }
           it { is_expected.not_to contain_file(munin_plugin_conf_dir) }
         end
       end
 
       context 'timeout' do
         context 'set' do
           let(:params) { { timeout: 123 } }
 
           it { is_expected.to compile.with_all_deps }
           it do
             is_expected.to contain_file(munin_node_conf)
               .with_content(%r{^timeout 123})
           end
         end
         context 'unset' do
           it { is_expected.to compile.with_all_deps }
           it do
             is_expected.to contain_file(munin_node_conf)
               .without_content(%r{^timeout})
           end
         end
       end
     end
   end
 end
diff --git a/spec/defines/munin_plugin_spec.rb b/spec/defines/munin_plugin_spec.rb
index a4fb37b..ffa07cf 100644
--- a/spec/defines/munin_plugin_spec.rb
+++ b/spec/defines/munin_plugin_spec.rb
@@ -1,143 +1,139 @@
 require 'spec_helper'
 
 t_conf_dir = {}
 t_conf_dir.default = '/etc/munin'
 t_conf_dir['Solaris'] = '/opt/local/etc/munin'
 t_conf_dir['FreeBSD'] = '/usr/local/etc/munin'
 
 t_share_dir = {}
 t_share_dir.default = '/usr/share/munin'
 t_share_dir['Solaris'] = '/opt/local/share/munin'
 t_share_dir['FreeBSD'] = '/usr/local/share/munin'
 t_share_dir['Archlinux'] = '/usr/lib/munin'
 
 describe 'munin::plugin', type: 'define' do
   let(:title) { 'testplugin' }
 
   on_supported_os.each do |os, facts|
     # Avoid testing on distributions similar to RedHat and Debian
     next if os =~ %r{^(ubuntu|centos|scientific|oraclelinux)-}
 
-    # No need to test all os versions as long as os version is not
-    # used in the params class
-    next if os =~ %r{^(debian-[67]|redhat-[56]|freebsd-9)-}
-
     context "on #{os}" do
       let(:facts) do
         facts
       end
 
       conf_dir = t_conf_dir[facts[:osfamily]]
       plugin_share_dir = "#{t_share_dir[facts[:osfamily]]}/plugins"
 
       context 'with no parameters' do
         it do
           expect { is_expected.to contain_file("#{conf_dir}/plugins/testplugin") }
             .to raise_error("expected that the catalogue would contain File[#{conf_dir}/plugins/testplugin]")
         end
         it do
           is_expected.to contain_file("#{conf_dir}/plugin-conf.d/testplugin.conf")
             .with_ensure('absent')
         end
       end
 
       context 'with ensure=link parameter' do
         let(:params) { { ensure: 'link' } }
 
         it do
           is_expected.to contain_file("#{conf_dir}/plugins/testplugin")
             .with_ensure('link')
             .with_target("#{plugin_share_dir}/testplugin")
         end
         it do
           is_expected.to contain_file("#{conf_dir}/plugin-conf.d/testplugin.conf")
             .with_ensure('absent')
         end
       end
 
       context 'with ensure=link and target parameters' do
         let(:title) { 'test_foo' }
         let(:params) do
           { ensure: 'link',
             target: 'test_' }
         end
 
         it do
           is_expected.to contain_file("#{conf_dir}/plugins/test_foo")
             .with_ensure('link')
             .with_target("#{plugin_share_dir}/test_")
         end
         it do
           is_expected.to contain_file("#{conf_dir}/plugin-conf.d/test_foo.conf")
             .with_ensure('absent')
         end
       end
 
       context 'with ensure=present and source parameters' do
         let(:params) do
           { ensure: 'present',
             source: 'puppet:///modules/munin/plugins/testplugin' }
         end
 
         it do
           is_expected.to contain_file("#{conf_dir}/plugins/testplugin")
             .with_ensure('present')
             .with_source('puppet:///modules/munin/plugins/testplugin')
         end
         it do
           is_expected.to contain_file("#{conf_dir}/plugin-conf.d/testplugin.conf")
             .with_ensure('absent')
         end
       end
 
       context 'with ensure=present, source and config parameters' do
         let(:params) do
           { ensure: 'present',
             source: 'puppet:///modules/munin/plugins/testplugin',
             config: ['something wonderful'] }
         end
 
         it do
           is_expected.to contain_file("#{conf_dir}/plugins/testplugin")
             .with_ensure('present')
             .with_source('puppet:///modules/munin/plugins/testplugin')
         end
         it do
           is_expected.to contain_file("#{conf_dir}/plugin-conf.d/testplugin.conf")
             .with_ensure('present')
             .with_content(%r{something wonderful})
         end
       end
 
       context 'only configuration' do
         let(:params) do
           { config: ['env.rootdn cn=admin,dc=example,dc=org'],
             config_label: 'slapd_*' }
         end
 
         it do
           is_expected.to contain_file("#{conf_dir}/plugin-conf.d/testplugin.conf")
             .with_ensure('present')
             .with_content(%r{env.rootdn})
         end
         it do
           expect { is_expected.to contain_file("#{conf_dir}/plugins/testplugin") }
             .to raise_error("expected that the catalogue would contain File[#{conf_dir}/plugins/testplugin]")
         end
       end
 
       context 'with absolute target' do
         let(:params) do
           { ensure: 'link',
             target: '/full/path/to/testplugin' }
         end
 
         it do
           is_expected.to contain_file("#{conf_dir}/plugins/testplugin")
             .with_ensure('link')
             .with_target('/full/path/to/testplugin')
         end
       end
     end
   end
 end
diff --git a/spec/defines/regression_13_munin_plugin_config_name_spec.rb b/spec/defines/regression_13_munin_plugin_config_name_spec.rb
index 53a5092..93cbfcf 100644
--- a/spec/defines/regression_13_munin_plugin_config_name_spec.rb
+++ b/spec/defines/regression_13_munin_plugin_config_name_spec.rb
@@ -1,47 +1,43 @@
 require 'spec_helper'
 
 t_conf_dir = {}
 t_conf_dir.default = '/etc/munin'
 t_conf_dir['Solaris'] = '/opt/local/etc/munin'
 t_conf_dir['FreeBSD'] = '/usr/local/etc/munin'
 
 describe 'munin::plugin' do
   let(:title) { 'testplugin' }
 
   on_supported_os.each do |os, facts|
     # Avoid testing on distributions similar to RedHat and Debian
     next if os =~ %r{^(ubuntu|centos|scientific|oraclelinux)-}
 
-    # No need to test all os versions as long as os version is not
-    # used in the params class
-    next if os =~ %r{^(debian-[67]|redhat-[56]|freebsd-9)-}
-
     context "on #{os}" do
       let(:facts) { facts }
 
       conf_dir = t_conf_dir[facts[:osfamily]]
 
       context 'with config_label unset, label should be set to title' do
         let(:params) do
           { config: ['env.foo bar'] }
         end
 
         it do
           is_expected.to contain_file("#{conf_dir}/plugin-conf.d/testplugin.conf")
             .with_content(%r{^\[testplugin\]$})
         end
       end
 
       context 'with config_label set, label should be set to config_label' do
         let(:params) do
           { config: ['env.foo bar'], config_label: 'foo_' }
         end
 
         it do
           is_expected.to contain_file("#{conf_dir}/plugin-conf.d/testplugin.conf")
             .with_content(%r{^\[foo_\]$})
         end
       end
     end
   end
 end