diff --git a/playbooks/run-libraries-unit-tests.yaml b/playbooks/run-libraries-unit-tests.yaml
index f8fe3f1be..57edfb2c0 100644
--- a/playbooks/run-libraries-unit-tests.yaml
+++ b/playbooks/run-libraries-unit-tests.yaml
@@ -7,8 +7,9 @@
           if [ "{{ puppet_gem_version }}" != "latest" ]; then
             export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'
           fi
-          # TODO(tobias-urdin): Remove when we dont pin rspec-puppet
-          export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'
+          if [ "{{ rspec_puppet_version }}" != "latest" ]; then
+            export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'
+          fi
           # NOTE(aschultz): rspec-puppet 2.4+ has strict variables enabled
           # which causes test failures. The problem is that the puppet modules
           # have never worked with strict_variables = true due to backwards
diff --git a/playbooks/run-unit-tests.yaml b/playbooks/run-unit-tests.yaml
index 681b3e19c..f81440b22 100644
--- a/playbooks/run-unit-tests.yaml
+++ b/playbooks/run-unit-tests.yaml
@@ -6,8 +6,9 @@
           if [ "{{ puppet_gem_version }}" != "latest" ]; then
             export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'
           fi
-          # TODO(tobias-urdin): Remove when we dont pin rspec-puppet
-          export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'
+          if [ "{{ rspec_puppet_version }}" != "latest" ]; then
+            export RSPEC_PUPPET_VERSION='{{ rspec_puppet_version }}'
+          fi
           # NOTE(aschultz): rspec-puppet 2.4+ has strict variables enabled
           # which causes test failures. The problem is that the puppet modules
           # have never worked with strict_variables = true due to backwards
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 6e2676679..e240eadae 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -137,8 +137,7 @@
       - ^setup.py$
       - ^tox.ini$
     vars:
-      # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support
-      rspec_puppet_version: '~> 2.10.0'
+      rspec_puppet_version: 'latest'
 
 - job:
     name: puppet-openstack-libraries-puppet-unit-base
@@ -164,5 +163,4 @@
       - ^setup.py$
       - ^tox.ini$
     vars:
-      # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support
-      rspec_puppet_version: '~> 2.10.0'
+      rspec_puppet_version: 'latest'