diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 30bf38f7f1..cb33a4e841 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.1', '8.2', '8.3']
-        nextcloud-versions: ['master', 'stable30']
-        include:
+        php-versions: ['8.1', '8.2', '8.3', '8.4']
+        nextcloud-versions: ['master', 'stable31', 'stable30']
+        exclude:
           - php-versions: '8.4'
-            nextcloud-versions: 'master'
+            nextcloud-versions: 'stable30'
     name: Nextcloud ${{ matrix.nextcloud-versions }} php${{ matrix.php-versions }} unit tests
     steps:
     - name: Set up Nextcloud env
@@ -75,6 +75,10 @@ jobs:
                   nextcloud-versions: master
                   db: 'mysql'
                   cache: 'redis'
+                - php-versions: 8.2
+                  nextcloud-versions: stable31
+                  db: 'mysql'
+                  cache: 'redis'
                 - php-versions: 8.2
                   nextcloud-versions: stable30
                   db: 'mysql'