Index: branches/5.2.x/tools/build/inc/phpunit.xml
===================================================================
diff -u -r16761 -r16822
--- branches/5.2.x/tools/build/inc/phpunit.xml	(.../phpunit.xml)	(revision 16761)
+++ branches/5.2.x/tools/build/inc/phpunit.xml	(.../phpunit.xml)	(revision 16822)
@@ -1,46 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit colors="true"
 	bootstrap="../../../core/kernel/tests/bootstrap.php"
+	cacheDirectory="../../../system/cache/phpunit"
+	cacheResultFile="../../../system/cache/.phpunit.result.cache"
 	beStrictAboutOutputDuringTests="true"
 	verbose="true">
 
+	<!--
+	 - cacheDirectory - for PHPUnit 10+
+	 - cacheResultFile - for PHPUnit 9
+	-->
+
 	<php>
 		<ini name="memory_limit" value="-1"/>
 	</php>
 
 	<testsuites>
-		<testsuite name="all">
-			<directory>../../../core/tests</directory>
-			<directory>../../../modules/*/tests</directory>
-			<exclude>../../../core/tests/unit</exclude>
+		<testsuite name="Unit">
+			<directory>../../../core/tests/Unit</directory>
+			<directory>../../../modules/*/tests/Unit</directory>
 		</testsuite>
-		<testsuite name="custom">
-			<directory>../../../modules/custom/tests</directory>
+		<testsuite name="Functional">
+			<directory>../../../core/tests/Functional</directory>
+			<directory>../../../modules/*/tests/Functional</directory>
 		</testsuite>
 	</testsuites>
 
-	<logging>
-		<!--<log type="coverage-html" target="../../../build/coverage" title="BankAccount"
-			 charset="UTF-8" yui="true" highlight="true"
-			 lowUpperBound="35" highLowerBound="70"/>
-		<log type="coverage-clover" target="../../../build/logs/clover.xml"/>-->
-		<log type="junit" target="../../../build/logs/junit.xml"/>
-		<!--<log type="junit" target="../../../build/logs/junit.xml" logIncompleteSkipped="false"/>-->
-	</logging>
-
 	<filter>
 		<!--<blacklist>
 			<directory suffix=".php">..</directory>
 		</blacklist>-->
-		<whitelist addUncoveredFilesFromWhitelist="true">
-			<directory suffix=".php">../../..</directory>
+		<whitelist addUncoveredFilesFromWhitelist="false">
+			<directory suffix=".php">../../../core/*</directory>
+			<directory suffix=".php">../../../modules/*</directory>
 			<exclude>
-				<directory>../../../blog</directory>
 				<directory>../../../modules/mpdf</directory>
 				<directory>../../../core/editor</directory>
 				<directory>../../../core/ckeditor</directory>
-				<directory>../../../system</directory>
-				<directory>../../../vendor</directory>
 
 				<directory>../../../core/tests</directory>
 				<directory>../../../modules/*/tests</directory>