diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index b0d2d79..74bc24a 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -9800,7 +9800,9 @@
             1 \
             -c "=> parse certificate request" \
             -c "got a certificate request" \
-            -c "<= parse certificate request"
+            -c "<= parse certificate request" \
+            -c "client state: MBEDTLS_SSL_CLIENT_CERTIFICATE" \
+            -c "client state: MBEDTLS_SSL_CLIENT_CERTIFICATE_VERIFY"
 
 requires_gnutls_tls1_3
 requires_gnutls_next_no_ticket
@@ -9814,7 +9816,9 @@
             1 \
             -c "=> parse certificate request" \
             -c "got a certificate request" \
-            -c "<= parse certificate request"
+            -c "<= parse certificate request" \
+            -c "client state: MBEDTLS_SSL_CLIENT_CERTIFICATE" \
+            -c "client state: MBEDTLS_SSL_CLIENT_CERTIFICATE_VERIFY"
 
 requires_openssl_tls1_3
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
@@ -9827,7 +9831,9 @@
             1 \
             -c "=> parse certificate request" \
             -c "got a certificate request" \
-            -c "<= parse certificate request"
+            -c "<= parse certificate request" \
+            -c "client state: MBEDTLS_SSL_CLIENT_CERTIFICATE" \
+            -c "client state: MBEDTLS_SSL_CLIENT_CERTIFICATE_VERIFY"
 
 requires_gnutls_tls1_3
 requires_gnutls_next_no_ticket
@@ -9841,7 +9847,40 @@
             1 \
             -c "=> parse certificate request" \
             -c "got a certificate request" \
-            -c "<= parse certificate request"
+            -c "<= parse certificate request" \
+            -c "client state: MBEDTLS_SSL_CLIENT_CERTIFICATE" \
+            -c "client state: MBEDTLS_SSL_CLIENT_CERTIFICATE_VERIFY"
+
+requires_openssl_tls1_3
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
+requires_config_enabled MBEDTLS_DEBUG_C
+requires_config_enabled MBEDTLS_SSL_CLI_C
+requires_config_disabled MBEDTLS_USE_PSA_CRYPTO
+run_test    "TLS 1.3: CertificateRequest check, no client certificate - openssl" \
+            "$O_NEXT_SRV -msg -tls1_3 -num_tickets 0 -no_resume_ephemeral -no_cache -no_middlebox" \
+            "$P_CLI debug_level=4 force_version=tls13 " \
+            0 \
+            -c "=> parse certificate request" \
+            -c "got no certificate request" \
+            -c "<= parse certificate request" \
+            -C "client state: MBEDTLS_SSL_CLIENT_CERTIFICATE" \
+            -C "client state: MBEDTLS_SSL_CLIENT_CERTIFICATE_VERIFY"
+
+requires_gnutls_tls1_3
+requires_gnutls_next_no_ticket
+requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
+requires_config_enabled MBEDTLS_DEBUG_C
+requires_config_enabled MBEDTLS_SSL_CLI_C
+requires_config_disabled MBEDTLS_USE_PSA_CRYPTO
+run_test    "TLS 1.3: CertificateRequest check, no client certificate - gnutls" \
+            "$G_NEXT_SRV --disable-client-cert --debug=4 --priority=NORMAL:-VERS-ALL:+VERS-TLS1.3:+CIPHER-ALL:%NO_TICKETS:%DISABLE_TLS13_COMPAT_MODE" \
+            "$P_CLI debug_level=3 min_version=tls13 max_version=tls13" \
+            0 \
+            -c "=> parse certificate request" \
+            -c "got no certificate request" \
+            -c "<= parse certificate request" \
+            -C "client state: MBEDTLS_SSL_CLIENT_CERTIFICATE" \
+            -C "client state: MBEDTLS_SSL_CLIENT_CERTIFICATE_VERIFY"
 
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
 requires_config_enabled MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE