diff --git a/composer.json b/composer.json
index a4d3a15..ca1608d 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,7 @@
             "@docs"
         ],
         "format": "./vendor/bin/php-cs-fixer fix",
-        "test": "./vendor/bin/phpunit tests",
+        "test": "./vendor/bin/phpunit",
         "phpmd": "./vendor/bin/phpmd ./src text cleancode,codesize,controversial,design,naming,unusedcode",
         "phpcs": "./vendor/bin/phpcs --standard=PSR2 src/",
         "docs": "apigen generate src --destination docs"
diff --git a/phpunit.xml b/phpunit.xml
index 11cbc62..738f672 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="true" backupStaticAttributes="false" colors="false" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="true" colors="false" processIsolation="false" stopOnFailure="false" bootstrap="./vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <coverage includeUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">./src</directory>
-    </include>
     <report>
       <html outputDirectory="tests/coverage" lowUpperBound="35" highLowerBound="70"/>
     </report>
   </coverage>
   <testsuites>
     <testsuite name="Test Suite">
-      <directory suffix=".php">./tests/</directory>
+      <directory>./tests/</directory>
+      <exclude>./tests/BaseTest.php</exclude>
     </testsuite>
   </testsuites>
   <groups>
@@ -19,4 +17,9 @@
     </exclude>
   </groups>
   <logging/>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/phpunit.xml.bak b/phpunit.xml.bak
deleted file mode 100644
index 39855f0..0000000
--- a/phpunit.xml.bak
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-    backupStaticAttributes="false"
-    colors="false"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    bootstrap="tests/bootstrap.php"
->
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory suffix=".php">./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <groups>
-        <exclude>
-            <group>ignore</group>
-        </exclude>
-    </groups>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-html" target="tests/coverage" lowUpperBound="35" highLowerBound="70"/>
-    </logging>
-</phpunit>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index e38f3d2..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-// Require composer dependencies
-require dirname(__DIR__) . '/vendor/autoload.php';
