diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function
index cbb29b6fb..8687a4d6f 100644
--- a/tests/suites/test_suite_ssl.function
+++ b/tests/suites/test_suite_ssl.function
@@ -3810,10 +3810,6 @@ void tls13_early_data(int scenario)
             TEST_EQUAL(mbedtls_ssl_read_early_data(&(server_ep.ssl),
                                                    buf, sizeof(buf)), early_data_len);
             TEST_MEMORY_COMPARE(buf, early_data_len, early_data, early_data_len);
-
-            TEST_EQUAL(mbedtls_test_move_handshake_to_state(
-                           &(server_ep.ssl), &(client_ep.ssl),
-                           MBEDTLS_SSL_HANDSHAKE_WRAPUP), 0);
             break;
 
         case TEST_EARLY_DATA_DEPROTECT_AND_DISCARD: /* Intentional fallthrough */
@@ -3824,6 +3820,10 @@ void tls13_early_data(int scenario)
             break;
     }
 
+    TEST_EQUAL(mbedtls_test_move_handshake_to_state(
+                   &(server_ep.ssl), &(client_ep.ssl),
+                   MBEDTLS_SSL_HANDSHAKE_OVER), 0);
+
 exit:
     mbedtls_test_ssl_endpoint_free(&client_ep, NULL);
     mbedtls_test_ssl_endpoint_free(&server_ep, NULL);