diff --git a/tests/dtls-client.c b/tests/dtls-client.c
index bb27367b..61177e4a 100644
--- a/tests/dtls-client.c
+++ b/tests/dtls-client.c
@@ -69,7 +69,9 @@ static dtls_context_t *orig_dtls_context = NULL;
 static const dtls_cipher_t* ciphers = NULL;
 static unsigned int force_extended_master_secret = 0;
 static unsigned int force_renegotiation_info = 0;
-
+#if (DTLS_MAX_CID_LENGTH > 0)
+static unsigned int support_cid = 0;
+#endif
 
 #ifdef DTLS_ECC
 static const unsigned char ecdsa_priv_key[] = {
@@ -246,6 +248,9 @@ get_user_parameters(struct dtls_context_t *ctx,
   (void) session;
   user_parameters->force_extended_master_secret = force_extended_master_secret;
   user_parameters->force_renegotiation_info = force_renegotiation_info;
+#if (DTLS_MAX_CID_LENGTH > 0)
+  user_parameters->support_cid = support_cid;
+#endif
   if (ciphers) {
     int i = 0;
     while (i < DTLS_MAX_CIPHER_SUITES) {
@@ -360,13 +365,18 @@ usage( const char *program, const char *version) {
 
   fprintf(stderr, "%s v%s -- DTLS client implementation\n"
           "(c) 2011-2014 Olaf Bergmann <bergmann@tzi.org>\n\n"
+          "usage: %s [-c cipher suites] [-e] "
 #ifdef DTLS_PSK
-          "usage: %s [-c cipher suites] [-e] [-i file] [-k file] [-o file]\n"
-          "       %*s [-p port] [-r] [-v num] addr [port]\n",
+          "[-i file] [-k file] [-o file]\n"
+          "       %*s [-p port] [-r] [-v num]"
 #else /*  DTLS_PSK */
-          "usage: %s [-c cipher suites] [-e] [-o file] [-p port] [-r]\n"
-          "       %*s [-v num] addr [port]\n",
+          "[-o file] [-p port] [-r]\n"
+          "       %*s [-v num]"
 #endif /* DTLS_PSK */
+#if (DTLS_MAX_CID_LENGTH > 0)
+          " [-z]"
+#endif /* DTLS_MAX_CID_LENGTH > 0*/
+          " addr [port]\n",
           program, version, program, (int)strlen(program), "");
   cipher_suites_usage(stderr, "\t");
   fprintf(stderr, "\t-e\t\tforce extended master secret (RFC7627)\n"
@@ -378,7 +388,10 @@ usage( const char *program, const char *version) {
           "\t       \t\t(use '-' for STDOUT)\n"
           "\t-p port\t\tlisten on specified port (default is %d)\n"
           "\t-r\t\tforce renegotiation info (RFC5746)\n"
-          "\t-v num\t\tverbosity level (default: 3)\n",
+          "\t-v num\t\tverbosity level (default: 3)\n"
+#if (DTLS_MAX_CID_LENGTH > 0)
+          "\t-z\t\tsupport CID (RFC9146)\n",
+#endif /* DTLS_MAX_CID_LENGTH > 0*/
           DEFAULT_PORT);
 }
 
@@ -434,7 +447,7 @@ main(int argc, char **argv) {
   memcpy(psk_key, PSK_DEFAULT_KEY, psk_key_length);
 #endif /* DTLS_PSK */
 
-  while ((opt = getopt(argc, argv, "c:eo:p:rv:" PSK_OPTIONS)) != -1) {
+  while ((opt = getopt(argc, argv, "c:eo:p:rv:z" PSK_OPTIONS)) != -1) {
     switch (opt) {
 #ifdef DTLS_PSK
     case 'i' :
@@ -482,6 +495,11 @@ main(int argc, char **argv) {
     case 'v' :
       log_level = strtol(optarg, NULL, 10);
       break;
+#if (DTLS_MAX_CID_LENGTH > 0)
+    case 'z' :
+      support_cid = 1;
+      break;
+#endif /* DTLS_MAX_CID_LENGTH > 0*/
     default:
       usage(argv[0], dtls_package_version());
       exit(1);