diff --git a/.editorconfig b/.editorconfig
index 965b766e28..fb97151541 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -646,7 +646,7 @@ end_of_line = crlf
 # Test specific
 [**/tests/**/*.cs]
 
-# CA1861: Avoid constant arrays as arguments - expected to be inline for test readability (4000 hits)
+# CA1861: Avoid constant arrays as arguments - expected to be in-line for test readability (4000 hits)
 dotnet_diagnostic.CA1861.severity = silent
 
 # This collides with TheoryData usage
@@ -656,7 +656,13 @@ dotnet_style_prefer_collection_expression = true:silent
 # xUnit1042: The member referenced by the MemberData attribute returns untyped data rows
 dotnet_diagnostic.xUnit1042.severity = none
 
-# CA1507: CA1507: Use nameof in place of string - many fasle positives
+# xUnit1044: Avoid using TheoryData type arguments that are not serializable
+dotnet_diagnostic.xUnit1044.severity = none
+
+# xUnit1045: Avoid using TheoryData type arguments that might not be serializable
+dotnet_diagnostic.xUnit1045.severity = none
+
+# CA1507: CA1507: Use nameof in place of string - many false positives
 dotnet_diagnostic.CA1507.severity = none
 
 # CA1822: Mark members as static
diff --git a/src/System.Private.Windows.Core/tests/BinaryFormatTests/BinaryFormatTests.csproj b/src/System.Private.Windows.Core/tests/BinaryFormatTests/BinaryFormatTests.csproj
index 680309b0fd..9ede62cd05 100644
--- a/src/System.Private.Windows.Core/tests/BinaryFormatTests/BinaryFormatTests.csproj
+++ b/src/System.Private.Windows.Core/tests/BinaryFormatTests/BinaryFormatTests.csproj
@@ -31,7 +31,7 @@
      SYSLIB0051: Formatters obsolete
      SYSLIB5005: System.Formats.Nrbf is experimental
     -->
-    <NoWarn>$(NoWarn);CS1574;CS1580;CA1036;CA1051;CA1066;SYSLIB0011;SYSLIB0050;SYSLIB0051;SYSLIB5005;xUnit1013;xUnit1045</NoWarn>
+    <NoWarn>$(NoWarn);CS1574;CS1580;CA1036;CA1051;CA1066;SYSLIB0011;SYSLIB0050;SYSLIB0051;SYSLIB5005;xUnit1013</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/System.Windows.Forms/tests/UnitTests/System.Windows.Forms.Tests.csproj b/src/System.Windows.Forms/tests/UnitTests/System.Windows.Forms.Tests.csproj
index 45b39e1d8e..23faa5b92b 100644
--- a/src/System.Windows.Forms/tests/UnitTests/System.Windows.Forms.Tests.csproj
+++ b/src/System.Windows.Forms/tests/UnitTests/System.Windows.Forms.Tests.csproj
@@ -15,7 +15,7 @@
       SYSLIB0051: This API supports obsolete formatter-based serialization
       SYSLIB5005: System.Formats.Nrbf is experimental
     -->
-    <NoWarn>$(NoWarn),1573,1591,1712,WFDEV001,SYSLIB0050,SYSLIB0051,SYSLIB5005,xUnit1045</NoWarn>
+    <NoWarn>$(NoWarn),1573,1591,1712,WFDEV001,SYSLIB0050,SYSLIB0051,SYSLIB5005</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>