diff --git a/test/Microsoft.AspNetCore.OData.Tests/Commons/ExceptionAssert.cs b/test/Microsoft.AspNetCore.OData.Tests/Commons/ExceptionAssert.cs
index 911e75896..21faff3ed 100644
--- a/test/Microsoft.AspNetCore.OData.Tests/Commons/ExceptionAssert.cs
+++ b/test/Microsoft.AspNetCore.OData.Tests/Commons/ExceptionAssert.cs
@@ -296,7 +296,7 @@ public static ArgumentOutOfRangeException ThrowsArgumentOutOfRange(Action testCo
             exceptionMessage = exceptionMessage + " (Parameter '" + paramName + "')";
             if (actualValue != null)
             {
-                exceptionMessage += string.Format(CultureInfo.CurrentCulture, "\r\nActual value was {0}.", actualValue);
+                exceptionMessage += string.Format(CultureInfo.CurrentCulture, Environment.NewLine + "Actual value was {0}.", actualValue);
             }
         }
 
@@ -545,11 +545,11 @@ private static void VerifyExceptionMessage(Exception exception, string expectedM
         {
             if (!partialMatch)
             {
-                Assert.Equal(expectedMessage, exception.Message);
+                Assert.Equal(expectedMessage.ReplaceLineEndings(), exception.Message.ReplaceLineEndings());
             }
             else
             {
-                Assert.Contains(expectedMessage, exception.Message);
+                Assert.Contains(expectedMessage.ReplaceLineEndings(), exception.Message.ReplaceLineEndings());
             }
         }
     }
diff --git a/test/Microsoft.AspNetCore.OData.Tests/Extensions/SerializableErrorExtensionsTests.cs b/test/Microsoft.AspNetCore.OData.Tests/Extensions/SerializableErrorExtensionsTests.cs
index 75aca9d64..affef5118 100644
--- a/test/Microsoft.AspNetCore.OData.Tests/Extensions/SerializableErrorExtensionsTests.cs
+++ b/test/Microsoft.AspNetCore.OData.Tests/Extensions/SerializableErrorExtensionsTests.cs
@@ -39,7 +39,7 @@ public void CreateODataError_Creates_ODataError_UsingModelStateDictionary()
 
         // Assert
         Assert.NotNull(error);
-        Assert.Equal("key1:\r\nTest Error 1\r\nTest Error 2\r\n\r\nkey3:\r\nTest Error 3", error.Message);
+        Assert.Equal("key1:\r\nTest Error 1\r\nTest Error 2\r\n\r\nkey3:\r\nTest Error 3", error.Message, ignoreLineEndingDifferences: true);
         Assert.Null(error.Code);
         Assert.Null(error.InnerError);
         Assert.Equal(3, error.Details.Count);
@@ -63,11 +63,11 @@ public void CreateODataError_Creates_BasicODataError_WithoutModelStateDictionary
 
         // Assert
         Assert.NotNull(error);
-        Assert.Equal("key1:\r\nTest Error 1\r\n\r\nkey2:\r\nTest Error 2", error.Message);
+        Assert.Equal("key1:\r\nTest Error 1\r\n\r\nkey2:\r\nTest Error 2", error.Message, ignoreLineEndingDifferences: true);
         Assert.Null(error.Code);
         Assert.True(error.InnerError.Properties.TryGetValue(SerializableErrorKeys.MessageKey, out ODataValue odataValue));
         var exceptionMessage = Assert.IsType<ODataPrimitiveValue>(odataValue).Value as string;
-        Assert.Equal("key3:\r\nTest Error 3", exceptionMessage);
+        Assert.Equal("key3:\r\nTest Error 3", exceptionMessage, ignoreLineEndingDifferences: true);
         Assert.Equal(2, error.Details.Count);
     }
 
diff --git a/test/Microsoft.AspNetCore.OData.Tests/Results/PageResultOfTTests.cs b/test/Microsoft.AspNetCore.OData.Tests/Results/PageResultOfTTests.cs
index eec0a90c2..a5b2f6479 100644
--- a/test/Microsoft.AspNetCore.OData.Tests/Results/PageResultOfTTests.cs
+++ b/test/Microsoft.AspNetCore.OData.Tests/Results/PageResultOfTTests.cs
@@ -53,7 +53,7 @@ public void CtorPageResultOfT_ThrowsArgumentOutOfRange_NegativeCount()
 
         // Assert
         ArgumentOutOfRangeException exception = ExceptionAssert.Throws<ArgumentOutOfRangeException>(test);
-        Assert.Contains("Value must be greater than or equal to 0. (Parameter 'value')\r\nActual value was -1.", exception.Message);
+        Assert.Contains("Value must be greater than or equal to 0. (Parameter 'value')\r\nActual value was -1.".ReplaceLineEndings(), exception.Message);
     }
 
     [Fact]