diff --git a/liboio-test.vcxproj b/liboio-test.vcxproj
index 523ecfe2..430031c7 100644
--- a/liboio-test.vcxproj
+++ b/liboio-test.vcxproj
@@ -151,6 +151,7 @@
     <ClCompile Include="test\test-ping-pong.c" />
     <ClCompile Include="test\runner-win.c" />
     <ClCompile Include="test\runner.c" />
+    <ClCompile Include="test\test-tcp-writealot.c" />
     <ClCompile Include="test\test-timeout.c" />
     <ClCompile Include="test\run-tests.c" />
   </ItemGroup>
diff --git a/test/test-list.h b/test/test-list.h
index fb282c15..20fc2641 100644
--- a/test/test-list.h
+++ b/test/test-list.h
@@ -21,6 +21,7 @@
 
 TEST_DECLARE   (ping_pong)
 TEST_DECLARE   (delayed_accept)
+TEST_DECLARE   (tcp_writealot)
 TEST_DECLARE   (connection_fail)
 TEST_DECLARE   (close_cb_stack)
 TEST_DECLARE   (timeout)
@@ -34,6 +35,9 @@ TASK_LIST_START
 
   TEST_ENTRY  (delayed_accept)
 
+  TEST_ENTRY  (tcp_writealot)
+  TEST_HELPER (tcp_writealot, echo_server)
+
   TEST_ENTRY  (connection_fail)
 
   TEST_ENTRY  (close_cb_stack)
diff --git a/test/test-tcp-writealot.c b/test/test-tcp-writealot.c
new file mode 100644
index 00000000..0b86c1de
--- /dev/null
+++ b/test/test-tcp-writealot.c
@@ -0,0 +1,178 @@
+/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#include "../oio.h"
+#include "task.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+
+#define WRITES            5
+#define CHUNKS_PER_WRITE  5
+#define CHUNK_SIZE        10485760 /* 10 MB */
+
+#define TOTAL_BYTES       (WRITES * CHUNKS_PER_WRITE * CHUNK_SIZE)
+
+
+static char* send_buffer;
+static char* receive_buffer;
+
+
+static int connect_cb_called = 0;
+static int write_cb_called = 0;
+static int close_cb_called = 0;
+static int bytes_sent = 0;
+static int bytes_sent_done = 0;
+static int bytes_received = 0;
+static int bytes_received_done = 0;
+
+
+static void close_cb(oio_handle* handle, int status) {
+  ASSERT(handle != NULL);
+  ASSERT(status == 0);
+
+  free(handle);
+
+  close_cb_called++;
+}
+
+
+static void read_cb(oio_req* req, size_t nread, int status) {
+  oio_buf receive_buf;
+  int r;
+
+  /* The server will not send anything, it should close gracefully. */
+  ASSERT(req != NULL);
+  ASSERT(status == 0);
+
+  if (nread > 0) {
+    bytes_received_done += nread;
+
+    receive_buf.len = CHUNK_SIZE;
+    receive_buf.base = receive_buffer + bytes_received_done;
+    receive_buf.len = (CHUNK_SIZE > TOTAL_BYTES - bytes_received_done)
+                    ? TOTAL_BYTES - bytes_received_done
+                    : CHUNK_SIZE;
+  }
+
+  /* As long as we don't have graceful disconnect, I'll have to be this... */
+  /* Todo: FIXME */
+  if (bytes_received_done < TOTAL_BYTES) {
+    oio_req_init(req, req->handle, read_cb);
+    r = oio_read(req, &receive_buf, 1);
+    ASSERT(r == 0);
+  } else {
+    oio_close(req->handle);
+    free(req);
+  }
+}
+
+
+static void write_cb(oio_req* req, int status) {
+  ASSERT(req != NULL);
+  ASSERT(status == 0);
+
+  bytes_sent_done += CHUNKS_PER_WRITE * CHUNK_SIZE;
+  write_cb_called++;
+
+  free(req);
+}
+
+
+static void connect_cb(oio_req* req, int status) {
+  oio_buf send_bufs[CHUNKS_PER_WRITE];
+  oio_buf receive_buf;
+  oio_handle* handle;
+  int i, j, r;
+
+  ASSERT(req != NULL);
+  ASSERT(status == 0);
+
+  handle = req->handle;
+
+  connect_cb_called++;
+  free(req);
+
+  /* Write a lot of data */
+  for (i = 0; i < WRITES; i++) {
+    for (j = 0; j < CHUNKS_PER_WRITE; j++) {
+      send_bufs[j].len = CHUNK_SIZE;
+      send_bufs[j].base = send_buffer + bytes_sent;
+      bytes_sent += CHUNK_SIZE;
+    }
+
+    req = (oio_req*)malloc(sizeof *req);
+    ASSERT(req != NULL);
+
+    oio_req_init(req, handle, write_cb);
+    r = oio_write(req, (oio_buf*)&send_bufs, CHUNKS_PER_WRITE);
+    ASSERT(r == 0);
+  }
+
+  /* Start reading */
+  req = (oio_req*)malloc(sizeof *req);
+  ASSERT(req != NULL);
+
+  receive_buf.len = CHUNK_SIZE;
+  receive_buf.base = receive_buffer;
+
+  oio_req_init(req, handle, read_cb);
+  r = oio_read(req, &receive_buf, 1);
+  ASSERT(r == 0);
+}
+
+
+
+TEST_IMPL(tcp_writealot) {
+  struct sockaddr_in addr = oio_ip4_addr("127.0.0.1", TEST_PORT);
+  oio_handle* client = (oio_handle*)malloc(sizeof *client);
+  oio_req* connect_req = (oio_req*)malloc(sizeof *connect_req);
+  int r;
+
+  ASSERT(client != NULL);
+  ASSERT(connect_req != NULL);
+
+  send_buffer = (char*)malloc(TOTAL_BYTES + 1);
+  receive_buffer = (char*)malloc(TOTAL_BYTES + 1);
+
+  ASSERT(send_buffer != NULL);
+  ASSERT(receive_buffer != NULL);
+
+  oio_init();
+
+  r = oio_tcp_init(client, close_cb, NULL);
+  ASSERT(r == 0);
+
+  oio_req_init(connect_req, client, connect_cb);
+  r = oio_connect(connect_req, (struct sockaddr*)&addr);
+  ASSERT(r == 0);
+
+  oio_run();
+
+  ASSERT(connect_cb_called == 1);
+  ASSERT(write_cb_called == WRITES);
+  ASSERT(close_cb_called == 1);
+  ASSERT(bytes_sent == TOTAL_BYTES);
+  ASSERT(bytes_sent_done == TOTAL_BYTES);
+  ASSERT(bytes_received_done == TOTAL_BYTES);
+
+  return 0;
+}