diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index df47af08e..9b6c1736a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -11,43 +11,41 @@
          verbose="true"
          executionOrder="random"
 >
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+        <exclude>
+            <directory suffix=".php">src/Psalm/Issue/</directory>
+            <directory suffix=".php">src/Psalm/Internal/Stubs/</directory>
+            <directory suffix=".php">src/Psalm/Internal/LanguageServer/</directory>
+            <directory suffix=".php">src/Psalm/Internal/ExecutionEnvironment/</directory>
+            <directory suffix=".php">src/Psalm/SourceControl/</directory>
+            <file>src/command_functions.php</file>
+            <file>src/psalm.php</file>
+            <file>src/psalm-language-server.php</file>
+            <file>src/psalter.php</file>
+            <file>src/psalm_plugin.php</file>
+            <file>src/psalm-refactor.php</file>
+            <file>src/Psalm/Plugin/Shepherd.php</file>
+            <file>src/Psalm/Internal/CallMap.php</file>
+            <file>src/Psalm/Internal/Fork/Pool.php</file>
+            <file>src/Psalm/Internal/Fork/Restarter.php</file>
+            <file>src/Psalm/Internal/PropertyMap.php</file>
+            <file>src/Psalm/Internal/Provider/ClassLikeStorageCacheProvider.php</file>
+            <file>src/Psalm/Internal/Provider/FileReferenceCacheProvider.php</file>
+            <file>src/Psalm/Internal/Provider/FileStorageCacheProvider.php</file>
+            <file>src/Psalm/Internal/Provider/ParserCacheProvider.php</file>
+        </exclude>
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+            <html outputDirectory="build/logs/phpunit-html/"/>
+        </report>
+    </coverage>
+
     <testsuites>
         <testsuite name="psalm">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-            <exclude>
-                <directory suffix=".php">src/Psalm/Issue/</directory>
-                <directory suffix=".php">src/Psalm/Internal/Stubs/</directory>
-                <directory suffix=".php">src/Psalm/Internal/LanguageServer/</directory>
-                <directory suffix=".php">src/Psalm/Internal/ExecutionEnvironment/</directory>
-                <directory suffix=".php">src/Psalm/SourceControl/</directory>
-                <file>src/command_functions.php</file>
-                <file>src/psalm.php</file>
-                <file>src/psalm-language-server.php</file>
-                <file>src/psalter.php</file>
-                <file>src/psalm_plugin.php</file>
-                <file>src/psalm-refactor.php</file>
-                <file>src/Psalm/Plugin/Shepherd.php</file>
-                <file>src/Psalm/Internal/CallMap.php</file>
-                <file>src/Psalm/Internal/Fork/Pool.php</file>
-                <file>src/Psalm/Internal/Fork/Restarter.php</file>
-                <file>src/Psalm/Internal/PropertyMap.php</file>
-                <file>src/Psalm/Internal/Provider/ClassLikeStorageCacheProvider.php</file>
-                <file>src/Psalm/Internal/Provider/FileReferenceCacheProvider.php</file>
-                <file>src/Psalm/Internal/Provider/FileStorageCacheProvider.php</file>
-                <file>src/Psalm/Internal/Provider/ParserCacheProvider.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
-
-    <logging>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="coverage-html" target="build/logs/phpunit-html/"/>
-    </logging>
 </phpunit>
-
