diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests.cs b/test/ArgumentForwardingTests/ArgumentForwardingTests.cs
index 10af8517e..c4c01e644 100644
--- a/test/ArgumentForwardingTests/ArgumentForwardingTests.cs
+++ b/test/ArgumentForwardingTests/ArgumentForwardingTests.cs
@@ -42,8 +42,7 @@ namespace Microsoft.DotNet.Tests.ArgumentForwarding
/// This is a critical scenario for the driver.
///
///
- // This test is "Windows only" for now due to https://github.com/dotnet/corefx/issues/23496
- [WindowsOnlyTheory]
+ [Theory]
[InlineData(@"""abc"" d e")]
[InlineData(@"""ábc"" d é")]
[InlineData(@"""abc"" d e")]
diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
index 1a58c07c9..c71c5cf15 100644
--- a/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
+++ b/test/ArgumentForwardingTests/ArgumentForwardingTests.csproj
@@ -21,10 +21,9 @@
-
+ Condition=" '$(IsCrossTargetingBuild)' != 'true' ">