diff --git a/test/bench_httpclient.c b/test/bench_httpclient.c
index 22f174da..bcddc95f 100644
--- a/test/bench_httpclient.c
+++ b/test/bench_httpclient.c
@@ -151,7 +151,7 @@ launch_request(void)
 	}
 	frob_socket(sock);
 	if (connect(sock, (struct sockaddr*)&sin, sizeof(sin)) < 0) {
-		int e = errno;
+		int e = evutil_socket_geterror(sock);
 		if (! EVUTIL_ERR_CONNECT_RETRIABLE(e)) {
 			evutil_closesocket(sock);
 			return -1;
@@ -183,6 +183,11 @@ main(int argc, char **argv)
 	double throughput;
 	resource = "/ref";
 
+#ifdef _WIN32
+	WSADATA WSAData;
+	WSAStartup(0x101, &WSAData);
+#endif
+
 	setvbuf(stdout, NULL, _IONBF, 0);
 
 	base = event_base_new();
@@ -226,5 +231,9 @@ main(int argc, char **argv)
 	    (double)(usec/1000) / total_n_handled,
 	    (I64_TYP)total_n_bytes, n_errors);
 
+#ifdef _WIN32
+	WSACleanup();
+#endif
+
 	return 0;
 }