diff --git a/host/xtest/aes_gcm_counter_overflow_test_corner.h b/host/xtest/aes_gcm_counter_overflow_test_corner.h
new file mode 100644
index 000000000..afc775ea7
--- /dev/null
+++ b/host/xtest/aes_gcm_counter_overflow_test_corner.h
@@ -0,0 +1,21 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+
+{
+	.algo = TEE_ALG_AES_GCM, .mode = TEE_MODE_DECRYPT, .key_type = TEE_TYPE_AES,
+	.key = (const uint8_t []){ 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff, 0x10, 0x21, 0x32, 0x43, 0x54, 0x65, 0x76, 0x87, 0x98, 0xa9, 0xba, 0xcb, 0xdc, 0xed, 0xfe, 0x0f, },
+	.key_len = 32,
+	.nonce = (const uint8_t []){ 0xb3, 0x7b, 0xba, 0xd1, 0x04, 0x92, 0x8a, 0xe8, 0x92, 0x21, 0xd3, 0x52, 0x0c, 0x26, 0x82, 0xe0, },
+	.nonce_len = 16,
+	.aad_incr = 0,
+	.aad = NULL,
+	.aad_len = 0,
+	.in_incr = 0,
+	.ptx = (const uint8_t []){ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00,  },
+	.ptx_len = 17,
+	.ctx = (const uint8_t []){ 0x16, 0x92, 0x9b, 0x77, 0x30, 0x51, 0xf1, 0x2b, 0x0a, 0xda, 0xc9, 0x5f, 0x65, 0xe2, 0x1a, 0x7f, 0x36, },
+	.ctx_len = 17,
+	.tag = (const uint8_t []){ 0x64, 0x85, 0x6d, 0x22, 0xe4, 0xcd, 0x19, 0x8d, 0x43, 0x7a, 0x26, 0x81, 0x1d, 0xaa, 0xce, 0xd5, },
+	.tag_len = 16,
+	.line = __LINE__,
+},
diff --git a/host/xtest/regression_4000.c b/host/xtest/regression_4000.c
index b2d52b81e..fc2cfcfc0 100644
--- a/host/xtest/regression_4000.c
+++ b/host/xtest/regression_4000.c
@@ -2913,6 +2913,7 @@ static const struct xtest_ae_case ae_cases[] = {
 #endif
 #include "aes_gcm_counter_overflow_test_encrypt.h"
 #include "aes_gcm_counter_overflow_test_decrypt.h"
+#include "aes_gcm_counter_overflow_test_corner.h"
 };
 
 static void xtest_tee_test_4005(ADBG_Case_t *c)