diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index b657fdb0c..8dcd9397b 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -108,7 +108,7 @@
       <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.0"
-                               LatestVersion="2.1.16" />
+                               LatestVersion="2.1.17" />
       <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                                TargetFrameworkVersion="2.2"
                                DefaultVersion="2.2.0"
@@ -116,11 +116,11 @@
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.1"
-                               LatestVersion="2.1.16"/>
+                               LatestVersion="2.1.17"/>
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.1"
-                               LatestVersion="2.1.16"/>
+                               LatestVersion="2.1.17"/>
 
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
                                TargetFrameworkVersion="2.2"
diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
index 9f99f850b..646782226 100644
--- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
+++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
@@ -13,40 +13,6 @@ namespace EndToEnd
 {
     public partial class GivenSelfContainedAppsRollForward : TestBase
     {
-
-        [Theory]
-        //  MemberData is used instead of InlineData here so we can access it in another test to
-        //  verify that we are covering the latest release of .NET Core
-        [ClassData(typeof(SupportedNetCoreAppVersions))]
-        public void ItRollsForwardToTheLatestNetCoreVersion(string minorVersion)
-        {
-            if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0")
-            {
-                //  https://github.com/dotnet/core-sdk/issues/621
-                return;
-            }
-            ItRollsForwardToTheLatestVersion(TestProjectCreator.NETCorePackageName, minorVersion);
-        }
-
-        [Theory]
-        [ClassData(typeof(SupportedAspNetCoreVersions))]
-        public void ItRollsForwardToTheLatestAspNetCoreAppVersion(string minorVersion)
-        {
-            if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0")
-            {
-                //  https://github.com/dotnet/core-sdk/issues/621
-                return;
-            }
-            ItRollsForwardToTheLatestVersion(TestProjectCreator.AspNetCoreAppPackageName, minorVersion);
-        }
-
-        [Theory]
-        [ClassData(typeof(SupportedAspNetCoreAllVersions))]
-        public void ItRollsForwardToTheLatestAspNetCoreAllVersion(string minorVersion)
-        {
-            ItRollsForwardToTheLatestVersion(TestProjectCreator.AspNetCoreAllPackageName, minorVersion);
-        }
-
         internal void ItRollsForwardToTheLatestVersion(string packageName, string minorVersion)
         {
             var testProjectCreator = new TestProjectCreator()