diff --git a/.github/setup-webserver.sh b/.github/setup-webserver.sh
index 043d3d6d88..9f0c6e53ef 100755
--- a/.github/setup-webserver.sh
+++ b/.github/setup-webserver.sh
@@ -28,18 +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 [ "$PHP_VERSION" == '8.1' ]
+if [ ! -f $PHP_FPM_BIN ] && [ -f "/usr/bin/php-fpm" ]
 then
-	if [ -f "/usr/sbin/php-fpm8.0" ]
-	then
-		PHP_FPM_BIN="/usr/sbin/php-fpm8.0"
-	elif [ ! -f $PHP_FPM_BIN ] && [ -f "/usr/bin/php-fpm" ]
-	then
-		PHP_FPM_BIN="/usr/bin/php-fpm"
-	fi
+	PHP_FPM_BIN="/usr/bin/php-fpm"
 fi
 
-if [ ! -f $PHP_FPM_BIN ] && [ "$PHP_VERSION" != '8.1' ]
+if [ ! -f $PHP_FPM_BIN ]
 then
 	sudo apt-get install php$PHP_VERSION-fpm php$PHP_VERSION-cli \
 						php$PHP_VERSION-curl php$PHP_VERSION-xml php$PHP_VERSION-mbstring \
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index de5c8dbdb4..f7e83d8ef8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -128,8 +128,8 @@ jobs:
                       db: "mysql:8.0"
                     - php: '8.0'
                       db: "mysql:5.7"
-                    #- php: '8.1'
-                    #  db: "mysql:5.7"
+                    - php: '8.1'
+                      db: "mysql:5.7"
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}