diff --git a/phpunit.live.xml b/phpunit.live.xml
index 38a245b1..3a6edd66 100644
--- a/phpunit.live.xml
+++ b/phpunit.live.xml
@@ -1,29 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.7/phpunit.xsd"
-        bootstrap="tests/bootstrap.php">
-    <php>
-        <env name="HttpPlayback" value="live" />
-    </php>
-    <testsuites>
-        <testsuite name="PHP EWS Test Suite">
-            <directory>tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-            <exclude>
-                <directory>Type</directory>
-                <directory>Enumeration</directory>
-            </exclude>
-        </whitelist>
-        <blacklist>
-            <directory>tests</directory>
-            <directory>vendor</directory>
-            <directory>src/Type</directory>
-            <directory>src/Enumeration</directory>
-        </blacklist>
-    </filter>
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd"
+	bootstrap="tests/bootstrap.php"
+	cacheDirectory=".phpunit.cache">
+	<php>
+		<env name="HttpPlayback" value="live"/>
+	</php>
+	<testsuites>
+		<testsuite name="PHP EWS Test Suite">
+			<directory>tests/</directory>
+		</testsuite>
+	</testsuites>
+	<source>
+		<include>
+			<directory suffix=".php">src/</directory>
+		</include>
+		<exclude>
+			<directory>src/API/Type/</directory>
+			<directory>src/API/Message/</directory>
+			<directory>src/API/Enumeration/</directory>
+			<directory>src/Generator/</directory>
+			<directory>src/API/Exception/</directory>
+		</exclude>
+	</source>
 </phpunit>
diff --git a/phpunit.record.xml b/phpunit.record.xml
index 80f07f1a..0441f804 100644
--- a/phpunit.record.xml
+++ b/phpunit.record.xml
@@ -1,29 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <phpunit
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.7/phpunit.xsd"
-        bootstrap="tests/bootstrap.php">
-    <php>
-        <env name="HttpPlayback" value="record" />
-    </php>
-    <testsuites>
-        <testsuite name="PHP EWS Test Suite">
-            <directory>tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-            <exclude>
-                <directory>Type</directory>
-                <directory>Enumeration</directory>
-            </exclude>
-        </whitelist>
-        <blacklist>
-            <directory>tests</directory>
-            <directory>vendor</directory>
-            <directory>src/Type</directory>
-            <directory>src/Enumeration</directory>
-        </blacklist>
-    </filter>
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd"
+	bootstrap="tests/bootstrap.php"
+	cacheDirectory=".phpunit.cache">
+	<php>
+		<env name="HttpPlayback" value="record"/>
+	</php>
+	<testsuites>
+		<testsuite name="PHP EWS Test Suite">
+			<directory>tests/</directory>
+		</testsuite>
+	</testsuites>
+	<source>
+		<include>
+			<directory suffix=".php">src/</directory>
+		</include>
+		<exclude>
+			<directory>src/API/Type/</directory>
+			<directory>src/API/Message/</directory>
+			<directory>src/API/Enumeration/</directory>
+			<directory>src/Generator/</directory>
+			<directory>src/API/Exception/</directory>
+		</exclude>
+	</source>
 </phpunit>
diff --git a/phpunit.xml b/phpunit.xml
index aabfe42f..83800e4f 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,19 +1,27 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <phpunit
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.7/phpunit.xsd"
-	bootstrap="tests/bootstrap.php">
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd"
+	bootstrap="tests/bootstrap.php"
+	cacheDirectory=".phpunit.cache">
 	<php>
-		<env name="HttpPlayback" value="playback" />
+		<env name="HttpPlayback" value="playback"/>
 	</php>
 	<testsuites>
 		<testsuite name="PHP EWS Test Suite">
 			<directory>tests/</directory>
 		</testsuite>
 	</testsuites>
-	<filter>
-		<whitelist addUncoveredFilesFromWhitelist="true">
+	<source>
+		<include>
 			<directory>src/</directory>
-		</whitelist>
-	</filter>
+		</include>
+		<exclude>
+			<directory>src/API/Type/</directory>
+			<directory>src/API/Message/</directory>
+			<directory>src/API/Enumeration/</directory>
+			<directory>src/Generator/</directory>
+			<directory>src/API/Exception/</directory>
+		</exclude>
+	</source>
 </phpunit>