diff --git a/src/uv-win.c b/src/uv-win.c
index f432778e2f..33fb97fef7 100644
--- a/src/uv-win.c
+++ b/src/uv-win.c
@@ -1385,11 +1385,6 @@ int uv_tcp_connect6(uv_req_t* req, struct sockaddr_in6 addr) {
 int uv_getsockname(uv_tcp_t* handle, struct sockaddr* name, int* namelen) {
   int result;
 
-  if (!(handle->flags & UV_HANDLE_CONNECTION)) {
-    uv_set_sys_error(WSAEINVAL);
-    return -1;
-  }
-
   if (handle->flags & UV_HANDLE_SHUTTING) {
     uv_set_sys_error(WSAESHUTDOWN);
     return -1;
diff --git a/test/test-getsockname.c b/test/test-getsockname.c
index 9d9c0ba050..fa5788b1ee 100644
--- a/test/test-getsockname.c
+++ b/test/test-getsockname.c
@@ -91,7 +91,7 @@ static void on_connection(uv_handle_t* server, int status) {
 
   status = uv_getsockname((uv_tcp_t*)handle, &sockname, &namelen);
   if (status != 0) {
-    fprintf(stderr, "uv_getsockname error (listener) %d\n", uv_last_error().code);
+    fprintf(stderr, "uv_getsockname error (accepted) %d\n", uv_last_error().code);
   }
   ASSERT(status == 0);
 
@@ -122,6 +122,8 @@ static void* on_connect(void* req) {
 
 static int tcp_listener(int port) {
   struct sockaddr_in addr = uv_ip4_addr("0.0.0.0", port);
+  struct sockaddr sockname;
+  int namelen = sizeof(sockname);
   int r;
   
   r = uv_tcp_init(&tcpServer);
@@ -142,6 +144,13 @@ static int tcp_listener(int port) {
     return 1;
   }
 
+  r = uv_getsockname(&tcpServer, &sockname, &namelen);
+  if (r != 0) {
+    fprintf(stderr, "uv_getsockname error (listening) %d\n", uv_last_error().code);
+  }
+  ASSERT(r == 0);
+  getsocknamecount++;
+
   return 0;
 }
 
@@ -171,7 +180,7 @@ TEST_IMPL(getsockname) {
 
   uv_run();
 
-  ASSERT(getsocknamecount == 2);
+  ASSERT(getsocknamecount == 3);
 
   return 0;
 }