diff --git a/test/integration/default/controls/config.rb b/test/integration/default/controls/config.rb
index 70f3c4c..57bc190 100644
--- a/test/integration/default/controls/config.rb
+++ b/test/integration/default/controls/config.rb
@@ -4,11 +4,11 @@
 
 config = '/etc/collectd/collectd.conf'
 
-# Override by OS
-case os[:name]
-when 'redhat', 'fedora', 'centos', 'opensuse', 'oracle'
+# Override by platform
+case platform[:family]
+when 'redhat', 'fedora', 'suse'
   config = '/etc/collectd.conf'
-when 'freebsd'
+when 'bsd'
   config = '/usr/local/etc/collectd.conf'
 end
 
diff --git a/test/integration/default/controls/install.rb b/test/integration/default/controls/install.rb
index 2d9ea6c..10d0d7b 100644
--- a/test/integration/default/controls/install.rb
+++ b/test/integration/default/controls/install.rb
@@ -4,11 +4,11 @@
 
 pkg = 'collectd-core'
 
-# Override by OS
-case os[:name]
-when 'redhat', 'centos', 'fedora', 'opensuse', 'oracle'
+# Override by platform
+case platform[:family]
+when 'redhat', 'fedora', 'suse'
   pkg = 'collectd'
-when 'freebsd'
+when 'bsd'
   pkg = 'collectd5'
 end
 
diff --git a/test/integration/default/controls/service.rb b/test/integration/default/controls/service.rb
index 5c4aeca..3e7e1df 100644
--- a/test/integration/default/controls/service.rb
+++ b/test/integration/default/controls/service.rb
@@ -4,6 +4,7 @@
   title 'should be running and enabled'
 
   describe service('collectd') do
+    it { should be_installed }
     it { should be_enabled }
     it { should be_running }
   end