diff --git a/test/core/util/port_windows.c b/test/core/util/port_windows.c
index 17058c33533..fc521504356 100644
--- a/test/core/util/port_windows.c
+++ b/test/core/util/port_windows.c
@@ -57,7 +57,7 @@ static int is_port_available(int *port, int is_tcp) {
 
   GPR_ASSERT(*port >= 0);
   GPR_ASSERT(*port <= 65535);
-  if (fd < 0) {
+  if (INVALID_SOCKET == fd) {
     gpr_log(GPR_ERROR, "socket() failed: %s", strerror(errno));
     return 0;
   }
diff --git a/vsprojects/grpc_test_util/grpc_test_util.vcxproj b/vsprojects/grpc_test_util/grpc_test_util.vcxproj
index bd3fe7e22ab..b2ac5f5cf5c 100644
--- a/vsprojects/grpc_test_util/grpc_test_util.vcxproj
+++ b/vsprojects/grpc_test_util/grpc_test_util.vcxproj
@@ -146,14 +146,14 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\test\core\end2end\cq_verifier.c">
-    </ClCompile>
     <ClCompile Include="..\..\test\core\end2end\data\server1_cert.c">
     </ClCompile>
     <ClCompile Include="..\..\test\core\end2end\data\server1_key.c">
     </ClCompile>
     <ClCompile Include="..\..\test\core\end2end\data\test_root_cert.c">
     </ClCompile>
+    <ClCompile Include="..\..\test\core\end2end\cq_verifier.c">
+    </ClCompile>
     <ClCompile Include="..\..\test\core\iomgr\endpoint_tests.c">
     </ClCompile>
     <ClCompile Include="..\..\test\core\statistics\census_log_tests.c">