diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 6b6c4aebb..020abd2a3 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -1163,12 +1163,11 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID none
             -c "found CID extension" \
             -c "Use of CID extension negotiated" \
             -s "Copy CIDs into SSL transform" \
-            -c "Copy CIDs into SSL transform"
-# Uncomment once CID is fully implemented
-#            -c "Peer CID (length 2 Bytes): de ad" \
-#            -s "Peer CID (length 2 Bytes): be ef"
-#            -s "Use of Connection ID has been negotiated" \
-#            -c "Use of Connection ID has been negotiated" \
+            -c "Copy CIDs into SSL transform" \
+            -c "Peer CID (length 2 Bytes): de ad" \
+            -s "Peer CID (length 2 Bytes): be ef" \
+            -s "Use of Connection ID has been negotiated" \
+            -c "Use of Connection ID has been negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty" \
@@ -1184,12 +1183,11 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty" \
             -c "found CID extension" \
             -c "Use of CID extension negotiated" \
             -s "Copy CIDs into SSL transform" \
-            -c "Copy CIDs into SSL transform"
-# Uncomment once CID is fully implemented
-#            -c "Peer CID (length 4 Bytes): de ad be ef" \
-#            -s "Peer CID (length 0 Bytes):" \
-#            -s "Use of Connection ID has been negotiated" \
-#            -c "Use of Connection ID has been negotiated" \
+            -c "Copy CIDs into SSL transform" \
+            -c "Peer CID (length 4 Bytes): de ad be ef" \
+            -s "Peer CID (length 0 Bytes):" \
+            -s "Use of Connection ID has been negotiated" \
+            -c "Use of Connection ID has been negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty" \
@@ -1205,12 +1203,11 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty" \
             -c "found CID extension" \
             -c "Use of CID extension negotiated" \
             -s "Copy CIDs into SSL transform" \
-            -c "Copy CIDs into SSL transform"
-# Uncomment once CID is fully implemented
-#            -s "Peer CID (length 4 Bytes): de ad be ef" \
-#            -c "Peer CID (length 0 Bytes):"
-#            -s "Use of Connection ID has been negotiated" \
-#            -c "Use of Connection ID has been negotiated" \
+            -c "Copy CIDs into SSL transform" \
+            -s "Peer CID (length 4 Bytes): de ad be ef" \
+            -c "Peer CID (length 0 Bytes):" \
+            -s "Use of Connection ID has been negotiated" \
+            -c "Use of Connection ID has been negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty" \
@@ -1244,12 +1241,11 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID none
             -c "found CID extension" \
             -c "Use of CID extension negotiated" \
             -s "Copy CIDs into SSL transform" \
-            -c "Copy CIDs into SSL transform"
-# Uncomment once CID is fully implemented
-#            -c "Peer CID (length 2 Bytes): de ad" \
-#            -s "Peer CID (length 2 Bytes): be ef" \
-#            -s "Use of Connection ID has been negotiated" \
-#            -c "Use of Connection ID has been negotiated" \
+            -c "Copy CIDs into SSL transform" \
+            -c "Peer CID (length 2 Bytes): de ad" \
+            -s "Peer CID (length 2 Bytes): be ef" \
+            -s "Use of Connection ID has been negotiated" \
+            -c "Use of Connection ID has been negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CCM-8" \
@@ -1265,12 +1261,11 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-
             -c "found CID extension" \
             -c "Use of CID extension negotiated" \
             -s "Copy CIDs into SSL transform" \
-            -c "Copy CIDs into SSL transform"
-# Uncomment once CID is fully implemented
-#            -c "Peer CID (length 4 Bytes): de ad be ef" \
-#            -s "Peer CID (length 0 Bytes):" \
-#            -s "Use of Connection ID has been negotiated" \
-#            -c "Use of Connection ID has been negotiated" \
+            -c "Copy CIDs into SSL transform" \
+            -c "Peer CID (length 4 Bytes): de ad be ef" \
+            -s "Peer CID (length 0 Bytes):" \
+            -s "Use of Connection ID has been negotiated" \
+            -c "Use of Connection ID has been negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CCM-8" \
@@ -1286,12 +1281,11 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-
             -c "found CID extension" \
             -c "Use of CID extension negotiated" \
             -s "Copy CIDs into SSL transform" \
