diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index a84f74307f..9a031b65c0 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -5903,18 +5903,24 @@ void tls13_server_certificate_msg_invalid_vector_len( )
     int step = 0;
     int expected_result;
     mbedtls_ssl_chk_buf_ptr_args expected_chk_buf_ptr_args;
+    handshake_test_options client_options;
+    handshake_test_options server_options;
 
     /*
      * Test set-up
      */
     USE_PSA_INIT( );
 
+    init_handshake_options( &client_options );
+    client_options.pk_alg = MBEDTLS_PK_ECDSA;
     ret = mbedtls_endpoint_init( &client_ep, MBEDTLS_SSL_IS_CLIENT,
-                                 MBEDTLS_PK_ECDSA, NULL, NULL, NULL, NULL );
+                                 &client_options, NULL, NULL, NULL, NULL );
     TEST_EQUAL( ret, 0 );
 
+    init_handshake_options( &server_options );
+    server_options.pk_alg = MBEDTLS_PK_ECDSA;
     ret = mbedtls_endpoint_init( &server_ep, MBEDTLS_SSL_IS_SERVER,
-                                 MBEDTLS_PK_ECDSA, NULL, NULL, NULL, NULL );
+                                 &server_options, NULL, NULL, NULL, NULL );
     TEST_EQUAL( ret, 0 );
 
     ret = mbedtls_mock_socket_connect( &(client_ep.socket),
@@ -5974,6 +5980,8 @@ exit:
     mbedtls_ssl_reset_chk_buf_ptr_fail_args( );
     mbedtls_endpoint_free( &client_ep, NULL );
     mbedtls_endpoint_free( &server_ep, NULL );
+    free_handshake_options( &client_options );
+    free_handshake_options( &server_options );
     USE_PSA_DONE( );
 }
 /* END_CASE */