diff --git a/sapi/fpm/tests/fcgi-env-pif-apache-handler-uds.phpt b/sapi/fpm/tests/fcgi-env-pif-apache-handler-uds.phpt
new file mode 100644
index 00000000000..b80fdef3ffd
--- /dev/null
+++ b/sapi/fpm/tests/fcgi-env-pif-apache-handler-uds.phpt
@@ -0,0 +1,53 @@
+--TEST--
+FPM: FastCGI env var path info fix for Apache handler using Unix Domain Socket
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+[global]
+error_log = {{FILE:LOG}}
+[unconfined]
+listen = {{ADDR:UDS}}
+pm = dynamic
+pm.max_children = 5
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+php_admin_value[cgi.fix_pathinfo] = yes
+EOT;
+
+$code = <<<EOT
+<?php
+echo \$_SERVER["SCRIPT_NAME"] . "\n";
+echo \$_SERVER["SCRIPT_FILENAME"] . "\n";
+echo \$_SERVER["PHP_SELF"];
+EOT;
+
+$tester = new FPM\Tester($cfg, $code);
+[$sourceFilePath, $scriptName] = $tester->createSourceFileAndScriptName();
+$tester->start();
+$tester->expectLogStartNotices();
+$tester
+    ->request(
+        uri: $scriptName,
+        address: '{{ADDR:UDS}}',
+        scriptFilename: "proxy:fcgi://localhost" . $sourceFilePath,
+        scriptName: $scriptName,
+    )
+    ->expectBody([$scriptName, $sourceFilePath, $scriptName]);
+$tester->terminate();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>
diff --git a/sapi/fpm/tests/fcgi-env-pif-apache-handler-basic.phpt b/sapi/fpm/tests/fcgi-env-pif-apache-handler-with-pi.phpt
similarity index 94%
rename from sapi/fpm/tests/fcgi-env-pif-apache-handler-basic.phpt
rename to sapi/fpm/tests/fcgi-env-pif-apache-handler-with-pi.phpt
index a99f373cf33..2d8433123cb 100644
--- a/sapi/fpm/tests/fcgi-env-pif-apache-handler-basic.phpt
+++ b/sapi/fpm/tests/fcgi-env-pif-apache-handler-with-pi.phpt
@@ -1,5 +1,5 @@
 --TEST--
-FPM: FastCGI env var path info fix for Apache handler basic
+FPM: FastCGI env var path info fix for Apache handler with PATH_INFO set
 --SKIPIF--
 <?php include "skipif.inc"; ?>
 --FILE--