diff --git a/configs/baremetal.h b/configs/baremetal.h
index 11cb579d76..3d3225e223 100644
--- a/configs/baremetal.h
+++ b/configs/baremetal.h
@@ -80,6 +80,7 @@
 #define MBEDTLS_SSL_DTLS_ANTI_REPLAY
 #define MBEDTLS_SSL_DTLS_HELLO_VERIFY
 #define MBEDTLS_SSL_DTLS_BADMAC_LIMIT
+#define MBEDTLS_SSL_CID
 
 /* X.509 CRT parsing */
 #define MBEDTLS_X509_USE_C
diff --git a/scripts/baremetal.sh b/scripts/baremetal.sh
index 9ab40aacd3..86fac56873 100755
--- a/scripts/baremetal.sh
+++ b/scripts/baremetal.sh
@@ -177,9 +177,9 @@ baremetal_ram_build() {
 baremetal_ram_heap() {
 
     : ${CLI:=./programs/ssl/ssl_client2}
-    : ${CLI_PARAMS:="dtls=1"}
+    : ${CLI_PARAMS:="dtls=1 cid=1 cid_val=beef"}
     : ${SRV:=./programs/ssl/ssl_server2}
-    : ${SRV_PARAMS:="dtls=1 renegotiation=1 auth_mode=required"}
+    : ${SRV_PARAMS:="dtls=1 renegotiation=1 auth_mode=required cid=1 cid_val=dead"}
     : ${VALGRIND:=valgrind}
     : ${VALGRIND_MASSIF_PARAMS="--time-unit=B --threshold=0.01 --detailed-freq=1"}