diff --git a/src/win/fs-fd-hash-inl.h b/src/win/fs-fd-hash-inl.h
index fd875d286..94b4c3cc4 100644
--- a/src/win/fs-fd-hash-inl.h
+++ b/src/win/fs-fd-hash-inl.h
@@ -69,7 +69,7 @@ struct uv__fd_hash_bucket_s {
 static uv_mutex_t uv__fd_hash_mutex;
 
 static struct uv__fd_hash_entry_group_s
-  uv__fd_hash_entry_initial[UV__FD_HASH_SIZE * UV__FD_HASH_GROUP_SIZE];
+  uv__fd_hash_entry_initial[UV__FD_HASH_SIZE];
 static struct uv__fd_hash_bucket_s uv__fd_hash[UV__FD_HASH_SIZE];
 
 
@@ -82,10 +82,9 @@ static void uv__fd_hash_init(void) {
     uv_fatal_error(err, "uv_mutex_init");
   }
 
-  for (i = 0; i < ARRAY_SIZE(uv__fd_hash); ++i) {
+  for (i = 0; i < ARRAY_SIZE(uv__fd_hash); i++) {
     uv__fd_hash[i].size = 0;
-    uv__fd_hash[i].data =
-        uv__fd_hash_entry_initial + i * UV__FD_HASH_GROUP_SIZE;
+    uv__fd_hash[i].data = &uv__fd_hash_entry_initial[i];
   }
 }
 
diff --git a/test/test-fs-fd-hash.c b/test/test-fs-fd-hash.c
index 4ed3d548e..a9ae25223 100644
--- a/test/test-fs-fd-hash.c
+++ b/test/test-fs-fd-hash.c
@@ -66,17 +66,25 @@ void assert_removal(int fd) {
 /* Run a function for a set of values up to a very high number */
 #define RUN_HASH(function)                                                   \
   do {                                                                       \
+    uint64_t before = uv_hrtime();                                           \
     for (fd = 0; fd < HASH_MAX; fd += HASH_INC) {                            \
       function(fd);                                                          \
     }                                                                        \
+    uint64_t after = uv_hrtime();                                            \
+    double seconds = (after - before) / 1e9;                                 \
+    printf("%.5f hash %s\n", seconds, #function);                            \
   } while (0)
 
 /* Run a function for a set of values that will cause many collisions */
 #define RUN_COLLISIONS(function)                                             \
   do {                                                                       \
+    uint64_t before = uv_hrtime();                                           \
     for (fd = 1; fd < BUCKET_MAX; fd += BUCKET_INC) {                        \
       function(fd);                                                          \
     }                                                                        \
+    uint64_t after = uv_hrtime();                                            \
+    double seconds = (after - before) / 1e9;                                 \
+    printf("%.5f coll %s\n", seconds, #function);                            \
   } while (0)