diff --git a/.github/workflows/ubuntu16_pr.yaml b/.github/workflows/ubuntu16_pr.yaml
deleted file mode 100644
index b1ccd52..0000000
--- a/.github/workflows/ubuntu16_pr.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: "Test on Ubuntu 16.04"
-
-on: [push, pull_request]
-
-jobs:
-  Acceptance:
-    runs-on: ubuntu-16.04
-
-    steps:
-      - name: Checkout Source
-        uses: actions/checkout@v2
-
-      - name: Activate Ruby 2.7
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: "2.7"
-
-      - name: Cache gems
-        uses: actions/cache@v2
-        with:
-          path: vendor/gems
-          key: ${{ runner.os }}-pr-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-pr-
-            ${{ runner.os }}-
-
-      - name: Prepare inventory file
-        run: |
-          cat <<EOF >> inventory.yaml
-          ---
-          version: 2
-          groups:
-          - name: local
-            targets:
-            - uri: litmus_localhost
-              config:
-                transport: local
-          - name: ssh_nodes
-            targets: []
-          - name: winrm_nodes
-            targets: []
-          EOF
-
-      - name: Install gems and puppet agent
-        run: |
-          bundle install
-          sudo -u root env "PATH=$PATH" bundle exec rake 'litmus:install_agent'
-
-      - name: Install module
-        run: bundle exec rake 'litmus:install_module'
-
-      - name: Run acceptance tests
-        run: sudo -u root env "PATH=$PATH" bundle exec rake 'litmus:acceptance:localhost'
diff --git a/.github/workflows/ubuntu18_pr.yaml b/.github/workflows/ubuntu18_pr.yaml
index 1d5d3ab..a83e987 100644
--- a/.github/workflows/ubuntu18_pr.yaml
+++ b/.github/workflows/ubuntu18_pr.yaml
@@ -1,53 +1,64 @@
-name: "Test on Ubuntu 18.04"
+name: "Test on Ubuntu Github Runners"
 
 on: [push, pull_request]
 
 jobs:
   Acceptance:
-    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        platform:
+          - ubuntu-16.04
+          - ubuntu-18.04
+          - ubuntu-20.04
+        collection:
+          - puppet5
+          - puppet6
+          - puppet7-nightly
+
+    runs-on: ${{ matrix.platform }}
 
     steps:
       - name: Checkout Source
         uses: actions/checkout@v2
 
       - name: Activate Ruby 2.7
         uses: actions/setup-ruby@v1
         with:
           ruby-version: "2.7"
 
       - name: Cache gems
         uses: actions/cache@v2
         with:
           path: vendor/gems
           key: ${{ runner.os }}-pr-${{ hashFiles('**/Gemfile') }}
           restore-keys: |
             ${{ runner.os }}-pr-
             ${{ runner.os }}-
 
       - name: Prepare inventory file
         run: |
           cat <<EOF >> inventory.yaml
           ---
           version: 2
           groups:
           - name: local
             targets:
             - uri: litmus_localhost
               config:
                 transport: local
           - name: ssh_nodes
             targets: []
           - name: winrm_nodes
             targets: []
           EOF
 
       - name: Install gems and puppet agent
         run: |
           bundle install
-          sudo -u root env "PATH=$PATH" bundle exec rake 'litmus:install_agent'
+          sudo -u root env "PATH=$PATH" bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
 
       - name: Install module
         run: bundle exec rake 'litmus:install_module'
 
       - name: Run acceptance tests
         run: sudo -u root env "PATH=$PATH" bundle exec rake 'litmus:acceptance:localhost'
diff --git a/.github/workflows/ubuntu20_pr.yaml b/.github/workflows/ubuntu20_pr.yaml
deleted file mode 100644
index d8d9869..0000000
--- a/.github/workflows/ubuntu20_pr.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: "Test on Ubuntu 20.04"
-
-on: [push, pull_request]
-
-jobs:
-  Acceptance:
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Checkout Source
-        uses: actions/checkout@v2
-
-      - name: Activate Ruby 2.7
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: "2.7"
-
-      - name: Cache gems
-        uses: actions/cache@v2
-        with:
-          path: vendor/gems
-          key: ${{ runner.os }}-pr-${{ hashFiles('**/Gemfile') }}
-          restore-keys: |
-            ${{ runner.os }}-pr-
-            ${{ runner.os }}-
-
-      - name: Prepare inventory file
-        run: |
-          cat <<EOF >> inventory.yaml
-          ---
-          version: 2
-          groups:
-          - name: local
-            targets:
-            - uri: litmus_localhost
-              config:
-                transport: local
-          - name: ssh_nodes
-            targets: []
-          - name: winrm_nodes
-            targets: []
-          EOF
-
-      - name: Install gems and puppet agent
-        run: |
-          bundle install
-          sudo -u root env "PATH=$PATH" bundle exec rake 'litmus:install_agent'
-
-      - name: Install module
-        run: bundle exec rake 'litmus:install_module'
-
-      - name: Run acceptance tests
-        run: sudo -u root env "PATH=$PATH" bundle exec rake 'litmus:acceptance:localhost'