diff --git a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestDiscovererPluginInformation.cs b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestDiscovererPluginInformation.cs
index 3f1c5f9ced..216fbc0ed8 100644
--- a/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestDiscovererPluginInformation.cs
+++ b/src/Microsoft.TestPlatform.Common/ExtensionFramework/Utilities/TestDiscovererPluginInformation.cs
@@ -8,11 +8,8 @@
 using System.Reflection;
 
 using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
-
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-#nullable disable
-
 namespace Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework.Utilities;
 
 /// <summary>
@@ -38,18 +35,18 @@ public TestDiscovererPluginInformation(Type testDiscovererType)
     /// <summary>
     /// Metadata for the test plugin
     /// </summary>
-    public override ICollection<object> Metadata
+    public override ICollection<object?> Metadata
     {
         get
         {
-            return new object[] { FileExtensions, DefaultExecutorUri, AssemblyType };
+            return new object?[] { FileExtensions, DefaultExecutorUri, AssemblyType };
         }
     }
 
     /// <summary>
     /// Gets collection of file extensions supported by discoverer plugin.
     /// </summary>
-    public List<string> FileExtensions
+    public List<string>? FileExtensions
     {
         get;
         private set;
@@ -58,7 +55,7 @@ public List<string> FileExtensions
     /// <summary>
     /// Gets the Uri identifying the executor
     /// </summary>
-    public string DefaultExecutorUri
+    public string? DefaultExecutorUri
     {
         get;
         private set;
@@ -126,7 +123,7 @@ private static string GetDefaultExecutorUri(Type testDiscovererType)
     /// </summary>
     /// <param name="testDiscovererType"> The test discoverer Type. </param>
     /// <returns> Supported assembly type. </returns>
-    private AssemblyType GetAssemblyType(Type testDiscovererType)
+    private static AssemblyType GetAssemblyType(Type testDiscovererType)
     {
 
         // Get Category
diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestDiscovererPluginInformationTests.cs b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestDiscovererPluginInformationTests.cs
index ef8fea965b..2233c13ba6 100644
--- a/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestDiscovererPluginInformationTests.cs
+++ b/test/Microsoft.TestPlatform.Common.UnitTests/ExtensionFramework/Utilities/TestDiscovererPluginInformationTests.cs
@@ -126,9 +126,9 @@ public void MetadataShouldReturnFileExtensionsAndDefaultExecutorUriAndAssemblyTy
         var expectedFileExtensions = new List<string> { "csv", "docx" };
         var testPluginMetada = _testPluginInformation.Metadata.ToArray();
 
-        CollectionAssert.AreEqual(expectedFileExtensions, ((List<string>)testPluginMetada[0]).ToArray());
+        CollectionAssert.AreEqual(expectedFileExtensions, ((List<string>)testPluginMetada[0]!).ToArray());
         Assert.AreEqual("csvexecutor", testPluginMetada[1] as string);
-        Assert.AreEqual(AssemblyType.Managed, Enum.Parse(typeof(AssemblyType), testPluginMetada[2].ToString()!));
+        Assert.AreEqual(AssemblyType.Managed, Enum.Parse(typeof(AssemblyType), testPluginMetada[2]!.ToString()!));
     }
 }