diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fa93a38..6a02022 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -6,7 +6,7 @@ env:
     IMAGE_ICC: 1         # Run icc profile sniffer on your images? 1 or 0
     EPV: 0               # Run EPV (Extension Pre Validator) on your code? 1 or 0
     EXECUTABLE_FILES: 1  # Run check for executable files? 1 or 0
-    PHPBB_BRANCH: master # The phpBB branch to run tests on
+    PHPBB_BRANCH: ticket/17496 # The phpBB branch to run tests on
 
 on:
     push:
@@ -37,7 +37,7 @@ jobs:
             - name: Checkout phpBB
               uses: actions/checkout@v4
               with:
-                  repository: phpbb/phpbb
+                  repository: rxu/phpbb3
                   ref: ${{ env.PHPBB_BRANCH }}
                   path: phpBB3
 
@@ -162,7 +162,7 @@ jobs:
             - name: Checkout phpBB
               uses: actions/checkout@v4
               with:
-                  repository: phpbb/phpbb
+                  repository: rxu/phpbb3
                   ref: ${{ env.PHPBB_BRANCH }}
                   path: phpBB3
 
@@ -216,7 +216,7 @@ jobs:
               run: |
                   if [ $COVERAGE == '1' ]
                   then
-                      sed -n '1h;1!H;${;g;s/<\/php>/<\/php>\n\t<filter>\n\t\t<whitelist>\n\t\t\t<directory>..\/<\/directory>\n\t\t\t<exclude>\n\t\t\t\t<directory>..\/tests\/<\/directory>\n\t\t\t\t<directory>..\/language\/<\/directory>\n\t\t\t\t<directory>..\/migrations\/<\/directory>\n\t\t\t<\/exclude>\n\t\t<\/whitelist>\n\t<\/filter>/g;p;}' .github/phpunit-$DB-github.xml &> phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml
+                      sed -n '1h;1!H;${;g;s/<\/php>/<\/php>\n\t<coverage>\n\t\t<include>\n\t\t\t<directory>..\/<\/directory>\n\t\t<\/include>\n\t\t<exclude>\n\t\t\t<directory>..\/tests\/<\/directory>\n\t\t\t<directory>..\/language\/<\/directory>\n\t\t\t<directory>..\/migrations\/<\/directory>\n\t\t<\/exclude>\n\t<\/coverage>/g;p;}' .github/phpunit-$DB-github.xml &> phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml
                   else
                       mkdir -p phpBB/ext/$EXTNAME/.github && cp .github/phpunit* $_
                   fi
@@ -226,10 +226,11 @@ jobs:
               env:
                   DB: ${{steps.database-type.outputs.db}}
                   COVERAGE: ${{ matrix.COVERAGE != 1 && '0' || '1' }}
+                  PHP_VERSION: ${{ matrix.php }}
               run: |
-                  if [ $COVERAGE == '1' ]
+                  if [ $COVERAGE = '1' ]
                   then
-                      phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml --bootstrap ./tests/bootstrap.php --coverage-clover build/logs/clover.xml
+                      phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml --bootstrap ./tests/bootstrap.php --coverage-clover build/logs/clover.xml --testsuite 'phpBB Test Suite'
                   else
                       phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml --bootstrap ./tests/bootstrap.php
                   fi
@@ -303,7 +304,7 @@ jobs:
             - name: Checkout phpBB
               uses: actions/checkout@v4
               with:
-                  repository: phpbb/phpbb
+                  repository: rxu/phpbb3
                   ref: ${{ env.PHPBB_BRANCH }}
                   path: phpBB3
 
@@ -348,7 +349,9 @@ jobs:
             - name: Run unit tests
               env:
                   DB: ${{steps.database-type.outputs.db}}
-              run: phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml --bootstrap ./tests/bootstrap.php
+                  PHP_VERSION: ${{ matrix.php }}
+              run: |
+                      phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml --bootstrap ./tests/bootstrap.php
               working-directory: ./phpBB3
     # END PostgreSQL Job
 
@@ -360,9 +363,6 @@ jobs:
                 include:
                     - php: '8.1'
                       db: "sqlite3"
-                    - php: '8.1'
-                      db: "mcr.microsoft.com/mssql/server:2017-latest"
-                      db_alias: 'MSSQL 2017'
                     - php: '8.1'
                       db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
                       db_alias: 'MSSQL 2019'
@@ -374,7 +374,7 @@ jobs:
 
         services:
             mssql:
-                image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
+                image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' || matrix.db }}
                 env:
                     SA_PASSWORD: "Pssw0rd_12"
                     ACCEPT_EULA: "y"
@@ -401,7 +401,7 @@ jobs:
             - name: Checkout phpBB
               uses: actions/checkout@v4
               with:
-                  repository: phpbb/phpbb
+                  repository: rxu/phpbb3
                   ref: ${{ env.PHPBB_BRANCH }}
                   path: phpBB3
 
@@ -414,7 +414,7 @@ jobs:
               env:
                   MATRIX_DB: ${{ matrix.db }}
               run: |
-                  if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ]
+                  if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ]
                   then
                       db='mssql'
                   else