diff --git a/.github/workflows/ci-tests.yaml b/.github/workflows/ci-tests.yaml
index 38b7e4d..1cfbb85 100644
--- a/.github/workflows/ci-tests.yaml
+++ b/.github/workflows/ci-tests.yaml
@@ -7,11 +7,11 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         perl:
-          - '5.16'
           - '5.20'
           - '5.26'
           - '5.30'
           - '5.34'
+          - '5.36'
           - '5.38'
           - '5.40'
           - latest
@@ -30,7 +30,11 @@ jobs:
         run: perl -V
       - name: Set up perl
         run: |
-          cpanm --with-feature=ci --installdeps --notest .
+          if [ "${{ matrix.perl }}" = "latest" ] && [ "${{ matrix.os }}" != "macos-latest" ]; then
+            cpanm --with-feature=ci --installdeps --notest .
+          else
+            cpanm --installdeps --notest .
+          fi
       - name: Run tests
         if: matrix.perl != 'latest' || matrix.os == 'macos-latest'
         run: |
diff --git a/.github/workflows/perltidy.yml b/.github/workflows/perltidy.yml
index e1647ee..f736169 100644
--- a/.github/workflows/perltidy.yml
+++ b/.github/workflows/perltidy.yml
@@ -10,7 +10,7 @@ jobs:
   perltidy:
     runs-on: ubuntu-latest
     container:
-      image: perl:5.32
+      image: perl:5.40
     steps:
       - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5  # v4
       - name: perl -V