diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
index b9ad69b..0380ad2 100644
--- a/.github/workflows/lint-and-test.yml
+++ b/.github/workflows/lint-and-test.yml
@@ -117,7 +117,7 @@ jobs:
         # See https://make.wordpress.org/core/handbook/references/phpunit-compatibility-and-wordpress-versions/
         - name: Update PHPUnit
           run: |
-            if [[ $PHP_VERSION == "8.0" || $PHP_VERSION == "8.1" || $PHP_VERSION == "8.2" ]]; then
+            if [[ $PHP_VERSION == "8.2" || $PHP_VERSION == "8.3" || $PHP_VERSION == "8.4" ]]; then
               echo "Installing latest version of PHPUnit"
               composer update --ignore-platform-reqs --no-interaction --no-scripts yoast/phpunit-polyfills --with-dependencies --with "phpunit/phpunit:^9.6"
             fi
@@ -133,8 +133,8 @@ jobs:
 
         - name: Run tests with coverage
           run: |
-            composer test -- --coverage-clover coverage.xml
-            composer test:multisite -- --coverage-clover coverage-multisite.xml
+            composer test -- --coverage-clover artifacts/coverage.xml
+            composer test:multisite -- --coverage-clover artifacts/coverage-multisite.xml
           if: ${{ matrix.coverage }}
 
         - name: Upload code coverage report
@@ -148,7 +148,7 @@ jobs:
         - name: Upload code coverage report
           uses: codecov/codecov-action@v5.4.0
           with:
-            files: coverage-multisite.xml
+            files: artifacts/coverage-multisite.xml
             flags: multisite
             token: ${{ secrets.CODECOV_TOKEN }}
           if: ${{ matrix.coverage }}
diff --git a/phpunit-multisite.xml.dist b/phpunit-multisite.xml.dist
index 807c941..7190335 100644
--- a/phpunit-multisite.xml.dist
+++ b/phpunit-multisite.xml.dist
@@ -1,36 +1,33 @@
+<?xml version="1.0"?>
 <phpunit
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		bootstrap="tests/phpunit/bootstrap.php"
-		backupGlobals="false"
-		colors="true"
-		failOnRisky="true"
-		convertErrorsToExceptions="true"
-		convertNoticesToExceptions="true"
-		convertWarningsToExceptions="true"
-		xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.2/phpunit.xsd"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
+	bootstrap="tests/phpunit/bootstrap.php"
+	cacheDirectory=".phpunit.cache"
+	backupGlobals="false"
+	colors="true"
+	failOnRisky="true"
+	requireCoverageMetadata="false"
 >
 	<php>
-		<ini name="error_reporting" value="32767" />
-		<ini name="display_errors" value="1" />
-		<ini name="display_startup_errors" value="1" />
+		<ini name="error_reporting" value="32767"/>
+		<ini name="display_errors" value="1"/>
+		<ini name="display_startup_errors" value="1"/>
 		<const name="WP_TESTS_MULTISITE" value="1" />
 	</php>
-
 	<testsuites>
 		<testsuite name="Multisite Integration Test Suite">
 			<directory suffix=".php">./tests/phpunit/tests</directory>
 		</testsuite>
 	</testsuites>
-
 	<groups>
 		<exclude>
 			<group>ms-excluded</group>
 		</exclude>
 	</groups>
-
-	<filter>
-		<whitelist processUncoveredFilesFromWhitelist="false">
-			<directory suffix=".php">./inc/</directory>
-		</whitelist>
-	</filter>
+	<source>
+		<include>
+			<directory suffix=".php">./src/</directory>
+		</include>
+	</source>
 </phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 69d5838..d49b5fa 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,5 +1,14 @@
 <?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/phpunit/bootstrap.php" backupGlobals="false" colors="true" failOnRisky="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+<phpunit
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
+	bootstrap="tests/phpunit/bootstrap.php"
+	cacheDirectory=".phpunit.cache"
+	backupGlobals="false"
+	colors="true"
+	failOnRisky="true"
+	requireCoverageMetadata="false"
+>
   <php>
     <ini name="error_reporting" value="32767"/>
     <ini name="display_errors" value="1"/>