diff --git a/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj b/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj
index 2747964a4c..87f4c68c33 100644
--- a/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj
+++ b/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj
@@ -24,7 +24,7 @@
     <Content Include="install.cmd" />
     <Content Include="dotnet.cmd" />
     <Content Include="$(OutputPath)\Microsoft.Web.Xdt.Extensions.dll" PackagePath="content" />
-    <Content Include="$(DotnetHomeDirectory)**\*.*" Exclude="$(DotnetHomeDirectory)**\nuGetPackagesArchive.lzma" Condition="$(DotnetHomeDirectory) != ''" PackagePath="content\%(RecursiveDir)%(FileName)%(Extension)" />
+    <Content Include="$(DotnetHomeDirectory)**\*.*" Condition="$(DotnetHomeDirectory) != ''" PackagePath="content\%(RecursiveDir)%(FileName)%(Extension)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/applicationHost.xdt b/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/applicationHost.xdt
index 5a7f96ddd8..3384d1f485 100644
--- a/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/applicationHost.xdt
+++ b/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/applicationHost.xdt
@@ -7,7 +7,7 @@
     <system.webServer xdt:Transform="InsertIfMissing">
       <runtime xdt:Transform="InsertIfMissing" >
         <environmentVariables xdt:Transform="InsertIfMissing">
-          <add name="PATH" value="%XDT_EXTENSIONPATH%" xdt:Locator="Match(name)" xdt:Transform="InsertOrAppendAttribute(Attribute='value')" />
+          <add name="PATH" value="%XDT_EXTENSIONPATH%;%PATH%" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing"  />
         </environmentVariables>
       </runtime>
     </system.webServer>
diff --git a/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/install.cmd b/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/install.cmd
index bac2756d10..75f5b8ff35 100644
--- a/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/install.cmd
+++ b/src/Microsoft.AspNetCore.AzureAppServices.TestBundle/install.cmd
@@ -12,5 +12,8 @@ robocopy "%DOTNET%" "." /E /XC /XN /XO /NFL /NDL ^
 
 copy /y dotnet.cmd D:\home\site\deployments\tools
 
+rem force first time experience
+dotnet msbuild /version
+
 if %errorlevel% geq 8 exit /b 1
 exit /b 0
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/TemplateFunctionalTests.cs b/test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/TemplateFunctionalTests.cs
index 895bc7c056..68ea24edab 100644
--- a/test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/TemplateFunctionalTests.cs
+++ b/test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/TemplateFunctionalTests.cs
@@ -143,17 +143,17 @@ namespace Microsoft.AspNetCore.AzureAppServices.FunctionalTests
 
                 await dotnet.ExecuteAndAssertAsync("new " + template);
 
-                // We don't ship offline cache in site extension so we need to provider a feed to
-                // restore from when doing kudu git deploy for version not published to Nuget
-                if (deploymentKind == WebAppDeploymentKind.Git && dotnetVersion == "latest")
-                {
-                    CopyToProjectDirectory(testDirectory, Asset("Nuget.latest.config"), "NuGet.config");
-                }
-
                 InjectMiddlware(testDirectory, RuntimeInformationMiddlewareType, RuntimeInformationMiddlewareFile);
                 FixAspNetCoreVersion(testDirectory, dotnet.Command);
 
                 var site = await siteTask;
+
+                // There is no feed with packages included in lastes so we have to enable first run experience
+                if (deploymentKind == WebAppDeploymentKind.Git && dotnetVersion == "latest")
+                {
+                    await site.Update().WithAppSetting("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", "false").ApplyAsync();
+                }
+
                 await site.Deploy(deploymentKind, testDirectory, dotnet, logger);
 
                 using (var httpClient = site.CreateClient())
diff --git a/test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/WebAppExtensions.cs b/test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/WebAppExtensions.cs
index b7888d7bfa..87927f15a0 100644
--- a/test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/WebAppExtensions.cs
+++ b/test/Microsoft.AspNetCore.AzureAppServices.FunctionalTests/WebAppExtensions.cs
@@ -106,6 +106,7 @@ namespace Microsoft.AspNetCore.AzureAppServices.FunctionalTests
             var result = await git.ExecuteAndAssertAsync("push origin master");
 
             Assert.DoesNotContain("An error has occurred during web site deployment", result.StdErr);
+            Assert.DoesNotContain("deployment to website failed", result.StdErr);
         }
 
         public static async Task BuildPublishProfileAsync(this IWebApp site, string projectDirectory)