-            -c "Copy CIDs into SSL transform"
-# Uncomment once CID is fully implemented
-#            -s "Peer CID (length 4 Bytes): de ad be ef" \
-#            -c "Peer CID (length 0 Bytes):" \
-#            -s "Use of Connection ID has been negotiated" \
-#            -c "Use of Connection ID has been negotiated" \
+            -c "Copy CIDs into SSL transform" \
+            -s "Peer CID (length 4 Bytes): de ad be ef" \
+            -c "Peer CID (length 0 Bytes):" \
+            -s "Use of Connection ID has been negotiated" \
+            -c "Use of Connection ID has been negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CCM-8" \
@@ -1325,12 +1319,11 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID none
             -c "found CID extension" \
             -c "Use of CID extension negotiated" \
             -s "Copy CIDs into SSL transform" \
-            -c "Copy CIDs into SSL transform"
-# Uncomment once CID is fully implemented
-#            -c "Peer CID (length 2 Bytes): de ad" \
-#            -s "Peer CID (length 2 Bytes): be ef" \
-#            -s "Use of Connection ID has been negotiated" \
-#            -c "Use of Connection ID has been negotiated" \
+            -c "Copy CIDs into SSL transform" \
+            -c "Peer CID (length 2 Bytes): de ad" \
+            -s "Peer CID (length 2 Bytes): be ef" \
+            -s "Use of Connection ID has been negotiated" \
+            -c "Use of Connection ID has been negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-128-CBC" \
@@ -1346,12 +1339,11 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Client CID empty, AES-
             -c "found CID extension" \
             -c "Use of CID extension negotiated" \
             -s "Copy CIDs into SSL transform" \
-            -c "Copy CIDs into SSL transform"
-# Uncomment once CID is fully implemented
-#            -c "Peer CID (length 4 Bytes): de ad be ef" \
-#            -s "Peer CID (length 0 Bytes):" \
-#            -s "Use of Connection ID has been negotiated" \
-#            -c "Use of Connection ID has been negotiated" \
+            -c "Copy CIDs into SSL transform" \
+            -c "Peer CID (length 4 Bytes): de ad be ef" \
+            -s "Peer CID (length 0 Bytes):" \
+            -s "Use of Connection ID has been negotiated" \
+            -c "Use of Connection ID has been negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-128-CBC" \
@@ -1367,12 +1359,11 @@ run_test    "(STUB) Connection ID: Client+Server enabled, Server CID empty, AES-
             -c "found CID extension" \
             -c "Use of CID extension negotiated" \
             -s "Copy CIDs into SSL transform" \
-            -c "Copy CIDs into SSL transform"
-# Uncomment once CID is fully implemented
-#            -s "Peer CID (length 4 Bytes): de ad be ef" \
-#            -c "Peer CID (length 0 Bytes):" \
-#            -s "Use of Connection ID has been negotiated" \
-#            -c "Use of Connection ID has been negotiated" \
+            -c "Copy CIDs into SSL transform" \
+            -s "Peer CID (length 4 Bytes): de ad be ef" \
+            -c "Peer CID (length 0 Bytes):" \
+            -s "Use of Connection ID has been negotiated" \
+            -c "Use of Connection ID has been negotiated"
 
 requires_config_enabled MBEDTLS_SSL_CID
 run_test    "(STUB) Connection ID: Client+Server enabled, Client+Server CID empty, AES-128-CBC" \
@@ -1407,12 +1398,11 @@ run_test    "(STUB) Connection ID: Client+Server enabled, renegotiate" \
             -c "found CID extension" \
             -c "Use of CID extension negotiated" \
             -s "Copy CIDs into SSL transform" \
-            -c "Copy CIDs into SSL transform"
-# Uncomment once CID is fully implemented
-#            -c "Peer CID (length 2 Bytes): de ad" \
-#            -s "Peer CID (length 2 Bytes): be ef"
-#            -s "Use of Connection ID has been negotiated" \
-#            -c "Use of Connection ID has been negotiated" \
+            -c "Copy CIDs into SSL transform" \
+            -c "Peer CID (length 2 Bytes): de ad" \
+            -s "Peer CID (length 2 Bytes): be ef" \
+            -s "Use of Connection ID has been negotiated" \
+            -c "Use of Connection ID has been negotiated"
 
 # Tests for Encrypt-then-MAC extension