diff --git a/test/test-active.c b/test/test-active.c
new file mode 100644
index 00000000..9af4fd66
--- /dev/null
+++ b/test/test-active.c
@@ -0,0 +1,82 @@
+/* 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>
+
+
+static int close_cb_called = 0;
+
+
+static void close_cb(uv_handle_t* handle) {
+  ASSERT(handle != NULL);
+  close_cb_called++;
+}
+
+
+static void timer_cb(uv_timer_t* handle, int status) {
+  ASSERT(0 && "timer_cb should not have been called");
+}
+
+
+TEST_IMPL(active) {
+  int r;
+  uv_timer_t timer;
+
+  r = uv_timer_init(uv_default_loop(), &timer);
+  ASSERT(r == 0);
+
+  ASSERT(!uv_is_active((uv_handle_t*) &timer));
+  ASSERT(!uv_is_closing((uv_handle_t*) &timer));
+
+  r = uv_timer_start(&timer, timer_cb, 1000, 0);
+  ASSERT(r == 0);
+
+  ASSERT(uv_is_active((uv_handle_t*) &timer));
+  ASSERT(!uv_is_closing((uv_handle_t*) &timer));
+
+  r = uv_timer_stop(&timer);
+  ASSERT(r == 0);
+
+  ASSERT(!uv_is_active((uv_handle_t*) &timer));
+  ASSERT(!uv_is_closing((uv_handle_t*) &timer));
+
+  r = uv_timer_start(&timer, timer_cb, 1000, 0);
+  ASSERT(r == 0);
+
+  ASSERT(uv_is_active((uv_handle_t*) &timer));
+  ASSERT(!uv_is_closing((uv_handle_t*) &timer));
+
+  uv_close((uv_handle_t*) &timer, close_cb);
+
+  ASSERT(!uv_is_active((uv_handle_t*) &timer));
+  ASSERT(uv_is_closing((uv_handle_t*) &timer));
+
+  r = uv_run(uv_default_loop());
+  ASSERT(r == 0);
+
+  ASSERT(close_cb_called == 1);
+
+  return 0;
+}
diff --git a/test/test-list.h b/test/test-list.h
index 47e47eed..1423f806 100644
--- a/test/test-list.h
+++ b/test/test-list.h
@@ -111,6 +111,7 @@ TEST_DECLARE   (pipe_ref2)
 TEST_DECLARE   (pipe_ref3)
 TEST_DECLARE   (pipe_ref4)
 TEST_DECLARE   (process_ref)
+TEST_DECLARE   (active)
 TEST_DECLARE   (async)
 TEST_DECLARE   (get_currentexe)
 TEST_DECLARE   (process_title)
@@ -328,6 +329,8 @@ TASK_LIST_START
   TEST_ENTRY  (loop_handles)
   TEST_ENTRY  (walk_handles)
 
+  TEST_ENTRY  (active)
+
   TEST_ENTRY  (async)
 
   TEST_ENTRY  (get_currentexe)
diff --git a/uv.gyp b/uv.gyp
index d076a9d7..8ce01ebf 100644
--- a/uv.gyp
+++ b/uv.gyp
@@ -228,13 +228,14 @@
         'test/test-get-loadavg.c',
         'test/task.h',
         'test/test-util.c',
+        'test/test-active.c',
         'test/test-async.c',
-        'test/test-error.c',
         'test/test-callback-stack.c',
         'test/test-callback-order.c',
         'test/test-connection-fail.c',
         'test/test-cwd-and-chdir.c',
         'test/test-delayed-accept.c',
+        'test/test-error.c',
         'test/test-fail-always.c',
         'test/test-fs.c',
         'test/test-fs-event.c',