diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 7d6b57b..9c885da 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -1124,7 +1124,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1 cid_val=deadbeef" \
             0 \
             -s "Disable use of CID extension." \
-            -c "Enable use of CID extension."
+            -c "Enable use of CID extension."  \
+            -c "client hello, adding CID extension"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client disabled, server enabled" \
@@ -1132,6 +1133,7 @@
             "$P_CLI debug_level=3 dtls=1 cid=0" \
             0 \
             -c "Disable use of CID extension." \
+            -C "client hello, adding CID extension"           \
             -s "Enable use of CID extension."
 
 requires_config_enabled MBEDTLS_SSL_CID
@@ -1140,7 +1142,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1 cid_val=beef" \
             0 \
             -c "Enable use of CID extension." \
-            -s "Enable use of CID extension."
+            -s "Enable use of CID extension." \
+            -c "client hello, adding CID extension"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty" \
@@ -1148,7 +1151,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1" \
             0 \
             -c "Enable use of CID extension." \
-            -s "Enable use of CID extension."
+            -s "Enable use of CID extension." \
+            -c "client hello, adding CID extension"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty" \
@@ -1156,7 +1160,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1 cid_val=deadbeef" \
             0 \
             -c "Enable use of CID extension." \
-            -s "Enable use of CID extension."
+            -s "Enable use of CID extension." \
+            -c "client hello, adding CID extension"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty" \
@@ -1164,7 +1169,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1" \
             0 \
             -c "Enable use of CID extension." \
-            -s "Enable use of CID extension."
+            -s "Enable use of CID extension." \
+            -c "client hello, adding CID extension"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID nonempty, AES-128-CCM-8" \
@@ -1172,7 +1178,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1 cid_val=beef force_ciphersuite=TLS-ECDHE-ECDSA-WITH-AES-128-CCM-8" \
             0 \
             -c "Enable use of CID extension." \
-            -s "Enable use of CID extension."
+            -s "Enable use of CID extension." \
+            -c "client hello, adding CID extension"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CCM-8" \
@@ -1180,7 +1187,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1 force_ciphersuite=TLS-ECDHE-ECDSA-WITH-AES-128-CCM-8" \
             0 \
             -c "Enable use of CID extension." \
-            -s "Enable use of CID extension."
+            -s "Enable use of CID extension." \
+            -c "client hello, adding CID extension"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CCM-8" \
@@ -1188,7 +1196,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1 cid_val=deadbeef force_ciphersuite=TLS-ECDHE-ECDSA-WITH-AES-128-CCM-8" \
             0 \
             -c "Enable use of CID extension." \
-            -s "Enable use of CID extension."
+            -s "Enable use of CID extension." \
+            -c "client hello, adding CID extension"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CCM-8" \
@@ -1196,7 +1205,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1 force_ciphersuite=TLS-ECDHE-ECDSA-WITH-AES-128-CCM-8" \
             0 \
             -c "Enable use of CID extension." \
-            -s "Enable use of CID extension."
+            -s "Enable use of CID extension." \
+            -c "client hello, adding CID extension"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID nonempty, AES-128-CBC" \
@@ -1204,7 +1214,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1 cid_val=beef force_ciphersuite=TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256" \
             0 \
             -c "Enable use of CID extension." \
-            -s "Enable use of CID extension."
+            -s "Enable use of CID extension." \
+            -c "client hello, adding CID extension"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CBC" \
@@ -1212,7 +1223,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1 force_ciphersuite=TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256" \
             0 \
             -c "Enable use of CID extension." \
-            -s "Enable use of CID extension."
+            -s "Enable use of CID extension." \
+            -c "client hello, adding CID extension"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CBC" \
@@ -1220,7 +1232,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1 cid_val=deadbeef force_ciphersuite=TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256" \
             0 \
             -c "Enable use of CID extension." \
-            -s "Enable use of CID extension."
+            -s "Enable use of CID extension." \
+            -c "client hello, adding CID extension"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CBC" \
@@ -1228,7 +1241,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1 force_ciphersuite=TLS-ECDHE-ECDSA-WITH-AES-128-CBC-SHA256" \
             0 \
             -c "Enable use of CID extension." \
-            -s "Enable use of CID extension."
+            -s "Enable use of CID extension." \
+            -c "client hello, adding CID extension"
 
 requires_config_enabled MBEDTLS_SSL_CID
 requires_config_enabled MBEDTLS_SSL_RENEGOTIATION
@@ -1237,7 +1251,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1 cid_val=beef renegotiation=1 renegotiate=1" \
             0 \
             -c "Enable use of CID extension." \
-            -s "Enable use of CID extension."
+            -s "Enable use of CID extension." \
+            -c "client hello, adding CID extension"
 
 # Tests for Encrypt-then-MAC extension