diff --git a/.travis.yml b/.travis.yml
index de05bc0..420255b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ import:
 env:
   global:
     - DB=PGSQL
-    - PHPUNIT_TEST=1
 
 # Using a custom jobs matrix as every DB=PGSQL and there is alternating PHPUNIT_SUITE's
 jobs:
@@ -15,23 +14,27 @@ jobs:
     - php: 7.1
       env:
         - REQUIRE_INSTALLER="4.5.x-dev"
+        - PHPCS_TEST=1
+        - PHPUNIT_TEST=1
         - PHPUNIT_SUITE="framework"
     - php: 7.2
       env:
         - REQUIRE_INSTALLER="4.6.x-dev"
+        - PHPUNIT_COVERAGE_TEST=1
         - PHPUNIT_SUITE="postgresql"
     - php: 7.3
       env:
         - REQUIRE_INSTALLER="4.7.x-dev"
-        - PHPCS_TEST=1
+        - PHPUNIT_TEST=1
         - PHPUNIT_SUITE="framework"
     - php: 7.4
       env:
         - REQUIRE_INSTALLER="4.x-dev"
-        - PHPUNIT_COVERAGE_TEST=1
+        - PHPUNIT_TEST=1
         - PHPUNIT_SUITE="postgresql"
-    - php: nightly
+    - php: 8.0
       env:
         - REQUIRE_INSTALLER="4.x-dev"
+        - PHPUNIT_TEST=1
         - PHPUNIT_SUITE="framework"
         - COMPOSER_INSTALL_ARG=--ignore-platform-reqs