diff --git a/googlemock/test/gmock_test.cc b/googlemock/test/gmock_test.cc
index 8cfff306..510ea5ed 100644
--- a/googlemock/test/gmock_test.cc
+++ b/googlemock/test/gmock_test.cc
@@ -87,10 +87,10 @@ TEST(InitGoogleMockTest, ParsesSingleFlag) {
 
 TEST(InitGoogleMockTest, ParsesMultipleFlags) {
   int old_default_behavior = GMOCK_FLAG_GET(default_mock_behavior);
-  const wchar_t* argv[] = {L"foo.exe", L"--gmock_verbose=info",
-                           L"--gmock_default_mock_behavior=2", nullptr};
+  const char* argv[] = {"foo.exe", "--gmock_verbose=info",
+                        "--gmock_default_mock_behavior=2", nullptr};
 
-  const wchar_t* new_argv[] = {L"foo.exe", nullptr};
+  const char* new_argv[] = {"foo.exe", nullptr};
 
   TestInitGoogleMock(argv, new_argv, "info");
   EXPECT_EQ(2, GMOCK_FLAG_GET(default_mock_behavior));
diff --git a/googletest/test/googletest-output-test.py b/googletest/test/googletest-output-test.py
index 6d80d532..1f36bc34 100755
--- a/googletest/test/googletest-output-test.py
+++ b/googletest/test/googletest-output-test.py
@@ -175,7 +175,7 @@ def RemoveTestCounts(output):
   output = re.sub(r'\d+ tests?, listed below', '? tests, listed below', output)
   output = re.sub(r'\d+ FAILED TESTS', '? FAILED TESTS', output)
   output = re.sub(
-      r'\d+ tests? from \d+ test cases?', '? tests from ? test cases', output
+      r'\d+ tests? from \d+ test suites?', '? tests from ? test suites', output
   )
   output = re.sub(r'\d+ tests? from ([a-zA-Z_])', r'? tests from \1', output)
   return re.sub(r'\d+ tests?\.', '? tests.', output)