diff --git a/.gitignore b/.gitignore
index bc62b68..0476ac7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 /.phpcs-cache
+/.phpunit.result.cache
 /clover.xml
 /coveralls-upload.json
 /phpunit.xml
 /vendor/
-/.phpunit.result.cache
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2babfc6..4efd793 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,20 +1,18 @@
 <?xml version="1.0"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         bootstrap="vendor/autoload.php" colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         verbose="true"
-         stopOnFailure="false"
-         processIsolation="false"
-         backupGlobals="false">
-    <coverage includeUncoveredFiles="true">
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         convertDeprecationsToExceptions="true">
+    <testsuites>
+        <testsuite name="laminas-developer-tools Test Suite">
+            <directory>./test</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage processUncoveredFiles="true">
         <include>
             <directory suffix=".php">./src</directory>
         </include>
     </coverage>
-    <testsuite name="Laminas\DeveloperTools tests suite">
-        <directory>./test</directory>
-    </testsuite>
 </phpunit>