diff --git a/test/core/transport/connectivity_state_test.c b/test/core/transport/connectivity_state_test.c
index d2341beb657..6cb7937ebe9 100644
--- a/test/core/transport/connectivity_state_test.c
+++ b/test/core/transport/connectivity_state_test.c
@@ -39,9 +39,24 @@
 
 #include "test/core/util/test_config.h"
 
-#define LOG_TEST(x) gpr_log(GPR_INFO, "%s", x)
+#define THE_ARG ((void*)0xcafebabe)
+
+int g_counter;
+
+static void must_succeed(grpc_exec_ctx *exec_ctx, void *arg, int success) {
+	GPR_ASSERT(success);
+	GPR_ASSERT(arg == THE_ARG);
+	g_counter++;
+}
+
+static void must_fail(grpc_exec_ctx *exec_ctx, void *arg, int success) {
+	GPR_ASSERT(!success);
+	GPR_ASSERT(arg == THE_ARG);
+	g_counter++;
+}
 
 static void test_connectivity_state_name(void) {
+	gpr_log(GPR_DEBUG, "test_connectivity_state_name");
   GPR_ASSERT(0 == strcmp(grpc_connectivity_state_name(GRPC_CHANNEL_IDLE), "IDLE"));
   GPR_ASSERT(0 == strcmp(grpc_connectivity_state_name(GRPC_CHANNEL_CONNECTING), "CONNECTING"));
   GPR_ASSERT(0 == strcmp(grpc_connectivity_state_name(GRPC_CHANNEL_READY), "READY"));
@@ -49,9 +64,80 @@ static void test_connectivity_state_name(void) {
   GPR_ASSERT(0 == strcmp(grpc_connectivity_state_name(GRPC_CHANNEL_FATAL_FAILURE), "FATAL_FAILURE"));
 }
 
+static void test_check(void) {
+	grpc_connectivity_state_tracker tracker;
+	grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
+	gpr_log(GPR_DEBUG, "test_check");
+	grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx");
+	GPR_ASSERT(grpc_connectivity_state_check(&tracker) == GRPC_CHANNEL_IDLE);
+	grpc_connectivity_state_destroy(&exec_ctx, &tracker);
+	grpc_exec_ctx_finish(&exec_ctx);
+}
+
+static void test_subscribe_then_unsubscribe(void) {
+	grpc_connectivity_state_tracker tracker;
+	grpc_closure *closure = grpc_closure_create(must_fail, THE_ARG);
+	grpc_connectivity_state state = GRPC_CHANNEL_IDLE;
+	grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
+	gpr_log(GPR_DEBUG, "test_subscribe_then_unsubscribe");
+	g_counter = 0;
+	grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx");
+	GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&exec_ctx, &tracker, &state, closure));
+	grpc_exec_ctx_flush(&exec_ctx);
+	GPR_ASSERT(state == GRPC_CHANNEL_IDLE);
+	GPR_ASSERT(g_counter == 0);
+	grpc_connectivity_state_notify_on_state_change(&exec_ctx, &tracker, NULL, closure);
+	grpc_exec_ctx_flush(&exec_ctx);
+	GPR_ASSERT(state == GRPC_CHANNEL_IDLE);
+	GPR_ASSERT(g_counter == 1);
+
+	grpc_connectivity_state_destroy(&exec_ctx, &tracker);
+	grpc_exec_ctx_finish(&exec_ctx);
+}
+
+static void test_subscribe_then_destroy(void) {
+	grpc_connectivity_state_tracker tracker;
+	grpc_closure *closure = grpc_closure_create(must_succeed, THE_ARG);
+	grpc_connectivity_state state = GRPC_CHANNEL_IDLE;
+	grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
+	gpr_log(GPR_DEBUG, "test_subscribe_then_destroy");
+	g_counter = 0;
+	grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_IDLE, "xxx");
+	GPR_ASSERT(grpc_connectivity_state_notify_on_state_change(&exec_ctx, &tracker, &state, closure));
+	grpc_exec_ctx_flush(&exec_ctx);
+	GPR_ASSERT(state == GRPC_CHANNEL_IDLE);
+	GPR_ASSERT(g_counter == 0);
+	grpc_connectivity_state_destroy(&exec_ctx, &tracker);
+	grpc_exec_ctx_finish(&exec_ctx);
+	GPR_ASSERT(state == GRPC_CHANNEL_FATAL_FAILURE);
+	GPR_ASSERT(g_counter == 1);
+}
+
+static void test_subscribe_with_failure_then_destroy(void) {
+	grpc_connectivity_state_tracker tracker;
+	grpc_closure *closure = grpc_closure_create(must_fail, THE_ARG);
+	grpc_connectivity_state state = GRPC_CHANNEL_FATAL_FAILURE;
+	grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
+	gpr_log(GPR_DEBUG, "test_subscribe_with_failure_then_destroy");
+	g_counter = 0;
+	grpc_connectivity_state_init(&tracker, GRPC_CHANNEL_FATAL_FAILURE, "xxx");
+	GPR_ASSERT(0 == grpc_connectivity_state_notify_on_state_change(&exec_ctx, &tracker, &state, closure));
+	grpc_exec_ctx_flush(&exec_ctx);
+	GPR_ASSERT(state == GRPC_CHANNEL_FATAL_FAILURE);
+	GPR_ASSERT(g_counter == 0);
+	grpc_connectivity_state_destroy(&exec_ctx, &tracker);
+	grpc_exec_ctx_finish(&exec_ctx);
+	GPR_ASSERT(state == GRPC_CHANNEL_FATAL_FAILURE);
+	GPR_ASSERT(g_counter == 1);
+}
+
 int main(int argc, char **argv) {
   grpc_test_init(argc, argv);
   grpc_connectivity_state_trace = 1;
   test_connectivity_state_name();
+  test_check();
+  test_subscribe_then_unsubscribe();
+  test_subscribe_then_destroy();
+  test_subscribe_with_failure_then_destroy();
   return 0;
 }