diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 1fbc8ad1e..bd9b69054 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -1287,7 +1287,9 @@ run_test    "(STUB) Connection ID: Client enabled, server disabled" \
             -c "Enable use of CID extension."  \
             -c "client hello, adding CID extension" \
             -S "server hello, adding CID extension" \
-            -C "found CID extension"
+            -C "found CID extension" \
+            -S "Copy CIDs into SSL transform" \
+            -C "Copy CIDs into SSL transform"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client disabled, server enabled" \
@@ -1299,7 +1301,9 @@ run_test    "(STUB) Connection ID: Client disabled, server enabled" \
             -S "found CID extension"           \
             -s "Enable use of CID extension." \
             -S "server hello, adding CID extension" \
-            -C "found CID extension"
+            -C "found CID extension" \
+            -S "Copy CIDs into SSL transform" \
+            -C "Copy CIDs into SSL transform"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID nonempty" \
@@ -1313,7 +1317,9 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID none
             -s "Use of CID extension negotiated" \
             -s "server hello, adding CID extension" \
             -c "found CID extension" \
-            -c "Use of CID extension negotiated"
+            -c "Use of CID extension negotiated" \
+            -s "Copy CIDs into SSL transform" \
+            -c "Copy CIDs into SSL transform"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty" \
@@ -1327,7 +1333,9 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty" \
             -s "Use of CID extension negotiated" \
             -s "server hello, adding CID extension" \
             -c "found CID extension" \
-            -c "Use of CID extension negotiated"
+            -c "Use of CID extension negotiated" \
+            -s "Copy CIDs into SSL transform" \
+            -c "Copy CIDs into SSL transform"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty" \
@@ -1341,7 +1349,9 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty" \
             -s "Use of CID extension negotiated" \
             -s "server hello, adding CID extension" \
             -c "found CID extension" \
-            -c "Use of CID extension negotiated"
+            -c "Use of CID extension negotiated" \
+            -s "Copy CIDs into SSL transform" \
+            -c "Copy CIDs into SSL transform"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty" \
@@ -1355,7 +1365,9 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empt
             -s "Use of CID extension negotiated" \
             -s "server hello, adding CID extension" \
             -c "found CID extension" \
-            -c "Use of CID extension negotiated"
+            -c "Use of CID extension negotiated" \
+            -s "Copy CIDs into SSL transform" \
+            -c "Copy CIDs into SSL transform"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID nonempty, AES-128-CCM-8" \
@@ -1369,7 +1381,9 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID none
             -s "Use of CID extension negotiated" \
             -s "server hello, adding CID extension" \
             -c "found CID extension" \
-            -c "Use of CID extension negotiated"
+            -c "Use of CID extension negotiated" \
+            -s "Copy CIDs into SSL transform" \
+            -c "Copy CIDs into SSL transform"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CCM-8" \
@@ -1383,7 +1397,9 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-
             -s "Use of CID extension negotiated" \
             -s "server hello, adding CID extension" \
             -c "found CID extension" \
-            -c "Use of CID extension negotiated"
+            -c "Use of CID extension negotiated" \
+            -s "Copy CIDs into SSL transform" \
+            -c "Copy CIDs into SSL transform"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CCM-8" \
@@ -1397,7 +1413,9 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-
             -s "Use of CID extension negotiated" \
             -s "server hello, adding CID extension" \
             -c "found CID extension" \
-            -c "Use of CID extension negotiated"
+            -c "Use of CID extension negotiated" \
+            -s "Copy CIDs into SSL transform" \
+            -c "Copy CIDs into SSL transform"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CCM-8" \
@@ -1411,7 +1429,9 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empt
             -s "Use of CID extension negotiated" \
             -s "server hello, adding CID extension" \
             -c "found CID extension" \
-            -c "Use of CID extension negotiated"
+            -c "Use of CID extension negotiated" \
+            -s "Copy CIDs into SSL transform" \
+            -c "Copy CIDs into SSL transform"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID nonempty, AES-128-CBC" \
@@ -1425,7 +1445,9 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID none
             -s "Use of CID extension negotiated" \
             -s "server hello, adding CID extension" \
             -c "found CID extension" \
-            -c "Use of CID extension negotiated"
+            -c "Use of CID extension negotiated" \
+            -s "Copy CIDs into SSL transform" \
+            -c "Copy CIDs into SSL transform"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CBC" \
@@ -1439,7 +1461,9 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-
             -s "Use of CID extension negotiated" \
             -s "server hello, adding CID extension" \
             -c "found CID extension" \
-            -c "Use of CID extension negotiated"
+            -c "Use of CID extension negotiated" \
+            -s "Copy CIDs into SSL transform" \
+            -c "Copy CIDs into SSL transform"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CBC" \
@@ -1453,7 +1477,9 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-
             -s "Use of CID extension negotiated" \
             -s "server hello, adding CID extension" \
             -c "found CID extension" \
-            -c "Use of CID extension negotiated"
+            -c "Use of CID extension negotiated" \
+            -s "Copy CIDs into SSL transform" \
+            -c "Copy CIDs into SSL transform"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CBC" \
@@ -1467,7 +1493,9 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empt
             -s "Use of CID extension negotiated" \
             -s "server hello, adding CID extension" \
             -c "found CID extension" \
-            -c "Use of CID extension negotiated"
+            -c "Use of CID extension negotiated" \
+            -s "Copy CIDs into SSL transform" \
+            -c "Copy CIDs into SSL transform"
 
 requires_config_enabled MBEDTLS_SSL_CID
 requires_config_enabled MBEDTLS_SSL_RENEGOTIATION
@@ -1482,7 +1510,9 @@ run_test    "(STUB) Connection ID: Client+Server enabled, renegotiate" \
             -s "Use of CID extension negotiated" \
             -s "server hello, adding CID extension" \
             -c "found CID extension" \
-            -c "Use of CID extension negotiated"
+            -c "Use of CID extension negotiated" \
+            -s "Copy CIDs into SSL transform" \
+            -c "Copy CIDs into SSL transform"
 
 # Tests for Encrypt-then-MAC extension