diff --git a/tests/scripts/generate_ssl_session_reset_check.py b/tests/scripts/generate_ssl_session_reset_check.py
index 8e26d9ee1a..51ec077b0d 100755
--- a/tests/scripts/generate_ssl_session_reset_check.py
+++ b/tests/scripts/generate_ssl_session_reset_check.py
@@ -11,12 +11,11 @@ from mbedtls_framework import ssl_session_reset_check
 RULES = {
     'conf': ssl_session_reset_check.ResetBehavior.KEEP,
     'state': ssl_session_reset_check.ResetBehavior.RESET,
-    'flags': ssl_session_reset_check.ResetBehavior.SPECIAL,
     'renego_status': ssl_session_reset_check.ResetBehavior.RESET,
     'renego_records_seen': ssl_session_reset_check.ResetBehavior.RESET,
     'tls_version': ssl_session_reset_check.ResetBehavior.SPECIAL,
     'early_data_state': ssl_session_reset_check.ResetBehavior.RESET,
-    'badmac_seen': ssl_session_reset_check.ResetBehavior.RESET,
+    'badmac_seen_or_in_hsfraglen': ssl_session_reset_check.ResetBehavior.RESET,
     'f_vrfy': ssl_session_reset_check.ResetBehavior.KEEP,
     'p_vrfy': ssl_session_reset_check.ResetBehavior.KEEP,
     'f_send': ssl_session_reset_check.ResetBehavior.KEEP,
@@ -53,11 +52,8 @@ RULES = {
     'in_window_top': ssl_session_reset_check.ResetBehavior.RESET,
     'in_window': ssl_session_reset_check.ResetBehavior.RESET,
     'in_hslen': ssl_session_reset_check.ResetBehavior.RESET,
-    'in_hsfraglen': ssl_session_reset_check.ResetBehavior.RESET,
     'nb_zero': ssl_session_reset_check.ResetBehavior.RESET,
     'keep_current_message': ssl_session_reset_check.ResetBehavior.RESET,
-    'in_fatal_alert_recv': ssl_session_reset_check.ResetBehavior.RESET,
-    'in_fatal_alert_type': ssl_session_reset_check.ResetBehavior.RESET,
     'send_alert': ssl_session_reset_check.ResetBehavior.RESET,
     'alert_type': ssl_session_reset_check.ResetBehavior.RESET,
     'alert_reason': ssl_session_reset_check.ResetBehavior.RESET,
@@ -92,14 +88,9 @@ RULES = {
     'f_export_keys': ssl_session_reset_check.ResetBehavior.KEEP,
     'p_export_keys': ssl_session_reset_check.ResetBehavior.KEEP,
     'user_data': ssl_session_reset_check.ResetBehavior.SPECIAL,
-    'unused': ssl_session_reset_check.ResetBehavior.IGNORE,
 }
 
 SPECIAL_BEHAVIORS = {
-    'flags': ['TEST_EQUAL((after->flags & ~(MBEDTLS_SSL_CONTEXT_FLAGS_KEEP_AT_SESSION)), ' +
-              'initial.flags);',
-              'TEST_EQUAL((before->flags & MBEDTLS_SSL_CONTEXT_FLAGS_KEEP_AT_SESSION), ' +
-              '(after->flags & MBEDTLS_SSL_CONTEXT_FLAGS_KEEP_AT_SESSION));'],
     'tls_version': ['TEST_ASSERT(after->tls_version == after->conf->max_tls_version);'],
     'user_data': ['TEST_ASSERT(before->user_data.n == after->user_data.n);'],
     'in_buf_len': ['TEST_ASSERT(after->in_buf_len == MBEDTLS_SSL_IN_BUFFER_LEN);'],
diff --git a/tests/src/ssl_context_reset_verifier.c b/tests/src/ssl_context_reset_verifier.c
index a0fda308ec..662b20beb0 100644
--- a/tests/src/ssl_context_reset_verifier.c
+++ b/tests/src/ssl_context_reset_verifier.c
@@ -31,8 +31,6 @@ int mbedtls_test_ssl_check_context_after_session_reset(const mbedtls_ssl_context
     /* *INDENT-OFF* */
     TEST_ASSERT(before->conf == after->conf);
     TEST_ASSERT(after->state == initial.state);
-    TEST_EQUAL((after->flags & ~(MBEDTLS_SSL_CONTEXT_FLAGS_KEEP_AT_SESSION)), initial.flags);
-    TEST_EQUAL((before->flags & MBEDTLS_SSL_CONTEXT_FLAGS_KEEP_AT_SESSION), (after->flags & MBEDTLS_SSL_CONTEXT_FLAGS_KEEP_AT_SESSION));
 #if defined(MBEDTLS_SSL_RENEGOTIATION)
     TEST_ASSERT(after->renego_status == initial.renego_status);
 #endif
@@ -43,7 +41,7 @@ int mbedtls_test_ssl_check_context_after_session_reset(const mbedtls_ssl_context
 #if defined(MBEDTLS_SSL_EARLY_DATA) && defined(MBEDTLS_SSL_CLI_C)
     TEST_ASSERT(after->early_data_state == initial.early_data_state);
 #endif
-    TEST_ASSERT(after->badmac_seen == initial.badmac_seen);
+    TEST_ASSERT(after->badmac_seen_or_in_hsfraglen == initial.badmac_seen_or_in_hsfraglen);
 #if defined(MBEDTLS_X509_CRT_PARSE_C)
     TEST_ASSERT(before->f_vrfy == after->f_vrfy);
 #endif
@@ -100,11 +98,8 @@ int mbedtls_test_ssl_check_context_after_session_reset(const mbedtls_ssl_context
     TEST_ASSERT(after->in_window == initial.in_window);
 #endif
     TEST_ASSERT(after->in_hslen == initial.in_hslen);
-    TEST_ASSERT(after->in_hsfraglen == initial.in_hsfraglen);
     TEST_ASSERT(after->nb_zero == initial.nb_zero);
     TEST_ASSERT(after->keep_current_message == initial.keep_current_message);
-    TEST_ASSERT(after->in_fatal_alert_recv == initial.in_fatal_alert_recv);
-    TEST_ASSERT(after->in_fatal_alert_type == initial.in_fatal_alert_type);
     TEST_ASSERT(after->send_alert == initial.send_alert);
     TEST_ASSERT(after->alert_type == initial.alert_type);
     TEST_ASSERT(after->alert_reason == initial.alert_reason);
@@ -176,7 +171,6 @@ int mbedtls_test_ssl_check_context_after_session_reset(const mbedtls_ssl_context
     TEST_ASSERT(before->f_export_keys == after->f_export_keys);
     TEST_ASSERT(before->p_export_keys == after->p_export_keys);
     TEST_ASSERT(before->user_data.n == after->user_data.n);
-    /* unused is ignored */
     /* *INDENT-ON* */
 
     ret = 0;