diff --git a/plugins/templates/before-script.yml b/plugins/templates/before-script.yml
index 12680c118aae20f7e5ffe1e600abc074c1a3f65c..410aecc38352c6f40d10c004ba9ad2ecd3aa7261 100644
--- a/plugins/templates/before-script.yml
+++ b/plugins/templates/before-script.yml
@@ -4,7 +4,9 @@ before_script:
 
   # PHPUnit
   - |
-    if [[ $(php -v) =~ "PHP 7." ]]; then
+    if [[ $(php -v) =~ "PHP 8." ]]; then
+      composer global require "phpunit/phpunit=7.*"
+    elif [[ $(php -v) =~ "PHP 7." ]]; then
       composer global require "phpunit/phpunit=6.1.*"
     elif [[ $(php -v) =~ "PHP 5.6" ]]; then
       composer global require "phpunit/phpunit=5.4.*"
diff --git a/plugins/templates/matrix.yml b/plugins/templates/matrix.yml
index d237e55497440d4755e9ac0bb30285cac3fee728..d8f1e94fddeec16b2bb215f5e20582493df3fa8e 100644
--- a/plugins/templates/matrix.yml
+++ b/plugins/templates/matrix.yml
@@ -54,6 +54,24 @@ PHPunit:PHP7.3:MySQL:
     - find . -type "f" -iname "*.php" | xargs -L "1" php -l
     - phpunit
 
+PHPunit:PHP7.4:MySQL:
+  stage: test
+  image: containers.ethitter.com:443/docker/images/php:7.4
+  services:
+    - mysql:5.6
+  script:
+    - find . -type "f" -iname "*.php" | xargs -L "1" php -l
+    - phpunit
+
+PHPunit:PHP8.0:MySQL:
+  stage: test
+  image: containers.ethitter.com:443/docker/images/php:8.0
+  services:
+    - mysql:5.6
+  script:
+    - find . -type "f" -iname "*.php" | xargs -L "1" php -l
+    - phpunit
+
 PHPCS:
   stage: test
   image: containers.ethitter.com:443/docker/images/php:7.3