diff --git a/googlemock/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py
index 7c24d6832..3fbed9d40 100755
--- a/googlemock/test/gmock_output_test.py
+++ b/googlemock/test/gmock_output_test.py
@@ -157,7 +157,7 @@ class GMockOutputTest(gmock_test_utils.TestCase):
   def testOutput(self):
     (output, leaky_tests) = GetNormalizedCommandOutputAndLeakyTests(COMMAND)
     golden_file = open(GOLDEN_PATH, 'rb')
-    golden = golden_file.read().decode('utf-8')
+    golden = ToUnixLineEnding(golden_file.read().decode('utf-8'))
     golden_file.close()
     # On Windows the repository might have been checked out with \r\n line
     # endings, so normalize it here.
diff --git a/googlemock/test/gmock_output_test_golden.txt b/googlemock/test/gmock_output_test_golden.txt
index ca88af029..5537d56e3 100644
--- a/googlemock/test/gmock_output_test_golden.txt
+++ b/googlemock/test/gmock_output_test_golden.txt
@@ -309,8 +309,7 @@ Stack trace:
 FILE:#: Failure
 Value of: (std::pair<int, bool>(42, true))
 Expected: is pair (first: is >= 48, second: true)
-  Actual: (42, true) (of type std::pair<int,bool>)
-
+  Actual: (42, true)
 [  FAILED  ] GMockOutputTest.PrintsMatcher
 [  FAILED  ] GMockOutputTest.UnexpectedCall
 [  FAILED  ] GMockOutputTest.UnexpectedCallToVoidFunction