diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index f8747d89fd..24b7c0c441 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -27,6 +27,8 @@ int main(void)
 }
 #else /* !MBEDTLS_SSL_TEST_IMPOSSIBLE && MBEDTLS_SSL_CLI_C */
 
+#include "test/ssl_helpers.h"
+
 /* Size of memory to be allocated for the heap, when using the library's memory
  * management and MBEDTLS_MEMORY_BUFFER_ALLOC_C is enabled. */
 #define MEMORY_HEAP_SIZE      120000
@@ -2894,12 +2896,21 @@ send_request:
         memset(peer_crt_info, 0, sizeof(peer_crt_info));
 #endif /* MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED */
 
+        /* Dump the SSL context before resetting it. This will be used below
+         * to check if the reset function worked properly. */
+        mbedtls_ssl_context ssl_before = ssl;
         if ((ret = mbedtls_ssl_session_reset(&ssl)) != 0) {
             mbedtls_printf(" failed\n  ! mbedtls_ssl_session_reset returned -0x%x\n\n",
                            (unsigned int) -ret);
             goto exit;
         }
 
+        if (mbedtls_test_ssl_check_context_after_session_reset(&ssl_before, &ssl) != 0) {
+            mbedtls_printf(
+                " failed\n  ! mbedtls_ssl_session_reset didn't properly reset ssl context\n\n");
+            goto exit;
+        }
+
         while ((ret = mbedtls_ssl_handshake(&ssl)) != 0) {
             if (ret != MBEDTLS_ERR_SSL_WANT_READ &&
                 ret != MBEDTLS_ERR_SSL_WANT_WRITE &&
diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c
index 5cbd7de006..813e25f158 100644
--- a/programs/ssl/ssl_server2.c
+++ b/programs/ssl/ssl_server2.c
@@ -57,6 +57,8 @@ int main(void)
 #include "test/psa_crypto_helpers.h"
 #endif
 
+#include "test/ssl_helpers.h"
+
 #include "mbedtls/pk.h"
 #include "mbedtls/dhm.h"
 
@@ -3372,7 +3374,15 @@ reset:
 
     mbedtls_net_free(&client_fd);
 
+    /* Dump the SSL context before resetting it. This will be used below
+     * to check if the reset function worked properly. */
+    mbedtls_ssl_context ssl_before = ssl;
     mbedtls_ssl_session_reset(&ssl);
+    if (mbedtls_test_ssl_check_context_after_session_reset(&ssl_before, &ssl) != 0) {
+        mbedtls_printf(
+            " failed\n  ! mbedtls_ssl_session_reset didn't properly reset ssl context\n\n");
+        goto exit;
+    }
 
     /*
      * 3. Wait until a client connects
diff --git a/tests/src/test_helpers/ssl_helpers.c b/tests/src/test_helpers/ssl_helpers.c
index 3cf0fc3cfa..527c69d761 100644
--- a/tests/src/test_helpers/ssl_helpers.c
+++ b/tests/src/test_helpers/ssl_helpers.c
@@ -934,6 +934,16 @@ void mbedtls_test_ssl_endpoint_free(
 {
     test_ssl_endpoint_certificate_free(ep);
 
+    mbedtls_ssl_context ssl_before;
+
+    /* Dump the SSL context before resetting it */
+    memcpy(&ssl_before, &(ep->ssl), sizeof(mbedtls_ssl_context));
+
+    mbedtls_ssl_session_reset(&(ep->ssl));
+
+    /* Check that required fields were properly reset */
+    mbedtls_test_ssl_check_context_after_session_reset(&ssl_before, &(ep->ssl));
+
     mbedtls_ssl_free(&(ep->ssl));
     mbedtls_ssl_config_free(&(ep->conf));