diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 98a589e..2088bf0 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -1282,6 +1282,8 @@
             "$P_CLI debug_level=3 dtls=1 cid=1 cid_val=deadbeef" \
             0 \
             -s "Disable use of CID extension." \
+            -s "found CID extension"           \
+            -s "Client sent CID extension, but CID disabled" \
             -c "Enable use of CID extension."  \
             -c "client hello, adding CID extension"
 
@@ -1292,6 +1294,7 @@
             0 \
             -c "Disable use of CID extension." \
             -C "client hello, adding CID extension"           \
+            -S "found CID extension"           \
             -s "Enable use of CID extension."
 
 requires_config_enabled MBEDTLS_SSL_CID
@@ -1301,7 +1304,9 @@
             0 \
             -c "Enable use of CID extension." \
             -s "Enable use of CID extension." \
-            -c "client hello, adding CID extension"
+            -c "client hello, adding CID extension" \
+            -s "found CID extension"           \
+            -s "Use of CID extension negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty" \
@@ -1310,7 +1315,9 @@
             0 \
             -c "Enable use of CID extension." \
             -s "Enable use of CID extension." \
-            -c "client hello, adding CID extension"
+            -c "client hello, adding CID extension" \
+            -s "found CID extension"           \
+            -s "Use of CID extension negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty" \
@@ -1319,7 +1326,9 @@
             0 \
             -c "Enable use of CID extension." \
             -s "Enable use of CID extension." \
-            -c "client hello, adding CID extension"
+            -c "client hello, adding CID extension" \
+            -s "found CID extension"           \
+            -s "Use of CID extension negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty" \
@@ -1328,7 +1337,9 @@
             0 \
             -c "Enable use of CID extension." \
             -s "Enable use of CID extension." \
-            -c "client hello, adding CID extension"
+            -c "client hello, adding CID extension" \
+            -s "found CID extension"           \
+            -s "Use of CID extension negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID nonempty, AES-128-CCM-8" \
@@ -1337,7 +1348,9 @@
             0 \
             -c "Enable use of CID extension." \
             -s "Enable use of CID extension." \
-            -c "client hello, adding CID extension"
+            -c "client hello, adding CID extension" \
+            -s "found CID extension"           \
+            -s "Use of CID extension negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CCM-8" \
@@ -1346,7 +1359,9 @@
             0 \
             -c "Enable use of CID extension." \
             -s "Enable use of CID extension." \
-            -c "client hello, adding CID extension"
+            -c "client hello, adding CID extension" \
+            -s "found CID extension"           \
+            -s "Use of CID extension negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CCM-8" \
@@ -1355,7 +1370,9 @@
             0 \
             -c "Enable use of CID extension." \
             -s "Enable use of CID extension." \
-            -c "client hello, adding CID extension"
+            -c "client hello, adding CID extension" \
+            -s "found CID extension"           \
+            -s "Use of CID extension negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CCM-8" \
@@ -1364,7 +1381,9 @@
             0 \
             -c "Enable use of CID extension." \
             -s "Enable use of CID extension." \
-            -c "client hello, adding CID extension"
+            -c "client hello, adding CID extension" \
+            -s "found CID extension"           \
+            -s "Use of CID extension negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID nonempty, AES-128-CBC" \
@@ -1373,7 +1392,9 @@
             0 \
             -c "Enable use of CID extension." \
             -s "Enable use of CID extension." \
-            -c "client hello, adding CID extension"
+            -c "client hello, adding CID extension" \
+            -s "found CID extension"           \
+            -s "Use of CID extension negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CBC" \
@@ -1382,7 +1403,9 @@
             0 \
             -c "Enable use of CID extension." \
             -s "Enable use of CID extension." \
-            -c "client hello, adding CID extension"
+            -c "client hello, adding CID extension" \
+            -s "found CID extension"           \
+            -s "Use of CID extension negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CBC" \
@@ -1391,7 +1414,9 @@
             0 \
             -c "Enable use of CID extension." \
             -s "Enable use of CID extension." \
-            -c "client hello, adding CID extension"
+            -c "client hello, adding CID extension" \
+            -s "found CID extension"           \
+            -s "Use of CID extension negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CBC" \
@@ -1400,7 +1425,9 @@
             0 \
             -c "Enable use of CID extension." \
             -s "Enable use of CID extension." \
-            -c "client hello, adding CID extension"
+            -c "client hello, adding CID extension" \
+            -s "found CID extension"           \
+            -s "Use of CID extension negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 requires_config_enabled MBEDTLS_SSL_RENEGOTIATION
@@ -1410,7 +1437,9 @@
             0 \
             -c "Enable use of CID extension." \
             -s "Enable use of CID extension." \
-            -c "client hello, adding CID extension"
+            -c "client hello, adding CID extension" \
+            -s "found CID extension"           \
+            -s "Use of CID extension negotiated"
 
 # Tests for Encrypt-then-MAC extension