diff --git a/src/libraries/System.Management/tests/System.Management.Tests.csproj b/src/libraries/System.Management/tests/System.Management.Tests.csproj
index ad44bb1733676b..178ea7d9779a3b 100644
--- a/src/libraries/System.Management/tests/System.Management.Tests.csproj
+++ b/src/libraries/System.Management/tests/System.Management.Tests.csproj
@@ -29,4 +29,12 @@
+
+
+
+
\ No newline at end of file
diff --git a/src/libraries/System.Management/tests/System/Management/ManagementObjectTests.cs b/src/libraries/System.Management/tests/System/Management/ManagementObjectTests.cs
index 490d31fd303943..666c190ed5b890 100644
--- a/src/libraries/System.Management/tests/System/Management/ManagementObjectTests.cs
+++ b/src/libraries/System.Management/tests/System/Management/ManagementObjectTests.cs
@@ -13,6 +13,8 @@ namespace System.Management.Tests
{
public class ManagementObjectTests
{
+ private static bool IsWmiAndBinaryFormatterSupported => WmiTestHelper.IsWmiSupported && PlatformDetection.IsBinaryFormatterSupported;
+
[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsWindowsNanoServer))]
public void PlatformNotSupportedException_On_Nano()
{
@@ -103,7 +105,7 @@ public void Invoke_Instance_And_Static_Method_Win32_Process()
}, maxAttempts: 10, retryWhen: e => e is XunitException);
}
- [ConditionalFact(typeof(WmiTestHelper), nameof(WmiTestHelper.IsWmiSupported))]
+ [ConditionalFact(typeof(ManagementObjectTests), nameof(IsWmiAndBinaryFormatterSupported))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/34689", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[OuterLoop]
#if NET