diff --git a/examples/security/tee/tee_basic/components/example_secure_service/example_service.c b/examples/security/tee/tee_basic/components/example_secure_service/example_service.c
index fe92bde32f6..55e5b42a309 100644
--- a/examples/security/tee/tee_basic/components/example_secure_service/example_service.c
+++ b/examples/security/tee/tee_basic/components/example_secure_service/example_service.c
@@ -93,14 +93,14 @@ static esp_err_t aes_gcm_crypt_common(example_aes_gcm_ctx_t *ctx, uint8_t *tag,
 
     if (is_encrypt) {
         size_t output_tag_len = 0;
-        status = psa_aead_finish(&operation, output + output_len, ctx->input_len + tag_len - output_len, &output_len, tag, tag_len, &output_tag_len);
+        status = psa_aead_finish(&operation, output + output_len, ctx->input_len - output_len, &output_len, tag, tag_len, &output_tag_len);
         if (status != PSA_SUCCESS) {
             ESP_LOGE(TAG, "Error in finishing encryption: %d", status);
             goto cleanup;
         }
     } else {
         size_t plaintext_len = 0;
-        status = psa_aead_verify(&operation, output, ctx->input_len, &plaintext_len, tag, tag_len);
+        status = psa_aead_verify(&operation, output + output_len, ctx->input_len - output_len, &plaintext_len, tag, tag_len);
         if (status != PSA_SUCCESS) {
             ESP_LOGE(TAG, "Error in verifying decryption: %d", status);
             goto cleanup;
diff --git a/examples/security/tee/tee_basic/main/tee_main.c b/examples/security/tee/tee_basic/main/tee_main.c
index 22f58a1923d..f719029248a 100644
--- a/examples/security/tee/tee_basic/main/tee_main.c
+++ b/examples/security/tee/tee_basic/main/tee_main.c
@@ -45,7 +45,7 @@ void app_main(void)
     uint8_t aad_buf[AES256_GCM_AAD_LEN];
 
     /* Generate random plaintext and AAD */
-    esp_fill_random(plain_text, sizeof(EXAMPLE_BUF_SZ));
+    esp_fill_random(plain_text, sizeof(plain_text));
     esp_fill_random(aad_buf, AES256_GCM_AAD_LEN);
 
     /* Encryption operation */
diff --git a/examples/security/tee/tee_basic/pytest_tee_basic.py b/examples/security/tee/tee_basic/pytest_tee_basic.py
index 2cea20f4a4f..69bf3e8ad70 100644
--- a/examples/security/tee/tee_basic/pytest_tee_basic.py
+++ b/examples/security/tee/tee_basic/pytest_tee_basic.py
@@ -24,9 +24,8 @@ def test_example_tee_basic(dut: Dut) -> None:
         logging.info(f'{log_label}: {bin_size // 1024}KB')
 
     # Start test
-    dut.expect('AES-256-GCM operations in TEE', timeout=10)
     dut.expect('Secure service call: PROTECTED M-mode', timeout=10)
     dut.expect('AES-256-GCM encryption', timeout=10)
     dut.expect('Secure service call: PROTECTED M-mode', timeout=10)
-    dut.expect('AES-256-GCM decryption', timeout=10)
+    dut.expect('AES-GCM decryption successful!', timeout=10)
     dut.expect('Returned from app_main()', timeout=10)