7 files changed, 20 insertions, 7 deletions
diff --git a/test/core/iomgr/alarm_test.c b/test/core/iomgr/alarm_test.c
index e677ba30dd..0ccec435e6 100644
--- a/test/core/iomgr/alarm_test.c
+++ b/test/core/iomgr/alarm_test.c
@@ -55,6 +55,7 @@ void no_op_cb(void *arg, int success) {}
 typedef struct {
   gpr_cv cv;
   gpr_mu mu;
+  grpc_iomgr_closure *followup_closure;
   int counter;
   int done_success_ctr;
   int done_cancel_ctr;
@@ -81,7 +82,8 @@ static void alarm_cb(void *arg /* alarm_arg */, int success) {
   a->success = success;
   gpr_cv_signal(&a->cv);
   gpr_mu_unlock(&a->mu);
-  grpc_iomgr_add_callback(followup_cb, &a->fcb_arg);
+  grpc_iomgr_closure_init(a->followup_closure, followup_cb, &a->fcb_arg);
+  grpc_iomgr_add_callback(a->followup_closure);
 }
 
 /* Test grpc_alarm add and cancel. */
@@ -107,6 +109,7 @@ static void test_grpc_alarm(void) {
   arg.done = 0;
   gpr_mu_init(&arg.mu);
   gpr_cv_init(&arg.cv);
+  arg.followup_closure = gpr_malloc(sizeof(grpc_iomgr_closure));
   gpr_event_init(&arg.fcb_arg);
 
   grpc_alarm_init(&alarm, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(100), alarm_cb, &arg,
@@ -148,6 +151,7 @@ static void test_grpc_alarm(void) {
   }
   gpr_cv_destroy(&arg.cv);
   gpr_mu_destroy(&arg.mu);
+  gpr_free(arg.followup_closure);
 
   arg2.counter = 0;
   arg2.success = SUCCESS_NOT_SET;
@@ -156,6 +160,8 @@ static void test_grpc_alarm(void) {
   arg2.done = 0;
   gpr_mu_init(&arg2.mu);
   gpr_cv_init(&arg2.cv);
+  arg2.followup_closure = gpr_malloc(sizeof(grpc_iomgr_closure));
+
   gpr_event_init(&arg2.fcb_arg);
 
   grpc_alarm_init(&alarm_to_cancel, GRPC_TIMEOUT_MILLIS_TO_DEADLINE(100),
@@ -206,6 +212,7 @@ static void test_grpc_alarm(void) {
   }
   gpr_cv_destroy(&arg2.cv);
   gpr_mu_destroy(&arg2.mu);
+  gpr_free(arg2.followup_closure);
 
   grpc_iomgr_shutdown();
 }
diff --git a/test/core/security/fetch_oauth2.c b/test/core/security/fetch_oauth2.c
index 7a40fe0dbb..3202df3328 100644
--- a/test/core/security/fetch_oauth2.c
+++ b/test/core/security/fetch_oauth2.c
@@ -51,7 +51,8 @@ typedef struct {
   int is_done;
 } synchronizer;
 
-static void on_oauth2_response(void *user_data, grpc_mdelem **md_elems,
+static void on_oauth2_response(void *user_data,
+                               grpc_credentials_md *md_elems,
                                size_t num_md, grpc_credentials_status status) {
   synchronizer *sync = user_data;
   char *token;
@@ -60,7 +61,7 @@ static void on_oauth2_response(void *user_data, grpc_mdelem **md_elems,
     gpr_log(GPR_ERROR, "Fetching token failed.");
   } else {
     GPR_ASSERT(num_md == 1);
-    token_slice = md_elems[0]->value->slice;
+    token_slice = md_elems[0].value;
     token = gpr_malloc(GPR_SLICE_LENGTH(token_slice) + 1);
     memcpy(token, GPR_SLICE_START_PTR(token_slice),
            GPR_SLICE_LENGTH(token_slice));
diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c
index 76e69ef716..051e8607c4 100644
--- a/test/core/security/print_google_default_creds_token.c
+++ b/test/core/security/print_google_default_creds_token.c
@@ -49,7 +49,8 @@ typedef struct {
   int is_done;
 } synchronizer;
 
-static void on_metadata_response(void *user_data, grpc_mdelem **md_elems,
+static void on_metadata_response(void *user_data,
+                                 grpc_credentials_md *md_elems,
                                  size_t num_md,
                                  grpc_credentials_status status) {
   synchronizer *sync = user_data;
@@ -58,7 +59,7 @@ static void on_metadata_response(void *user_data, grpc_mdelem **md_elems,
   } else {
     GPR_ASSERT(num_md == 1);
     printf("\nGot token: %s\n\n",
-           (const char *)GPR_SLICE_START_PTR(md_elems[0]->value->slice));
+           (const char *)GPR_SLICE_START_PTR(md_elems[0].value));
   }
   gpr_mu_lock(&sync->mu);
   sync->is_done = 1;
diff --git a/test/core/support/tls_test.c b/test/core/support/tls_test.c
index 8632fd4490..0a3c28417f 100644
--- a/test/core/support/tls_test.c
+++ b/test/core/support/tls_test.c
@@ -54,6 +54,7 @@ static void thd_body(void *arg) {
     gpr_tls_set(&test_var, i);
     GPR_ASSERT(gpr_tls_get(&test_var) == i);
   }
+  gpr_tls_set(&test_var, 0);
 }
 
 /* ------------------------------------------------- */
diff --git a/test/core/util/test_config.c b/test/core/util/test_config.c
index be69fcf675..20ab67ec15 100644
--- a/test/core/util/test_config.c
+++ b/test/core/util/test_config.c
@@ -50,8 +50,9 @@ static int seed(void) { return _getpid(); }
 
 void grpc_test_init(int argc, char **argv) {
   gpr_log(GPR_DEBUG, "test slowdown: machine=%f build=%f total=%f",
-          GRPC_TEST_SLOWDOWN_MACHINE_FACTOR, GRPC_TEST_SLOWDOWN_BUILD_FACTOR,
-          GRPC_TEST_SLOWDOWN_FACTOR);
+          (double)GRPC_TEST_SLOWDOWN_MACHINE_FACTOR,
+          (double)GRPC_TEST_SLOWDOWN_BUILD_FACTOR,
+          (double)GRPC_TEST_SLOWDOWN_FACTOR);
   /* seed rng with pid, so we don't end up with the same random numbers as a
      concurrently running test binary */
   srand(seed());
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc
index 7a15591b44..f48cf953a4 100644
--- a/test/cpp/end2end/end2end_test.cc
+++ b/test/cpp/end2end/end2end_test.cc
@@ -31,6 +31,7 @@
  *
  */
 
+#include <mutex>
 #include <thread>
 
 #include "src/core/security/credentials.h"
diff --git a/test/cpp/end2end/thread_stress_test.cc b/test/cpp/end2end/thread_stress_test.cc
index 310227a29c..5ee29e40f4 100644
--- a/test/cpp/end2end/thread_stress_test.cc
+++ b/test/cpp/end2end/thread_stress_test.cc
@@ -31,6 +31,7 @@
  *
  */
 
+#include <mutex>
 #include <thread>
 
 #include "test/core/util/port.h"