diff --git a/Rakefile b/Rakefile
index f3a7386..d316bb5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,4 +15,5 @@ begin
     config.future_release = "v#{Gem::Specification.load("#{config.project}.gemspec").version}"
   end
 rescue LoadError
+  # Optional gem, release group is probably disabled
 end
diff --git a/lib/voxpupuli/test/facts.rb b/lib/voxpupuli/test/facts.rb
index c09bcba..c78906d 100644
--- a/lib/voxpupuli/test/facts.rb
+++ b/lib/voxpupuli/test/facts.rb
@@ -73,20 +73,16 @@ def add_stdlib_facts
   add_custom_fact :service_provider, ->(_os, facts) do
     os = RSpec.configuration.facterdb_string_keys ? facts['os'] : facts[:os]
     case os['family'].downcase
-    when 'archlinux'
+    when 'archlinux', 'debian', 'redhat'
       'systemd'
     when 'darwin'
       'launchd'
-    when 'debian'
-      'systemd'
     when 'freebsd'
       'freebsd'
     when 'gentoo'
       'openrc'
     when 'openbsd'
       'openbsd'
-    when 'redhat'
-      'systemd'
     when 'suse'
       os['release']['major'].to_i >= 12 ? 'systemd' : 'redhat'
     when 'windows'