diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index df5ea06..088773e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,6 +11,7 @@ jobs:
     name: "PHPUnit: MW ${{ matrix.mw }}, PHP ${{ matrix.php }} (TYPE ${{ matrix.type }})"
 
     strategy:
+      fail-fast: false  # [TEST BRANCH] show every entry's verdict, don't matrix-mate cancel
       matrix:
         include:
           - mw: 'REL1_39'
@@ -74,7 +75,7 @@ jobs:
             mediawiki
             !mediawiki/extensions/
             !mediawiki/vendor/
-          key: mw_${{ matrix.mw }}-php${{ matrix.php }}
+          key: mw_${{ matrix.mw }}-php${{ matrix.php }}-experiment
 
       - name: Cache Composer cache
         uses: actions/cache@v4
@@ -103,12 +104,21 @@ jobs:
         run: bash EarlyCopy/.github/workflows/uploadImages.sh
 
       - if: env.TYPE != 'coverage'
-        name: Run PHPUnit w/o coverage
-        run: php tests/phpunit/phpunit.php -c extensions/BootstrapComponents/ --testsuite bootstrap-components-unit
+        name: '[TEST] Run PHPUnit (unified runner, --group mediawiki-databaseless)'
+        run: |
+          (composer phpunit:config 2>/dev/null || true)
+          vendor/bin/phpunit -c extensions/BootstrapComponents/phpunit.xml.dist \
+            --bootstrap tests/phpunit/bootstrap.php \
+            --group mediawiki-databaseless
 
       - if: env.TYPE == 'coverage'
-        name: Run PHPUnit w/ coverage
-        run: php tests/phpunit/phpunit.php -c extensions/BootstrapComponents/ --testsuite bootstrap-components-unit --coverage-clover coverage.clover
+        name: '[TEST] Run PHPUnit (unified runner, --group mediawiki-databaseless, coverage)'
+        run: |
+          (composer phpunit:config 2>/dev/null || true)
+          vendor/bin/phpunit -c extensions/BootstrapComponents/phpunit.xml.dist \
+            --bootstrap tests/phpunit/bootstrap.php \
+            --group mediawiki-databaseless \
+            --coverage-clover coverage.clover
 
       - if: env.TYPE == 'coverage'
         name: upload coverage report
diff --git a/.github/workflows/installWiki.sh b/.github/workflows/installWiki.sh
index 62b6662..0aacc9d 100644
--- a/.github/workflows/installWiki.sh
+++ b/.github/workflows/installWiki.sh
@@ -4,10 +4,9 @@ MW_BRANCH=$1
 EXTENSION_NAME=$2
 
 ## install core
-wget https://github.com/wikimedia/mediawiki/archive/${MW_BRANCH}.tar.gz -nv
-
-tar -zxf $MW_BRANCH.tar.gz
-mv mediawiki-$MW_BRANCH mediawiki
+# [TEST BRANCH] git clone instead of tarball — MW master needs
+# phpunit.xml.template which is export-ignored from the archive.
+git clone --depth 1 --branch "$MW_BRANCH" https://github.com/wikimedia/mediawiki.git mediawiki
 cd $MW_ROOT
 
 composer install