diff --git a/.gitattributes b/.gitattributes
index dfe93fc4..dae62f50 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,4 +4,4 @@
 /tests              export-ignore
 /.scrutinizer.yml   export-ignore
 /.styleci.yml       export-ignore
-/phpunit.xml        export-ignore
+/phpunit.xml.dist   export-ignore
diff --git a/.gitignore b/.gitignore
index ff72e2d0..bc959c53 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /composer.lock
+/phpunit.xml
 /vendor
diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index 422eeac6..00000000
--- a/phpunit.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
->
-    <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
-        </testsuite>
-    </testsuites>
-</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 00000000..76def754
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,10 @@
+<phpunit bootstrap="tests/bootstrap.php">
+    <testsuite name="CLImate">
+        <directory suffix="Test.php">tests</directory>
+    </testsuite>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
+</phpunit>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100644
index 00000000..c2f6a0d4
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,10 @@
+<?php
+
+require __DIR__ . "/../vendor/autoload.php";
+
+set_error_handler(static function ($errno, $errstr, $errfile, $errline): bool {
+    if (!(error_reporting() & $errno)) {
+        return false;
+    }
+    throw new \ErrorException($errstr, 0, $errno, $errfile, $errline);
+}, \E_ALL);