diff --git a/test/tools/Modules/WebListener/WebListener.psm1 b/test/tools/Modules/WebListener/WebListener.psm1
index 6fe0049cde1..87a5899d300 100644
--- a/test/tools/Modules/WebListener/WebListener.psm1
+++ b/test/tools/Modules/WebListener/WebListener.psm1
@@ -141,7 +141,16 @@ function Get-WebListenerUrl {
             $Uri.Port = $runningListener.HttpsPort
             $Uri.Scheme = 'Https'
         }
-        $Uri.Path = '{0}/{1}' -f $Test, $TestValue
+
+        if ($TestValue)
+        {
+            $Uri.Path = '{0}/{1}' -f $Test, $TestValue
+        }
+        else 
+        {
+            $Uri.Path = $Test
+        }
+
         return [Uri]$Uri.ToString()
     }
 }