diff --git a/tests/suites/test_suite_ssl.data b/tests/suites/test_suite_ssl.data
index 7b9a81ce17..eecb4abfbd 100644
--- a/tests/suites/test_suite_ssl.data
+++ b/tests/suites/test_suite_ssl.data
@@ -3601,3 +3601,6 @@ tls13_record_boundary_alignment:MBEDTLS_SSL_IS_CLIENT:MBEDTLS_SSL_HS_SERVER_HELL
 
 TLS 1.3 server Finished record boundary alignement enforcement
 tls13_record_boundary_alignment:MBEDTLS_SSL_IS_CLIENT:MBEDTLS_SSL_HS_FINISHED
+
+TLS 1.3 client Finished record boundary alignement enforcement
+tls13_record_boundary_alignment:MBEDTLS_SSL_IS_SERVER:MBEDTLS_SSL_HS_FINISHED
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 617cbd58ae..e4857e0b21 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -6997,6 +6997,9 @@ void tls13_record_boundary_alignment(int endpoint, int handshake_message)
             if (endpoint == MBEDTLS_SSL_IS_CLIENT) {
                 target_state = MBEDTLS_SSL_SERVER_FINISHED;
                 peer_target_state = MBEDTLS_SSL_CLIENT_CERTIFICATE;
+            } else {
+                target_state = MBEDTLS_SSL_CLIENT_FINISHED;
+                peer_target_state = MBEDTLS_SSL_FLUSH_BUFFERS;
             }
             encrypted = 1;
             break;