11 files changed, 12 insertions, 11 deletions
diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c
index 01fcb9275e..48534ce060 100644
--- a/test/core/bad_client/bad_client.c
+++ b/test/core/bad_client/bad_client.c
@@ -168,6 +168,6 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator,
   grpc_completion_queue_destroy(a.cq);
   gpr_slice_buffer_destroy(&outgoing);
 
-  grpc_workqueue_unref(workqueue);
+  GRPC_WORKQUEUE_UNREF(workqueue, "destroy");
   grpc_shutdown();
 }
diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c
index 13cc6b4d99..16dc704405 100644
--- a/test/core/end2end/fixtures/h2_sockpair+trace.c
+++ b/test/core/end2end/fixtures/h2_sockpair+trace.c
@@ -171,7 +171,7 @@ int main(int argc, char **argv) {
     grpc_end2end_tests(configs[i]);
   }
 
-  grpc_workqueue_unref(g_workqueue);
+  GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy");
   grpc_shutdown();
 
   return 0;
diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c
index 044c9e47b0..9d7e973b8e 100644
--- a/test/core/end2end/fixtures/h2_sockpair.c
+++ b/test/core/end2end/fixtures/h2_sockpair.c
@@ -157,7 +157,8 @@ int main(int argc, char **argv) {
     grpc_end2end_tests(configs[i]);
   }
 
-  grpc_workqueue_unref(g_workqueue);
+  grpc_workqueue_flush(g_workqueue, 1);
+  GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy");
   grpc_shutdown();
 
   return 0;
diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c
index 0fec408c30..2a3002bc57 100644
--- a/test/core/end2end/fixtures/h2_sockpair_1byte.c
+++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c
@@ -157,7 +157,7 @@ int main(int argc, char **argv) {
     grpc_end2end_tests(configs[i]);
   }
 
-  grpc_workqueue_unref(g_workqueue);
+  GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy");
   grpc_shutdown();
 
   return 0;
diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c
index 3c1c50e3c4..9fe54771bd 100644
--- a/test/core/iomgr/endpoint_pair_test.c
+++ b/test/core/iomgr/endpoint_pair_test.c
@@ -74,7 +74,7 @@ int main(int argc, char **argv) {
   g_workqueue = grpc_workqueue_create();
   grpc_endpoint_tests(configs[0], &g_pollset);
   grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset);
-  grpc_workqueue_unref(g_workqueue);
+  GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy");
   grpc_shutdown();
 
   return 0;
diff --git a/test/core/iomgr/fd_conservation_posix_test.c b/test/core/iomgr/fd_conservation_posix_test.c
index f5fd3b017d..30852050ce 100644
--- a/test/core/iomgr/fd_conservation_posix_test.c
+++ b/test/core/iomgr/fd_conservation_posix_test.c
@@ -61,7 +61,7 @@ int main(int argc, char **argv) {
     grpc_endpoint_destroy(p.server);
   }
 
-  grpc_workqueue_unref(workqueue);
+  GRPC_WORKQUEUE_UNREF(workqueue, "destroy");
   grpc_iomgr_shutdown();
   return 0;
 }
diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c
index 8b68439dce..0f9b323e77 100644
--- a/test/core/iomgr/fd_posix_test.c
+++ b/test/core/iomgr/fd_posix_test.c
@@ -495,7 +495,7 @@ int main(int argc, char **argv) {
   test_grpc_fd();
   test_grpc_fd_change();
   grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset);
-  grpc_workqueue_unref(g_workqueue);
+  GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy");
   grpc_iomgr_shutdown();
   return 0;
 }
diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c
index c73347b94f..4a6786c0a2 100644
--- a/test/core/iomgr/tcp_client_posix_test.c
+++ b/test/core/iomgr/tcp_client_posix_test.c
@@ -247,7 +247,7 @@ int main(int argc, char **argv) {
   test_times_out();
   grpc_pollset_set_destroy(&g_pollset_set);
   grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset);
-  grpc_workqueue_unref(g_workqueue);
+  GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy");
   grpc_shutdown();
   return 0;
 }
diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c
index 6d080c2b97..01162eb225 100644
--- a/test/core/iomgr/tcp_posix_test.c
+++ b/test/core/iomgr/tcp_posix_test.c
@@ -479,7 +479,7 @@ int main(int argc, char **argv) {
   grpc_pollset_init(&g_pollset);
   run_tests();
   grpc_endpoint_tests(configs[0], &g_pollset);
-  grpc_workqueue_unref(g_workqueue);
+  GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy");
   grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset);
   grpc_shutdown();
 
diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c
index 99a9de7c9d..5663af80e8 100644
--- a/test/core/iomgr/workqueue_test.c
+++ b/test/core/iomgr/workqueue_test.c
@@ -66,7 +66,7 @@ static void test_add_closure(void) {
   GPR_ASSERT(done);
   gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset));
 
-  grpc_workqueue_unref(wq);
+  GRPC_WORKQUEUE_UNREF(wq, "destroy");
 }
 
 static void done_shutdown(void *arg) { grpc_pollset_destroy(arg); }
diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c
index 67fa9322a7..e0bdea527a 100644
--- a/test/core/security/secure_endpoint_test.c
+++ b/test/core/security/secure_endpoint_test.c
@@ -170,7 +170,7 @@ int main(int argc, char **argv) {
   grpc_pollset_init(&g_pollset);
   grpc_endpoint_tests(configs[0], &g_pollset);
   test_leftover(configs[1], 1);
-  grpc_workqueue_unref(g_workqueue);
+  GRPC_WORKQUEUE_UNREF(g_workqueue, "destroy");
   grpc_pollset_shutdown(&g_pollset, destroy_pollset, &g_pollset);
   grpc_shutdown();