diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs
index 289eb16f92..42d2a5a5ce 100644
--- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs
+++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs
@@ -5,7 +5,6 @@ using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Net.Http.Headers;
 using Xunit;
 
@@ -57,9 +56,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
             Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode);
         }
 
-        // Tests are conditional to avoid occasional CI failures on Windows 8 and Windows 2012 under full framework.
-        [ConditionalFact]
-        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "See aspnet/Identity#1630")]
+        [Fact]
         public async Task Token_WithKnownUser_ReturnsOkAndToken()
         {
             // Arrange & Act
@@ -84,8 +81,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
             Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode);
         }
 
-        [ConditionalTheory]
-        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "See aspnet/Identity#1630")]
+        [Theory]
         [InlineData("reader@example.com")]
         [InlineData("writer@example.com")]
         public async Task FindByStatus_WithToken_ReturnsOkAndPet(string username)
@@ -112,8 +108,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
             Assert.NotEmpty(json);
         }
 
-        [ConditionalFact]
-        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "See aspnet/Identity#1630")]
+        [Fact]
         public async Task FindById_WithInvalidPetId_ReturnsNotFound()
         {
             // Arrange & Act 1
@@ -133,8 +128,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
             Assert.Equal(HttpStatusCode.NotFound, response.StatusCode);
         }
 
-        [ConditionalFact]
-        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "See aspnet/Identity#1630")]
+        [Fact]
         public async Task FindById_WithValidPetId_ReturnsOkAndPet()
         {
             // Arrange & Act 1
@@ -159,8 +153,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
             Assert.NotEmpty(json);
         }
 
-        [ConditionalFact]
-        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "See aspnet/Identity#1630")]
+        [Fact]
         public async Task AddPet_WithInsufficientClaims_ReturnsForbidden()
         {
             // Arrange & Act 1
@@ -192,8 +185,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
             Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode);
         }
 
-        [ConditionalFact]
-        [FrameworkSkipCondition(RuntimeFrameworks.CLR, SkipReason = "See aspnet/Identity#1630")]
+        [Fact]
         public async Task AddPet_WithValidClaims_ReturnsCreated()
         {
             // Arrange & Act 1