diff --git a/ext/setup/main.php b/ext/setup/main.php
index 758deaa2..88e32009 100644
--- a/ext/setup/main.php
+++ b/ext/setup/main.php
@@ -332,7 +332,7 @@ class Setup extends Extension
                 $host .= ":" . $_SERVER["SERVER_PORT"];
             }
         }
-        $full = "//" . $host . $_SERVER["PHP_SELF"];
+        $full = "//" . $host . $_SERVER["SCRIPT_NAME"];
         $test_url = str_replace("/index.php", "/nicetest", $full);
 
         $nicescript = "<script type='text/javascript'>
diff --git a/tests/router.php b/tests/router.php
index 77a6c1be..f8b7bc38 100644
--- a/tests/router.php
+++ b/tests/router.php
@@ -28,7 +28,6 @@ elseif (preg_match('/\.(?:png|jpg|jpeg|gif|css|js|php)(\?.*)?$/', $_SERVER["REQU
 unset($matches);
 
 // all other requests (use shimmie routing based on URL)
-$_SERVER["PHP_SELF"] = '/index.php';
 $_GET['q'] = explode("?", $_SERVER["REQUEST_URI"])[0];
 error_log($_GET['q']);  // if we use a custom handler, we need to do our own access log
 require_once "index.php";