diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs
index 1030823b3a..f677632485 100644
--- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISDeployer.cs
@@ -345,14 +345,18 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting.IIS
                 .RequiredElement("applicationPools")
                 .RequiredElement("add");
 
-            var environmentVariables = pool
-                .GetOrAdd("environmentVariables");
-
-            foreach (var tuple in DeploymentParameters.EnvironmentVariables)
+            if (DeploymentParameters.EnvironmentVariables.Any())
             {
-                environmentVariables
-                    .GetOrAdd("add", "name", tuple.Key)
-                    .SetAttributeValue("value", tuple.Value);
+                var environmentVariables = pool
+                    .GetOrAdd("environmentVariables");
+
+                foreach (var tuple in DeploymentParameters.EnvironmentVariables)
+                {
+                    environmentVariables
+                        .GetOrAdd("add", "name", tuple.Key)
+                        .SetAttributeValue("value", tuple.Value);
+                }
+
             }
 
             RunServerConfigActions(config, contentRoot);
diff --git a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs
index 14b78a0d6e..79919e5753 100644
--- a/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs
+++ b/test/Common.FunctionalTests/Utilities/FunctionalTestsBase.cs
@@ -22,7 +22,8 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
 
         protected ApplicationDeployer CreateDeployer(IISDeploymentParameters parameters)
         {
-            if (!parameters.EnvironmentVariables.ContainsKey(DebugEnvironmentVariable))
+            if (parameters.ServerType == ServerType.IISExpress &&
+                !parameters.EnvironmentVariables.ContainsKey(DebugEnvironmentVariable))
             {
                 parameters.EnvironmentVariables[DebugEnvironmentVariable] = "console";
             }