diff --git a/msvc/gtest.vcproj b/msvc/gtest.vcproj
index 47c4a80c..1c1ac44a 100755
--- a/msvc/gtest.vcproj
+++ b/msvc/gtest.vcproj
@@ -32,7 +32,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/gtest.lib"/>
+				OutputFile="$(OutDir)/gtestd.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
diff --git a/msvc/gtest_main.vcproj b/msvc/gtest_main.vcproj
index 1bcf9b22..250d5323 100755
--- a/msvc/gtest_main.vcproj
+++ b/msvc/gtest_main.vcproj
@@ -32,7 +32,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/$(ProjectName).lib"/>
+				OutputFile="$(OutDir)/$(ProjectName)d.lib"/>
 			<Tool
 				Name="VCMIDLTool"/>
 			<Tool
diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc
index b20b98c1..abc337f3 100644
--- a/test/gtest_unittest.cc
+++ b/test/gtest_unittest.cc
@@ -2720,85 +2720,40 @@ TEST(HRESULTAssertionTest, EXPECT_HRESULT_SUCCEEDED) {
   EXPECT_HRESULT_SUCCEEDED(S_OK);
   EXPECT_HRESULT_SUCCEEDED(S_FALSE);
 
-#ifdef _WIN32_WCE
-  const char* expected =
-    "Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
-    "  Actual: 0x8000FFFF";
-#else  // Windows proper
-  const char* expected =
-    "Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
-    "  Actual: 0x8000FFFF Catastrophic failure";
-#endif  // _WIN32_WCE
   EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_SUCCEEDED(UnexpectedHRESULTFailure()),
-      expected);
+    "Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
+    "  Actual: 0x8000FFFF");
 }
 
 TEST(HRESULTAssertionTest, ASSERT_HRESULT_SUCCEEDED) {
   ASSERT_HRESULT_SUCCEEDED(S_OK);
   ASSERT_HRESULT_SUCCEEDED(S_FALSE);
 
-#ifdef _WIN32_WCE
-  const char* expected =
-          "Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
-          "  Actual: 0x8000FFFF";
-#else  // Windows proper
-  const char* expected =
-    "Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
-    "  Actual: 0x8000FFFF Catastrophic failure";
-#endif  // _WIN32_WCE
-
   EXPECT_FATAL_FAILURE(ASSERT_HRESULT_SUCCEEDED(UnexpectedHRESULTFailure()),
-      expected);
+    "Expected: (UnexpectedHRESULTFailure()) succeeds.\n"
+    "  Actual: 0x8000FFFF");
 }
 
 TEST(HRESULTAssertionTest, EXPECT_HRESULT_FAILED) {
   EXPECT_HRESULT_FAILED(E_UNEXPECTED);
 
-#ifdef _WIN32_WCE
-  const char* expected_success =
-    "Expected: (OkHRESULTSuccess()) fails.\n"
-    "  Actual: 0x00000000";
-  const char* expected_incorrect_function =
-    "Expected: (FalseHRESULTSuccess()) fails.\n"
-    "  Actual: 0x00000001";
-#else  // Windows proper
-  const char* expected_success =
-    "Expected: (OkHRESULTSuccess()) fails.\n"
-    "  Actual: 0x00000000 The operation completed successfully";
-  const char* expected_incorrect_function =
-    "Expected: (FalseHRESULTSuccess()) fails.\n"
-    "  Actual: 0x00000001 Incorrect function.";
-#endif  // _WIN32_WCE
-
   EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(OkHRESULTSuccess()),
-      expected_success);
+    "Expected: (OkHRESULTSuccess()) fails.\n"
+    "  Actual: 0x00000000");
   EXPECT_NONFATAL_FAILURE(EXPECT_HRESULT_FAILED(FalseHRESULTSuccess()),
-      expected_incorrect_function);
+    "Expected: (FalseHRESULTSuccess()) fails.\n"
+    "  Actual: 0x00000001");
 }
 
 TEST(HRESULTAssertionTest, ASSERT_HRESULT_FAILED) {
   ASSERT_HRESULT_FAILED(E_UNEXPECTED);
 
-#ifdef _WIN32_WCE
-  const char* expected_success =
-    "Expected: (OkHRESULTSuccess()) fails.\n"
-    "  Actual: 0x00000000";
-  const char* expected_incorrect_function =
-    "Expected: (FalseHRESULTSuccess()) fails.\n"
-    "  Actual: 0x00000001";
-#else  // Windows proper
-  const char* expected_success =
-    "Expected: (OkHRESULTSuccess()) fails.\n"
-    "  Actual: 0x00000000 The operation completed successfully";
-  const char* expected_incorrect_function =
-    "Expected: (FalseHRESULTSuccess()) fails.\n"
-    "  Actual: 0x00000001 Incorrect function.";
-#endif  // _WIN32_WCE
-
   EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(OkHRESULTSuccess()),
-      expected_success);
+    "Expected: (OkHRESULTSuccess()) fails.\n"
+    "  Actual: 0x00000000");
   EXPECT_FATAL_FAILURE(ASSERT_HRESULT_FAILED(FalseHRESULTSuccess()),
-      expected_incorrect_function);
+    "Expected: (FalseHRESULTSuccess()) fails.\n"
+    "  Actual: 0x00000001");
 }
 
 // Tests that streaming to the HRESULT macros works.