diff --git a/manifests/params.pp b/manifests/params.pp
index 053d3632f7..a30974bb4d 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -97,15 +97,7 @@
         $python_package_name = pick($python_package_name, 'python-psycopg2')
       }
 
-      if $postgresql::globals::postgis_package_name {
-        $postgis_package_name = $postgresql::globals::postgis_package_name
-      } elsif $facts['os']['release']['major'] == '5' {
-        $postgis_package_name = 'postgis'
-      } elsif $postgis_version and versioncmp($postgis_version, '2') < 0 {
-        $postgis_package_name = "postgis${package_version}"
-      } else {
-        $postgis_package_name = "postgis2_${package_version}"
-      }
+      $postgis_package_name = pick($postgresql::globals::postgis_package_name, "postgis2_${package_version}")
     }
 
     'Archlinux': {
@@ -164,13 +156,8 @@
       $bindir                 = pick($bindir, "/usr/lib/postgresql/${version}/bin")
       $datadir                = pick($datadir, "/var/lib/postgresql/${version}/main")
       $confdir                = pick($confdir, "/etc/postgresql/${version}/main")
-      if pick($service_provider, $facts['service_provider']) == 'systemd' {
-        $service_reload = "systemctl reload ${service_name}"
-        $service_status = pick($service_status, "systemctl status ${service_name}")
-      } else {
-        $service_reload = "service ${service_name} reload"
-        $service_status = pick($service_status, "service ${service_name} status")
-      }
+      $service_reload         = "systemctl reload ${service_name}"
+      $service_status         = pick($service_status, "systemctl status ${service_name}")
       $psql_path              = pick($psql_path, '/usr/bin/psql')
       $postgresql_conf_mode   = pick($postgresql_conf_mode, '0644')
     }
diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb
index c9603be72a..4f8a91491c 100644
--- a/spec/spec_helper_local.rb
+++ b/spec/spec_helper_local.rb
@@ -155,7 +155,7 @@ def param(type, title, param)
 # See https://github.com/voxpupuli/voxpupuli-test/blob/master/lib/voxpupuli/test/facts.rb
 add_custom_fact :service_provider, ->(_os, facts) do
   case facts[:osfamily].downcase
-  when 'archlinux', 'debian'
+  when 'archlinux', 'debian', 'redhat', 'suse'
     'systemd'
   when 'darwin'
     'launchd'
@@ -165,10 +165,6 @@ def param(type, title, param)
     'openrc'
   when 'openbsd'
     'openbsd'
-  when 'redhat'
-    (facts[:operatingsystemrelease].to_i >= 7) ? 'systemd' : 'redhat'
-  when 'suse'
-    (facts[:operatingsystemmajrelease].to_i >= 12) ? 'systemd' : 'redhat'
   when 'windows'
     'windows'
   else