diff --git a/spec/classes/munin_master_spec.rb b/spec/classes/munin_master_spec.rb
index 0643d1e..0d6cea1 100644
--- a/spec/classes/munin_master_spec.rb
+++ b/spec/classes/munin_master_spec.rb
@@ -1,184 +1,189 @@
 require 'spec_helper'
 
 _conf_dir = {}
 _conf_dir.default = '/etc/munin'
 _conf_dir['Solaris'] = '/opt/local/etc/munin'
 _conf_dir['FreeBSD'] = '/usr/local/etc/munin'
 
+_package = {}
+_package.default = 'munin'
+_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 =~ /^(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 =~ /^(debian-[67]|redhat-[56]|freebsd-9)-/
 
     context "on #{os}" do
       let(:facts) do
         facts
       end
 
       conf_dir = _conf_dir[facts[:osfamily]]
+      package = _package[facts[:osfamily]]
 
       it { should compile.with_all_deps }
 
-      it { should contain_package('munin') }
+      it { should contain_package(package) }
 
       context 'with default params' do
         it do
           should contain_file("#{conf_dir}/munin.conf")
                   .with_content(/graph_strategy\s+cgi/)
                   .with_content(/html_strategy\s+cgi/)
         end
 
         it do
           should contain_file("#{conf_dir}/munin-conf.d")
                   .with_ensure('directory')
         end
       end
 
       context 'with html_strategy => cron' do
         let (:params) { { :html_strategy => 'cron' } }
         it { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/munin.conf")
                   .with_content(/html_strategy\s+cron/)
         end
       end
 
       context 'with graph_strategy => cron' do
         let (:params) { { :graph_strategy => 'cron' } }
         it { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/munin.conf")
                   .with_content(/graph_strategy\s+cron/)
         end
       end
 
       context 'with dbdir => /var/lib/munin' do
         let (:params) { { :dbdir => '/var/lib/munin' } }
         it { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/munin.conf")
                   .with_content(/dbdir\s+\/var\/lib\/munin/)
         end
       end
 
       context 'with htmldir => /var/www/munin' do
         let (:params) { { :htmldir => '/var/www/munin' } }
         it { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/munin.conf")
                   .with_content(/htmldir\s+\/var\/www\/munin/)
         end
       end
 
       context 'with logdir => /var/log/munin' do
         let (:params) { { :dbdir => '/var/log/munin' } }
         it { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/munin.conf")
                   .with_content(/dbdir\s+\/var\/log\/munin/)
         end
       end
 
       context 'with rundir => /var/run/munin' do
         let (:params) { { :dbdir => '/var/run/munin' } }
         it { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/munin.conf")
                   .with_content(/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 { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/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
       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 { should compile.with_all_deps }
         it { should contain_munin__master__node_definition('node-a') }
         it { should 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 { should compile.with_all_deps }
         it do
           should contain_file("#{conf_dir}/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 { 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 { should raise_error(Puppet::Error, /valid domain name/) }
           else
             it { should compile.with_all_deps }
           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 { should raise_error(Puppet::Error, /validate_re/) }
           else
             it { should compile.with_all_deps }
           end
         end
       end
 
     end
   end
 
 end