diff --git a/snapshot/win/pe_image_reader_test.cc b/snapshot/win/pe_image_reader_test.cc
index 4376f2b8..d79415da 100644
--- a/snapshot/win/pe_image_reader_test.cc
+++ b/snapshot/win/pe_image_reader_test.cc
@@ -42,7 +42,7 @@ TEST(PEImageReader, DebugDirectory) {
   DWORD age;
   std::string pdbname;
   EXPECT_TRUE(pe_image_reader.DebugDirectoryInformation(&uuid, &age, &pdbname));
-  EXPECT_NE(-1, pdbname.find("crashpad_snapshot_test"));
+  EXPECT_NE(std::string::npos, pdbname.find("crashpad_snapshot_test"));
   const std::string suffix(".pdb");
   EXPECT_EQ(
       0,
diff --git a/snapshot/win/process_reader_win_test.cc b/snapshot/win/process_reader_win_test.cc
index 6cd06e5b..23306315 100644
--- a/snapshot/win/process_reader_win_test.cc
+++ b/snapshot/win/process_reader_win_test.cc
@@ -104,7 +104,7 @@ TEST(ProcessReaderWin, SelfOneThread) {
 #if defined(ARCH_CPU_64_BITS)
   EXPECT_NE(0, threads[0].context.Rip);
 #else
-  EXPECT_NE(0, threads[0].context.Eip);
+  EXPECT_NE(0u, threads[0].context.Eip);
 #endif
 
   EXPECT_EQ(0, threads[0].suspend_count);
diff --git a/test/win/win_child_process.cc b/test/win/win_child_process.cc
index f6156d15..b0efa462 100644
--- a/test/win/win_child_process.cc
+++ b/test/win/win_child_process.cc
@@ -54,7 +54,7 @@ bool GetSwitch(const char* switch_name, std::string* value) {
 
   std::string switch_name_with_equals(switch_name);
   switch_name_with_equals += "=";
-  for (size_t i = 1; i < num_args; ++i) {
+  for (int i = 1; i < num_args; ++i) {
     const wchar_t* arg = args[i];
     std::string arg_as_utf8 = base::UTF16ToUTF8(arg);
     if (arg_as_utf8.compare(