diff --git a/src/Testing/src/xunit/ConditionalFactDiscoverer.cs b/src/Testing/src/xunit/ConditionalFactDiscoverer.cs
index ce190376fc..e9a6b895ae 100644
--- a/src/Testing/src/xunit/ConditionalFactDiscoverer.cs
+++ b/src/Testing/src/xunit/ConditionalFactDiscoverer.cs
@@ -4,6 +4,7 @@
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
+// Do not change this namespace without changing the usage in ConditionalFactAttribute
 namespace Microsoft.AspNetCore.Testing
 {
     internal class ConditionalFactDiscoverer : FactDiscoverer
diff --git a/src/Testing/src/xunit/ConditionalTheoryDiscoverer.cs b/src/Testing/src/xunit/ConditionalTheoryDiscoverer.cs
index c9ee58889a..764b613b16 100644
--- a/src/Testing/src/xunit/ConditionalTheoryDiscoverer.cs
+++ b/src/Testing/src/xunit/ConditionalTheoryDiscoverer.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
+// Do not change this namespace without changing the usage in ConditionalTheoryAttribute
 namespace Microsoft.AspNetCore.Testing
 {
     internal class ConditionalTheoryDiscoverer : TheoryDiscoverer
diff --git a/src/Testing/src/xunit/FlakyAttribute.cs b/src/Testing/src/xunit/FlakyAttribute.cs
index acea96f3cb..411435b74a 100644
--- a/src/Testing/src/xunit/FlakyAttribute.cs
+++ b/src/Testing/src/xunit/FlakyAttribute.cs
@@ -49,7 +49,7 @@ namespace Microsoft.AspNetCore.Testing
     /// to <c>xunit.console.exe</c>. Similarly, it can run only flaky tests using <c>-trait "Flaky:AzP:OS:all=true" -trait "Flaky:AzP:OS:Darwin=true"</c>
     /// </para>
     /// </example>
-    [TraitDiscoverer("Microsoft.AspNetCore.Testing.xunit.FlakyTestDiscoverer", "Microsoft.AspNetCore.Testing")]
+    [TraitDiscoverer("Microsoft.AspNetCore.Testing." + nameof(FlakyTestDiscoverer), "Microsoft.AspNetCore.Testing")]
     [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Assembly)]
     public sealed class FlakyAttribute : Attribute, ITraitAttribute
     {
@@ -72,12 +72,12 @@ namespace Microsoft.AspNetCore.Testing
         /// <param name="additionalFilters">A list of additional filters that define where this test is flaky. Use values in <see cref="FlakyOn"/>.</param>
         public FlakyAttribute(string gitHubIssueUrl, string firstFilter, params string[] additionalFilters)
         {
-            if(string.IsNullOrEmpty(gitHubIssueUrl))
+            if (string.IsNullOrEmpty(gitHubIssueUrl))
             {
                 throw new ArgumentNullException(nameof(gitHubIssueUrl));
             }
 
-            if(string.IsNullOrEmpty(firstFilter))
+            if (string.IsNullOrEmpty(firstFilter))
             {
                 throw new ArgumentNullException(nameof(firstFilter));
             }
diff --git a/src/Testing/src/xunit/FlakyTestDiscoverer.cs b/src/Testing/src/xunit/FlakyTestDiscoverer.cs
index aea2f9ea5b..0c481e1c41 100644
--- a/src/Testing/src/xunit/FlakyTestDiscoverer.cs
+++ b/src/Testing/src/xunit/FlakyTestDiscoverer.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
+// Do not change this namespace without changing the usage in FlakyAttribute
 namespace Microsoft.AspNetCore.Testing
 {
     public class FlakyTestDiscoverer : ITraitDiscoverer