diff --git a/.travis.yml b/.travis.yml
index a6be575..3771ed4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,12 +5,24 @@ sudo: false
 php:
   - 7.1
   - 7.2
+  - 7.3
+  - 7.4snapshot
   - nightly
 
 env:
   - PHPUNIT=7.*
+  - PHPUNIT=8.*
   - PHPUNIT=dev-master MIN_STABILITY=dev
 
+matrix:
+  exclude:
+  - php: 7.1
+    env: PHPUNIT=8.*
+  - php: 7.1
+    env: PHPUNIT=dev-master MIN_STABILITY=dev
+  allow_failures:
+  - php: nightly
+
 cache:
   directories:
     - $HOME/.composer
diff --git a/composer.json b/composer.json
index b7bdfcb..ee71d33 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": ">=7.1",
-        "phpunit/phpunit": "^7.0"
+        "phpunit/phpunit": "^7.0 || ^8.0"
     },
     "autoload": {
         "psr-4": {