diff --git a/src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs b/src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs
index 7c12388af9..55d827507f 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Common/RetryHelper.cs
@@ -36,7 +36,7 @@ namespace Microsoft.AspNetCore.Server.Testing
                 try
                 {
                     logger.LogWarning("Retry count {retryCount}..", retry + 1);
-                    var response = await retryBlock();
+                    var response = await retryBlock().ConfigureAwait(false);
 
                     if (response.StatusCode == HttpStatusCode.ServiceUnavailable)
                     {
diff --git a/src/Microsoft.AspNetCore.Server.Testing/Deployers/NginxDeployer.cs b/src/Microsoft.AspNetCore.Server.Testing/Deployers/NginxDeployer.cs
index aa7070ff9b..1f684cb0ca 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/Deployers/NginxDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.Testing/Deployers/NginxDeployer.cs
@@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Server.Testing
                 var response = RetryHelper.RetryRequest(() =>
                 {
                     return httpClient.GetAsync(redirectUri);
-                }, Logger).Result;
+                }, Logger, exitToken).Result;
 
                 if (!response.IsSuccessStatusCode)
                 {
@@ -68,6 +68,8 @@ namespace Microsoft.AspNetCore.Server.Testing
             // copy nginx.conf template and replace pertinent information
             DeploymentParameters.ServerConfigTemplateContent = DeploymentParameters.ServerConfigTemplateContent
                 .Replace("[user]", Environment.GetEnvironmentVariable("LOGNAME"))
+                .Replace("[errorlog]", Path.Combine(DeploymentParameters.ApplicationPath, "nginx.error.log"))
+                .Replace("[accesslog]", Path.Combine(DeploymentParameters.ApplicationPath, "nginx.access.log"))
                 .Replace("[listenPort]", originalUri.Port.ToString())
                 .Replace("[redirectUri]", redirectUri)
                 .Replace("[pidFile]", Path.Combine(DeploymentParameters.ApplicationPath, Guid.NewGuid().ToString()));