diff --git a/tests/suites/test_suite_ssl.data b/tests/suites/test_suite_ssl.data
index 4a1ad6f496..47dadf601a 100644
--- a/tests/suites/test_suite_ssl.data
+++ b/tests/suites/test_suite_ssl.data
@@ -3592,3 +3592,6 @@ tls13_drop_early_data:1
 
 TLS 1.3 ClientHello record boundary alignment enforcement
 tls13_record_boundary_alignment:MBEDTLS_SSL_IS_SERVER:MBEDTLS_SSL_HS_CLIENT_HELLO
+
+TLS 1.3 ServerHello record boundary alignement enforcement
+tls13_record_boundary_alignment:MBEDTLS_SSL_IS_CLIENT:MBEDTLS_SSL_HS_SERVER_HELLO
diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index 8d2b3b0fd2..a83ebf8f4c 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -6912,6 +6912,13 @@ void tls13_record_boundary_alignment(int endpoint, int handshake_message)
             encrypted = 0;
             break;
 
+        case MBEDTLS_SSL_HS_SERVER_HELLO:
+            TEST_EQUAL(endpoint, MBEDTLS_SSL_IS_CLIENT);
+            target_state = MBEDTLS_SSL_SERVER_HELLO;
+            peer_target_state = MBEDTLS_SSL_ENCRYPTED_EXTENSIONS;
+            encrypted = 0;
+            break;
+
         default:
             TEST_ASSERT(0);
     }