diff --git a/composer.json b/composer.json
index a58a21ff87dc5328d5b8f9e7722a74719a5c329d..6683de56d2db6b224f9840e1145a243cb114ce07 100644
--- a/composer.json
+++ b/composer.json
@@ -91,6 +91,7 @@
     "require-dev": {
         "ext-curl": "*",
         "mikey179/vfsstream": "~1.6",
+        "phpunit/phpunit": "^7.5",
         "simplesamlphp/simplesamlphp-test-framework": "^0.1.2",
         "vimeo/psalm": "~3.14"
     },
diff --git a/lib/SimpleSAML/Error/CriticalConfigurationError.php b/lib/SimpleSAML/Error/CriticalConfigurationError.php
index 7de80d47a57dfa7835477f6cda19942a867d183c..169656b1d999503726e612669ebf6c0a9f0418dd 100644
--- a/lib/SimpleSAML/Error/CriticalConfigurationError.php
+++ b/lib/SimpleSAML/Error/CriticalConfigurationError.php
@@ -69,9 +69,9 @@ class CriticalConfigurationError extends ConfigurationError
     /**
      * @param \Throwable $exception
      *
-     * @return \SimpleSAML\Error\CriticalConfigurationError
+     * @return \SimpleSAML\Error\Exception
      */
-    public static function fromException(Throwable $exception): CriticalConfigurationError
+    public static function fromException(Throwable $exception): Exception
     {
         $reason = null;
         $file = null;
diff --git a/phpunit.xml b/phpunit.xml
index 878768a43398e4abb9c03f6b07834182d45c7522..84dc59b007cf80facf83b2e8adb0688ff974ac1f 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -29,7 +29,7 @@
     </filter>
     <logging>
         <log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
-        <log type="coverage-html" target="build/coverage" title="PHP Coveralls" charset="UTF-8" yui="true" highlight="true" lowUpperBound="35" highLowerBound="70"/>
+        <log type="coverage-html" target="build/coverage" lowUpperBound="35" highLowerBound="70"/>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
     </logging>
 </phpunit>