diff --git a/test/IISExpress.FunctionalTests/InProcess/ErrorPagesTests.cs b/test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs
similarity index 100%
rename from test/IISExpress.FunctionalTests/InProcess/ErrorPagesTests.cs
rename to test/Common.FunctionalTests/Inprocess/ErrorPagesTests.cs
diff --git a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs b/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
similarity index 94%
rename from test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
rename to test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
index 4757c1d59b..cb76b503c5 100644
--- a/test/IISExpress.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
+++ b/test/Common.FunctionalTests/OutOfProcess/GlobalVersionTests.cs
@@ -33,18 +33,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
         public async Task GlobalVersion_DefaultWorks()
         {
             var deploymentParameters = GetGlobalVersionBaseDeploymentParameters();
-            deploymentParameters.PublishApplicationBeforeDeployment = false;
 
-            deploymentParameters.AddServerConfigAction(
-                element =>
-                {
-                    var handlerVersionElement = new XElement("handlerSetting");
-                    handlerVersionElement.SetAttributeValue("name", "handlerVersion");
-                    handlerVersionElement.SetAttributeValue("value", _handlerVersion20);
-
-                    element.Descendants("aspNetCore").Single()
-                        .Add(new XElement("handlerSettings", handlerVersionElement));
-                });
+            deploymentParameters.HandlerSettings["handlerVersion"] = _handlerVersion20;
 
             var deploymentResult = await DeployAsync(deploymentParameters);