diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets
index 143936c4a..eb605658c 100644
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@@ -31,8 +31,8 @@
     
     <!-- NUnit templates are shipped in Test.ProjectTemplates -->
     <!-- Not available yet for 8.0 -->
-    <!-- <Bundled80Templates Include="Microsoft.DotNet.Test.ProjectTemplates.8.0" PackageVersion="$(MicrosoftDotNetTestProjectTemplates80PackageVersion)" /> -->
-    <!-- <Bundled80Templates Include="Microsoft.DotNet.Common.ProjectTemplates.8.0" PackageVersion="$(MicrosoftDotNetCommonItemTemplates80PackageVersion)" /> -->
+    <Bundled80Templates Include="Microsoft.DotNet.Test.ProjectTemplates.7.0" PackageVersion="$(MicrosoftDotNetTestProjectTemplates70PackageVersion)" />
+    <Bundled80Templates Include="Microsoft.DotNet.Common.ProjectTemplates.7.0" PackageVersion="$(MicrosoftDotNetCommonItemTemplates70PackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs
index 12dd78e3b..a1b74eaa5 100644
--- a/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs
+++ b/test/EndToEnd/GivenWeWantToRequireWindowsForDesktopApps.cs
@@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tests.EndToEnd
         {
             var testProjectCreator = new TestProjectCreator()
             {
-                MinorVersion = "7.0"
+                MinorVersion = "8.0"
             };
 
             testProjectCreator.AdditionalProperties["RestorePackagesPath"] = @"$(MSBuildProjectDirectory)\packages";
diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs
index 3a5dfe40c..3b17c9f61 100644
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@@ -15,7 +15,7 @@ namespace EndToEnd.Tests
 {
     public class ProjectBuildTests : TestBase
     {
-        private static readonly string currentTfm = "net7.0";
+        private static readonly string currentTfm = "net8.0";
 
         [Fact]
         public void ItCanNewRestoreBuildRunCleanMSBuildProject()
@@ -249,15 +249,15 @@ namespace EndToEnd.Tests
         }
 
         [WindowsOnlyTheory]
-        [InlineData("wpf", Skip = "https://github.com/dotnet/wpf/issues/2363")]
-        [InlineData("winforms", Skip = "https://github.com/dotnet/wpf/issues/2363")]
+        [InlineData("wpf")]
+        [InlineData("winforms")]
         public void ItCanBuildDesktopTemplates(string templateName)
         {
             TestTemplateCreateAndBuild(templateName);
         }
 
         [WindowsOnlyTheory]
-        [InlineData("wpf", Skip = "https://github.com/dotnet/wpf/issues/2363")]
+        [InlineData("wpf")]
         public void ItCanBuildDesktopTemplatesSelfContained(string templateName)
         {
             TestTemplateCreateAndBuild(templateName);
@@ -328,7 +328,7 @@ namespace EndToEnd.Tests
         [InlineData("react")]
         public void ItCanCreateTemplateWithDefaultFramework(string templateName)
         {
-            string framework = DetectExpectedDefaultFramework();
+            string framework = DetectExpectedDefaultFramework(templateName);
             TestTemplateCreateAndBuild(templateName, build: false, framework: framework);
         }
 
@@ -374,7 +374,7 @@ namespace EndToEnd.Tests
         [InlineData("grpc")]
         public void ItCanCreateAndBuildTemplatesWithDefaultFramework_DisableBuildOnLinuxMusl(string templateName)
         {
-            string framework = DetectExpectedDefaultFramework();
+            string framework = DetectExpectedDefaultFramework(templateName);
 
             if (RuntimeInformation.RuntimeIdentifier.StartsWith("alpine")) //linux musl
             {
@@ -394,6 +394,25 @@ namespace EndToEnd.Tests
             int latestMajorVersion = runtimeFolders.Select(folder => int.Parse(Path.GetFileName(folder).Split('.').First())).Max();
             if (latestMajorVersion == 8)
             {
+                if (template.StartsWith("blazor")
+                    || template.StartsWith("mstest")
+                    || template.StartsWith("classlib")
+                    || template.StartsWith("console")
+                    || template.StartsWith("nunit")
+                    || template.StartsWith("xunit")
+                    || template.StartsWith("xunit")
+                    || template.StartsWith("wpf")
+                    || template.StartsWith("winforms")
+                    || template.StartsWith("mvc")
+                    || template.StartsWith("web")
+                    || template.StartsWith("worker")
+                    || template.StartsWith("razor")
+                    || template.StartsWith("grpc")
+                    || template.StartsWith("angular")
+                    || template.StartsWith("react"))
+                {
+                    return "net7.0";
+                }
                 return $"net{latestMajorVersion}.0";
             }