3 files changed, 6 insertions, 5 deletions
diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c
index a5a3d0ea7e..0dd752d841 100644
--- a/test/core/iomgr/tcp_client_posix_test.c
+++ b/test/core/iomgr/tcp_client_posix_test.c
@@ -223,8 +223,9 @@ void test_times_out(void) {
   for (;;) {
     grpc_pollset_worker worker;
     gpr_timespec now = gpr_now(connect_deadline.clock_type);
-    gpr_timespec continue_verifying_time = gpr_time_from_seconds(2, GPR_TIMESPAN);
-    gpr_timespec grace_time = gpr_time_from_seconds(1, GPR_TIMESPAN);
+    gpr_timespec continue_verifying_time =
+        gpr_time_from_seconds(5, GPR_TIMESPAN);
+    gpr_timespec grace_time = gpr_time_from_seconds(3, GPR_TIMESPAN);
     gpr_timespec finish_time = gpr_time_add(connect_deadline, continue_verifying_time);
     gpr_timespec restart_verifying_time = gpr_time_add(connect_deadline, grace_time);
     int is_after_deadline = gpr_time_cmp(now, connect_deadline) > 0;
@@ -244,7 +245,7 @@ void test_times_out(void) {
                       GRPC_TIMEOUT_MILLIS_TO_DEADLINE(10), &call_list);
     gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset));
     grpc_call_list_run(&call_list);
-    gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset));
+    gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset));
   }
   gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset));
 
diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c
index 75026f651c..b80506bc51 100644
--- a/test/core/iomgr/tcp_server_posix_test.c
+++ b/test/core/iomgr/tcp_server_posix_test.c
@@ -101,7 +101,7 @@ static void test_no_op_with_port_and_start(void) {
 
   grpc_tcp_server_start(s, NULL, 0, on_connect, NULL, &call_list);
 
-  grpc_tcp_server_destroy(s, NULL, NULL);
+  grpc_tcp_server_destroy(s, NULL, &call_list);
   grpc_call_list_run(&call_list);
 }
 
diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c
index 476dfd63bc..86b6b9a9fa 100644
--- a/test/core/iomgr/udp_server_test.c
+++ b/test/core/iomgr/udp_server_test.c
@@ -103,7 +103,7 @@ static void test_no_op_with_port_and_start(void) {
 
   grpc_udp_server_start(s, NULL, 0, &call_list);
 
-  grpc_udp_server_destroy(s, NULL, NULL);
+  grpc_udp_server_destroy(s, NULL, &call_list);
   grpc_call_list_run(&call_list);
 }