diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4b7bf1b..8aaaa07 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,17 +13,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - ruby: "2.5"
+        ruby:
+          - "3.1"
+          - "3.0"
+          - "2.7"
+          - "2.6"
+          - "2.5"
+        puppet:
+          - "~> 7.0"
+          - "~> 6.29"
+        exclude:
           - ruby: "2.6"
-          - ruby: "2.7"
-          - ruby: "3.0"
+            puppet: "~> 7.0"
+          - ruby: "2.5"
+            puppet: "~> 7.0"
+
           - ruby: "3.1"
-            coverage: "yes"
+            puppet: "~> 6.29"
+          - ruby: "3.0"
+            puppet: "~> 6.29"
+
+    name: "Ruby ${{ matrix.ruby }} - Puppet ${{ matrix.puppet }}"
     env:
-      COVERAGE: ${{ matrix.coverage }}
+      PUPPET_VERSION: ${{ matrix.puppet }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
diff --git a/Gemfile b/Gemfile
index 48fd79d..3acd3ba 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,3 +10,7 @@ group :coverage, optional: ENV['COVERAGE']!='yes' do
   gem 'simplecov-console', :require => false
   gem 'codecov', :require => false
 end
+
+# Override gemspec for CI matrix builds.
+puppetversion = ENV['PUPPET_VERSION'] || '>= 6.29'
+gem 'puppet', puppetversion, :require => false