diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
deleted file mode 100644
index f747b71..0000000
--- a/.github/workflows/linux.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-name: linux
-
-on:
-  push:
-    branches:
-      - '*'
-    tags-ignore:
-      - '*'
-  pull_request:
-
-jobs:
-  perl:
-    env:
-      # some plugins still needs this to run their tests...
-      PERL_USE_UNSAFE_INC: 0
-      AUTHOR_TESTING: 1
-      AUTOMATED_TESTING: 1
-      RELEASE_TESTING: 1
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        perl-version:
-          - '5.30'
-          - '5.28'
-          - '5.26'
-          - '5.24'
-          - '5.22'
-          - '5.20'
-          - '5.18'
-          - '5.16'
-          - '5.14'
-          - '5.12'
-          - '5.10'
-
-    container:
-      image: cpanelos/tester-perl:v${{ matrix.perl-version }}
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: perl -V
-        run: perl -V
-      - name: Build.PL
-        run: perl Build.PL
-      - name: ./Build
-        run: ./Build
-      - name: ./Build test
-        run: ./Build test
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
deleted file mode 100644
index 9af65b5..0000000
--- a/.github/workflows/macos.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-name: macos
-
-on:
-  push:
-    branches:
-      - '*'
-    tags-ignore:
-      - '*'
-  pull_request:
-
-jobs:
-  perl:
-    env:
-      PERL_USE_UNSAFE_INC: 0
-      AUTHOR_TESTING: 1
-      AUTOMATED_TESTING: 1
-      RELEASE_TESTING: 1
-
-    runs-on: macOS-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        perl-version: [latest]
-
-    steps:
-      - uses: actions/checkout@v1
-      - name: perl -V
-        run: perl -V
-      - name: install cpm + deps
-        run: curl -sL https://git.io/cpm | perl - install -g --show-build-log-on-failure Module::Build      
-      - name: Build.PL
-        run: perl Build.PL
-      - name: ./Build installdeps
-        run: ./Build installdeps
-      - name: ./Build test
-        run: ./Build test
diff --git a/.github/workflows/testsuite.yml b/.github/workflows/testsuite.yml
new file mode 100644
index 0000000..4fb33f3
--- /dev/null
+++ b/.github/workflows/testsuite.yml
@@ -0,0 +1,80 @@
+name: testsuite
+
+on:
+  push:
+    branches:
+      - '*'
+    tags-ignore:
+      - '*'
+  pull_request:
+
+jobs:
+
+  # a cheap and easy job to avoid checking all Perl versions
+  ubuntu:
+    env:
+      PERL_USE_UNSAFE_INC: 0
+      AUTHOR_TESTING: 1
+      AUTOMATED_TESTING: 1
+      RELEASE_TESTING: 1
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - run: perl -V
+      - name: install dependencies
+        uses: perl-actions/install-with-cpm@v1.8
+        with:
+          install: |
+            Carp
+            Module::Build
+            Scalar::Util
+            SUPER
+            Test::More
+            Test::Warnings
+      - run: perl Build.PL
+      - run: ./Build
+      - run: ./Build test
+
+  perl:
+    env:
+      # some plugins still needs this to run their tests...
+      PERL_USE_UNSAFE_INC: 0
+      AUTHOR_TESTING: 1
+      AUTOMATED_TESTING: 1
+      RELEASE_TESTING: 1
+
+    runs-on: ubuntu-latest
+
+    needs: [ubuntu]
+
+    strategy:
+      fail-fast: false
+      matrix:
+        perl-version:
+          - '5.38'
+          - '5.36'
+          - '5.34'
+          - '5.32'
+          - '5.30'
+          - '5.28'
+          - '5.26'
+          - '5.24'
+          - '5.22'
+          - '5.20'
+          - '5.18'
+          - '5.16'
+          - '5.14'
+          - '5.12'
+          - '5.10'
+
+    container:
+      image: perldocker/perl-tester:${{ matrix.perl-version }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - run: perl -V
+      - run: perl Build.PL
+      - run: ./Build
+      - run: ./Build test
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
deleted file mode 100644
index 5622f13..0000000
--- a/.github/workflows/windows.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-name: windows
-
-on:
-  push:
-    branches:
-      - '*'
-    tags-ignore:
-      - '*'
-  pull_request:
-
-jobs:
-  perl:
-    env:
-      PERL_USE_UNSAFE_INC: 0
-      AUTHOR_TESTING: 0
-      AUTOMATED_TESTING: 1
-      RELEASE_TESTING: 0
-
-    runs-on: windows-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        perl-version: [latest]
-
-    steps:
-      - uses: actions/checkout@master
-      - name: Set up Perl
-        run: |
-          choco install strawberryperl
-          echo "C:\strawberry\c\bin;C:\strawberry\perl\site\bin;C:\strawberry\perl\bin" >> $GITHUB_PATH
-      - name: perl -V
-        run: perl -V
-      - name: install deps using cpanm
-        uses: perl-actions/install-with-cpanm@v1.1
-        with:
-          install: |
-            SUPER
-      - name: Build.PL
-        run: perl Build.PL
-      - name: ./Build test
-        run: ./Build test