diff --git a/src/unix/tcp.c b/src/unix/tcp.c
index 799fca77..f8bafd66 100644
--- a/src/unix/tcp.c
+++ b/src/unix/tcp.c
@@ -467,9 +467,6 @@ int uv__tcp_keepalive(int fd, int on, unsigned int delay) {
   if (!on)
     return 0;
 
-  if (delay == 0)
-    return -1;
-
 #ifdef __sun
   /* The implementation of TCP keep-alive on Solaris/SmartOS is a bit unusual
    * compared to other Unix-like systems.
diff --git a/test/test-tcp-flags.c b/test/test-tcp-flags.c
index 30178d70..e16a2b2c 100644
--- a/test/test-tcp-flags.c
+++ b/test/test-tcp-flags.c
@@ -33,7 +33,7 @@ TEST_IMPL(tcp_flags) {
 
   loop = uv_default_loop();
 
-  r = uv_tcp_init(loop, &handle);
+  r = uv_tcp_init_ex(loop, &handle, AF_INET);
   ASSERT_OK(r);
 
   r = uv_tcp_nodelay(&handle, 1);
@@ -42,6 +42,12 @@ TEST_IMPL(tcp_flags) {
   r = uv_tcp_keepalive(&handle, 1, 60);
   ASSERT_OK(r);
 
+  r = uv_tcp_keepalive(&handle, 0, 0);
+  ASSERT_OK(r);
+
+  r = uv_tcp_keepalive(&handle, 1, 0);
+  ASSERT_OK(r);
+
   uv_close((uv_handle_t*)&handle, NULL);
 
   r = uv_run(loop, UV_RUN_DEFAULT);