diff --git a/test/test-list.h b/test/test-list.h
index acc5cea9..02fabcb9 100644
--- a/test/test-list.h
+++ b/test/test-list.h
@@ -50,6 +50,7 @@ TEST_DECLARE   (udp_multicast_join)
 TEST_DECLARE   (udp_dgram_too_big)
 TEST_DECLARE   (udp_dual_stack)
 TEST_DECLARE   (udp_ipv6_only)
+TEST_DECLARE   (udp_options)
 TEST_DECLARE   (pipe_bind_error_addrinuse)
 TEST_DECLARE   (pipe_bind_error_addrnotavail)
 TEST_DECLARE   (pipe_bind_error_inval)
@@ -187,6 +188,7 @@ TASK_LIST_START
   TEST_ENTRY  (udp_dgram_too_big)
   TEST_ENTRY  (udp_dual_stack)
   TEST_ENTRY  (udp_ipv6_only)
+  TEST_ENTRY  (udp_options)
   TEST_ENTRY  (udp_multicast_join)
 
   TEST_ENTRY  (pipe_bind_error_addrinuse)
diff --git a/test/test-udp-options.c b/test/test-udp-options.c
new file mode 100644
index 00000000..b4745741
--- /dev/null
+++ b/test/test-udp-options.c
@@ -0,0 +1,85 @@
+/* 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 "uv.h"
+#include "task.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+TEST_IMPL(udp_options) {
+  uv_loop_t* loop;
+  uv_udp_t h;
+  int i, r;
+
+  loop = uv_default_loop();
+
+  r = uv_udp_init(loop, &h);
+  ASSERT(r == 0);
+
+  uv_unref(loop); /* don't keep the loop alive */
+
+  r = uv_udp_bind(&h, uv_ip4_addr("0.0.0.0", TEST_PORT), 0);
+  ASSERT(r == 0);
+
+  r = uv_udp_set_broadcast(&h, 1);
+  r |= uv_udp_set_broadcast(&h, 1);
+  r |= uv_udp_set_broadcast(&h, 0);
+  r |= uv_udp_set_broadcast(&h, 0);
+  ASSERT(r == 0);
+
+  /* values 0-255 should work */
+  for (i = 0; i <= 255; i++) {
+    r = uv_udp_set_ttl(&h, i);
+    ASSERT(r == 0);
+  }
+
+  /* anything >255 should fail */
+  r = uv_udp_set_ttl(&h, 256);
+  ASSERT(r == -1);
+  ASSERT(uv_last_error(loop).code == UV_EINVAL);
+  /* don't test ttl=-1, it's a valid value on some platforms */
+
+  r = uv_udp_set_multicast_loop(&h, 1);
+  r |= uv_udp_set_multicast_loop(&h, 1);
+  r |= uv_udp_set_multicast_loop(&h, 0);
+  r |= uv_udp_set_multicast_loop(&h, 0);
+  ASSERT(r == 0);
+
+  /* values 0-255 should work */
+  for (i = 0; i <= 255; i++) {
+    r = uv_udp_set_multicast_ttl(&h, i);
+    ASSERT(r == 0);
+  }
+
+  /* anything >255 should fail */
+  r = uv_udp_set_multicast_ttl(&h, 256);
+  ASSERT(r == -1);
+  ASSERT(uv_last_error(loop).code == UV_EINVAL);
+  /* don't test ttl=-1, it's a valid value on some platforms */
+
+  r = uv_run(loop);
+  ASSERT(r == 0);
+
+  return 0;
+}
diff --git a/uv.gyp b/uv.gyp
index dc0c0f3a..1bc9ff9b 100644
--- a/uv.gyp
+++ b/uv.gyp
@@ -317,6 +317,7 @@
         'test/test-tty.c',
         'test/test-udp-dgram-too-big.c',
         'test/test-udp-ipv6.c',
+        'test/test-udp-options.c',
         'test/test-udp-send-and-recv.c',
         'test/test-udp-multicast-join.c',
         'test/test-counters-init.c',