diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 8201f6f00..4f30a06bf 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -137,9 +137,8 @@
       - ^setup.cfg$
       - ^setup.py$
       - ^tox.ini$
-    # TODO(tobias-urdin): Remove when we use rspec-puppet 2.7.1
     vars:
-      rspec_puppet_version: '~> 2.3.0'
+      rspec_puppet_version: '~> 2.8.0'
 
 - job:
     name: puppet-openstack-libraries-puppet-unit-base
@@ -164,6 +163,5 @@
       - ^setup.cfg$
       - ^setup.py$
       - ^tox.ini$
-    # TODO(tobias-urdin): Remove when we use rspec-puppet 2.7.1
     vars:
-      rspec_puppet_version: '~> 2.3.0'
+      rspec_puppet_version: '~> 2.8.0'
diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml
index 0b4bc3113..b0018a520 100644
--- a/zuul.d/libraries.yaml
+++ b/zuul.d/libraries.yaml
@@ -21,7 +21,7 @@
     nodeset: ubuntu-focal
     vars:
       puppet_gem_version: 6.21.1
-      rspec_puppet_version: '= 2.8.0'
+      rspec_puppet_version: '= 2.9.0'
 
 - job:
     name: puppet-openstack-libraries-puppet-unit-7.10-ubuntu-focal
@@ -29,7 +29,7 @@
     nodeset: ubuntu-focal
     vars:
       puppet_gem_version: 7.10.0
-      rspec_puppet_version: '= 2.8.0'
+      rspec_puppet_version: '= 2.9.0'
 
 - job:
     name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-focal
@@ -38,4 +38,4 @@
     voting: false
     vars:
       puppet_gem_version: latest
-      rspec_puppet_version: '= 2.8.0'
+      rspec_puppet_version: '= 2.9.0'
diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml
index be187ba7f..dcc82a181 100644
--- a/zuul.d/unit.yaml
+++ b/zuul.d/unit.yaml
@@ -21,7 +21,7 @@
     nodeset: ubuntu-focal
     vars:
       puppet_gem_version: 6.21.1
-      rspec_puppet_version: '= 2.8.0'
+      rspec_puppet_version: '= 2.9.0'
 
 - job:
     name: puppet-openstack-unit-7.10-ubuntu-focal
@@ -29,7 +29,7 @@
     nodeset: ubuntu-focal
     vars:
       puppet_gem_version: 7.10.0
-      rspec_puppet_version: '= 2.8.0'
+      rspec_puppet_version: '= 2.9.0'
 
 - job:
     name: puppet-openstack-unit-latest-ubuntu-focal
@@ -38,7 +38,7 @@
     voting: false
     vars:
       puppet_gem_version: latest
-      rspec_puppet_version: '= 2.8.0'
+      rspec_puppet_version: '= 2.9.0'
 
 - project-template:
     name: puppet-openstack-module-unit-jobs