diff --git a/spec/classes/gnocchi_db_postgresql_spec.rb b/spec/classes/gnocchi_db_postgresql_spec.rb
index 6117e815..9bd08630 100644
--- a/spec/classes/gnocchi_db_postgresql_spec.rb
+++ b/spec/classes/gnocchi_db_postgresql_spec.rb
@@ -35,15 +35,13 @@ describe 'gnocchi::db::postgresql' do
     context "on #{os}" do
       let (:facts) do
         facts.merge(OSDefaults.get_facts({
-          :os_workers => 8,
-          :concat_basedir => '/var/lib/puppet/concat'
+          # puppet-postgresql requires the service_provider fact provided by
+          # puppetlabs-postgresql.
+          :service_provider => 'systemd'
         }))
       end
 
-      # TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9
-      unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9
-        it_configures 'gnocchi::db::postgresql'
-      end
+      it_configures 'gnocchi::db::postgresql'
     end
   end
 
diff --git a/spec/classes/gnocchi_db_spec.rb b/spec/classes/gnocchi_db_spec.rb
index 02017480..4f8a2117 100644
--- a/spec/classes/gnocchi_db_spec.rb
+++ b/spec/classes/gnocchi_db_spec.rb
@@ -103,7 +103,11 @@ describe 'gnocchi::db' do
   }).each do |os,facts|
     context "on #{os}" do
       let (:facts) do
-        facts.merge!(OSDefaults.get_facts())
+        facts.merge!(OSDefaults.get_facts({
+          # puppet-postgresql requires the service_provider fact provided by
+          # puppetlabs-postgresql.
+          :service_provider => 'systemd'
+        }))
       end
 
       let(:platform_params) do
@@ -115,10 +119,7 @@ describe 'gnocchi::db' do
         end
       end
 
-      # TODO(tkajinam): Remove this once puppet-postgresql supports CentOS 9
-      unless facts[:osfamily] == 'RedHat' and facts[:operatingsystemmajrelease].to_i >= 9
-        it_behaves_like 'gnocchi::db'
-      end
+      it_behaves_like 'gnocchi::db'
       it_behaves_like "gnocchi::db on #{facts[:osfamily]}"
     end
   end