diff --git a/test/benchmark-multi-accept.c b/test/benchmark-multi-accept.c
index ce3f353d..3b2c16c3 100644
--- a/test/benchmark-multi-accept.c
+++ b/test/benchmark-multi-accept.c
@@ -415,7 +415,6 @@ static int test_tcp(unsigned int num_servers, unsigned int num_clients) {
 
   free(clients);
   free(servers);
-  uv_loop_delete(uv_default_loop()); /* Silence valgrind. */
 
   return 0;
 }
diff --git a/test/runner.c b/test/runner.c
index 55d2a37e..d7098123 100644
--- a/test/runner.c
+++ b/test/runner.c
@@ -24,6 +24,7 @@
 
 #include "runner.h"
 #include "task.h"
+#include "uv.h"
 
 char executable_path[PATHMAX] = { '\0' };
 
@@ -293,11 +294,14 @@ out:
  */
 int run_test_part(const char* test, const char* part) {
   task_entry_t* task;
+  int r;
 
   for (task = TASKS; task->main; task++) {
-    if (strcmp(test, task->task_name) == 0
-        && strcmp(part, task->process_name) == 0) {
-      return task->main();
+    if (strcmp(test, task->task_name) == 0 &&
+        strcmp(part, task->process_name) == 0) {
+      r = task->main();
+      uv_loop_delete(uv_default_loop());
+      return r;
     }
   }
 
diff --git a/test/test-fs-poll.c b/test/test-fs-poll.c
index 00a73b6c..4380b561 100644
--- a/test/test-fs-poll.c
+++ b/test/test-fs-poll.c
@@ -140,7 +140,6 @@ TEST_IMPL(fs_poll) {
   ASSERT(poll_cb_called == 5);
   ASSERT(timer_cb_called == 2);
   ASSERT(close_cb_called == 1);
-  uv_loop_delete(loop);
 
   return 0;
 }