diff --git a/spec/acceptance/server_spec.rb b/spec/acceptance/server_spec.rb
index 4d6d9cf8a..5e2fc24df 100644
--- a/spec/acceptance/server_spec.rb
+++ b/spec/acceptance/server_spec.rb
@@ -19,7 +19,8 @@
         class { 'postgresql::globals':
           encoding => 'UTF-8',
           locale   => 'en_US.UTF-8',
-          manage_package_repo => true,
+          manage_package_repo => $facts[:os]['release']['major'] != '8',
+          manage_dnf_module => $facts[:os]['release']['major'] == '8',
           version => '12',
         }
         -> class { 'postgresql::server': }
diff --git a/spec/acceptance/zabbix_application_spec.rb b/spec/acceptance/zabbix_application_spec.rb
index bc4d5e024..0a2890652 100644
--- a/spec/acceptance/zabbix_application_spec.rb
+++ b/spec/acceptance/zabbix_application_spec.rb
@@ -27,7 +27,8 @@ class { 'apache':
         include apache::mod::php
         class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
-          manage_package_repo => true,
+          manage_package_repo => $facts[:os]['release']['major'] != '8',
+          manage_dnf_module => $facts[:os]['release']['major'] == '8',
           version => '12',
         }
         -> class { 'postgresql::server': }
diff --git a/spec/acceptance/zabbix_host_spec.rb b/spec/acceptance/zabbix_host_spec.rb
index bbfabb365..dc91f7c1d 100644
--- a/spec/acceptance/zabbix_host_spec.rb
+++ b/spec/acceptance/zabbix_host_spec.rb
@@ -38,7 +38,8 @@ class { 'apache':
         include apache::mod::php
         class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
-          manage_package_repo => true,
+          manage_package_repo => $facts[:os]['release']['major'] != '8',
+          manage_dnf_module => $facts[:os]['release']['major'] == '8',
           version => '12',
         }
         -> class { 'postgresql::server': }
diff --git a/spec/acceptance/zabbix_hostgroup_spec.rb b/spec/acceptance/zabbix_hostgroup_spec.rb
index 99fb43575..e9cdc57c5 100644
--- a/spec/acceptance/zabbix_hostgroup_spec.rb
+++ b/spec/acceptance/zabbix_hostgroup_spec.rb
@@ -18,7 +18,8 @@ class { 'apache':
         include apache::mod::php
         class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
-          manage_package_repo => true,
+          manage_package_repo => $facts[:os]['release']['major'] != '8',
+          manage_dnf_module => $facts[:os]['release']['major'] == '8',
           version => '12',
         }
         -> class { 'postgresql::server': }
diff --git a/spec/acceptance/zabbix_proxy_spec.rb b/spec/acceptance/zabbix_proxy_spec.rb
index b7c5da3ba..1242dfe79 100644
--- a/spec/acceptance/zabbix_proxy_spec.rb
+++ b/spec/acceptance/zabbix_proxy_spec.rb
@@ -19,7 +19,8 @@ class { 'apache':
       include apache::mod::php
       class { 'postgresql::globals':
         locale   => 'en_US.UTF-8',
-        manage_package_repo => true,
+        manage_package_repo => $facts[:os]['release']['major'] != '8',
+        manage_dnf_module => $facts[:os]['release']['major'] == '8',
         version => '12',
       }
       -> class { 'postgresql::server': }
diff --git a/spec/acceptance/zabbix_template_host_spec.rb b/spec/acceptance/zabbix_template_host_spec.rb
index 410a72778..bdcf03c0c 100644
--- a/spec/acceptance/zabbix_template_host_spec.rb
+++ b/spec/acceptance/zabbix_template_host_spec.rb
@@ -29,7 +29,8 @@ class { 'apache':
         include apache::mod::php
         class { 'postgresql::globals':
           locale   => 'en_US.UTF-8',
-          manage_package_repo => true,
+          manage_package_repo => $facts[:os]['release']['major'] != '8',
+          manage_dnf_module => $facts[:os]['release']['major'] == '8',
           version => '12',
         }
         -> class { 'postgresql::server': }
diff --git a/spec/acceptance/zabbix_template_spec.rb b/spec/acceptance/zabbix_template_spec.rb
index 2fe4c7991..2e16a43e3 100644
--- a/spec/acceptance/zabbix_template_spec.rb
+++ b/spec/acceptance/zabbix_template_spec.rb
@@ -18,7 +18,8 @@ class { 'apache':
           include apache::mod::php
           class { 'postgresql::globals':
             locale   => 'en_US.UTF-8',
-            manage_package_repo => true,
+            manage_package_repo => $facts[:os]['release']['major'] != '8',
+            manage_dnf_module => $facts[:os]['release']['major'] == '8',
             version => '12',
           }
           -> class { 'postgresql::server': }