diff --git a/.travis.yml b/.travis.yml
index b97432319b353612033c845ca0dd1032ecd179ff..54e24a4d0e6cfa8b0312937bc48a1aed8dcfc2b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,11 +8,12 @@ matrix:
     - php: "7.1"
     - php: "7.2"
     - php: "7.3"
-    - php: "7.4snapshot"
+    - php: "8.0"
     - php: "nightly"
   allow_failures:
     - php: "nightly"
-    - php: "7.4snapshot"
+    - php: "7.4"
+    - php: "8.0"
 
 install:
     - composer self-update
diff --git a/composer.json b/composer.json
index ac78c0412c002961c9a6f87fe30e949974056807..583fe366fb1c19cd931132ed30faec5c701a50b9 100644
--- a/composer.json
+++ b/composer.json
@@ -40,8 +40,8 @@
     "php": "^7|^8"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6|^7",
-    "vimeo/psalm": "^1|^2|^3"
+    "phpunit/phpunit": "^6|^7|^8|^9",
+    "vimeo/psalm": "^1|^2|^3|^4"
   },
   "autoload": {
     "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a45b69237c5fe0e48ab514aa7088907044a2d4b3..4d090343e85d45f03e740ac679eba0f1363c6e72 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,23 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="true"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
->
-    <testsuites>
-        <testsuite name="Constant Time Encoding Test Suite">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
\ No newline at end of file
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="true" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Constant Time Encoding Test Suite">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>