diff --git a/eng/Versions.props b/eng/Versions.props
index 2ebefb437105..7b1aa91ceadb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,8 +8,9 @@
   <PropertyGroup Label="Version settings">
     <AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
-    <AspNetCorePatchVersion>16</AspNetCorePatchVersion>
-    <ValidateBaseline>true</ValidateBaseline>
+    <AspNetCorePatchVersion>17</AspNetCorePatchVersion>
+    <!-- This property should be 'false' between branding & code-merging, 'true' the rest of the time -->
+    <ValidateBaseline>false</ValidateBaseline>
     <PreReleasePreviewNumber>0</PreReleasePreviewNumber>
     <ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
     <ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>
diff --git a/src/Security/Authentication/test/CertificateTests.cs b/src/Security/Authentication/test/CertificateTests.cs
index fc4d189a1f3f..3689db139dd8 100644
--- a/src/Security/Authentication/test/CertificateTests.cs
+++ b/src/Security/Authentication/test/CertificateTests.cs
@@ -179,7 +179,8 @@ public async Task VerifyExpiredSelfSignedPassesIfDateRangeValidationIsDisabled()
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         }
 
-        [Fact]
+        [ConditionalFact]
+        [OSSkipCondition(OperatingSystems.Linux)]
         public async Task VerifyNotYetValidSelfSignedFails()
         {
             var server = CreateServer(
diff --git a/src/Security/Authentication/test/TestCertificates/selfSignedNoEkuCertificateExpired.cer b/src/Security/Authentication/test/TestCertificates/selfSignedNoEkuCertificateExpired.cer
deleted file mode 100644
index 81b6326d6f1e..000000000000
Binary files a/src/Security/Authentication/test/TestCertificates/selfSignedNoEkuCertificateExpired.cer and /dev/null differ
diff --git a/src/Security/Authentication/test/TestCertificates/selfSignedNoEkuCertificateNotValidYet.cer b/src/Security/Authentication/test/TestCertificates/selfSignedNoEkuCertificateNotValidYet.cer
deleted file mode 100644
index 9c8cf9d71b22..000000000000
Binary files a/src/Security/Authentication/test/TestCertificates/selfSignedNoEkuCertificateNotValidYet.cer and /dev/null differ
diff --git a/src/Security/Authentication/test/TestCertificates/validSelfSignedClientEkuCertificate.cer b/src/Security/Authentication/test/TestCertificates/validSelfSignedClientEkuCertificate.cer
deleted file mode 100644
index db4bb5b90a07..000000000000
Binary files a/src/Security/Authentication/test/TestCertificates/validSelfSignedClientEkuCertificate.cer and /dev/null differ
diff --git a/src/Security/Authentication/test/TestCertificates/validSelfSignedNoEkuCertificate.cer b/src/Security/Authentication/test/TestCertificates/validSelfSignedNoEkuCertificate.cer
deleted file mode 100644
index 2be2a46d7992..000000000000
Binary files a/src/Security/Authentication/test/TestCertificates/validSelfSignedNoEkuCertificate.cer and /dev/null differ
diff --git a/src/Security/Authentication/test/TestCertificates/validSelfSignedServerEkuCertificate.cer b/src/Security/Authentication/test/TestCertificates/validSelfSignedServerEkuCertificate.cer
deleted file mode 100644
index 823000d4a147..000000000000
Binary files a/src/Security/Authentication/test/TestCertificates/validSelfSignedServerEkuCertificate.cer and /dev/null differ
diff --git a/src/Shared/test/Certificates/selfSignedNoEkuCertificateNotValidYet.cer b/src/Shared/test/Certificates/selfSignedNoEkuCertificateNotValidYet.cer
index 9c8cf9d71b22..19ee0adcef1b 100644
Binary files a/src/Shared/test/Certificates/selfSignedNoEkuCertificateNotValidYet.cer and b/src/Shared/test/Certificates/selfSignedNoEkuCertificateNotValidYet.cer differ