diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0c223d0fb3..93d5fd4026 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -46,16 +46,18 @@ jobs:
 #                      db: "mysql:5.6"
 #                    - php: 7.1
 #                      db: "mysql:5.7"
-#                    - php: 7.1
-#                      db: "mysql:8.0"
 #                    - php: 7.2
 #                      db: "mysql:5.7"
 #                    - php: 7.3
 #                      db: "mysql:5.7"
 #                    - php: 7.4
 #                      db: "mysql:5.7"
+                    - php: 7.4
+                      db: "mysql:8.0"
                     - php: '8.0'
                       db: "mysql:5.7"
+                    - php: '8.1'
+                      db: "mysql:5.7"
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db }}
 
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh
index ea903ae1fe..af6fccfe53 100755
--- a/travis/setup-webserver.sh
+++ b/travis/setup-webserver.sh
@@ -28,7 +28,12 @@ NGINX_PHP_CONF="$DIR/nginx-php.conf"
 PHP_FPM_BIN="/usr/sbin/php-fpm$PHP_VERSION"
 PHP_FPM_CONF="$DIR/php-fpm.conf"
 
-if [ ! -f $PHP_FPM_BIN ]
+if [ ! -f $PHP_FPM_BIN ] && [ "$PHP_VERSION" == '8.1' ] && [ -f "/usr/bin/php-fpm" ]
+then
+	PHP_FPM_BIN="/usr/bin/php-fpm"
+fi
+
+if [ ! -f $PHP_FPM_BIN ] && [ "$PHP_VERSION" != '8.1' ]
 then
 	sudo apt-get install php$PHP_VERSION-fpm php$PHP_VERSION-cli php$PHP_VERSION-dom \
 						php$PHP_VERSION-curl php$PHP_VERSION-xml php$PHP_VERSION-mbstring \