diff --git a/.travis.yml b/.travis.yml
index a8a11dcb..b5c23a2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,11 +19,9 @@ jobs:
    - php: 7.2
    - php: 7.3
    - php: 7.4
-   - php: nightly
+   - php: 8.0
      install: travis_retry composer config platform.php 7.4.0 && composer install
   fast_finish: true
-  allow_failures:
-   - php: nightly # PHP 8 is still in beta
 
 services:
   - memcached
diff --git a/composer.json b/composer.json
index 183f9f24..fef6ae6d 100644
--- a/composer.json
+++ b/composer.json
@@ -40,7 +40,7 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5 || ^6.5 || ^5.7 || ^4.8",
+        "phpunit/phpunit": "^9.5 || ^8.5 || ^7.5 || ^6.5 || ^5.7 || ^4.8",
         "smarty/smarty-lexer": "^3.1"
     }
 }