diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h
index 618d10e5bd..ad96fc3fab 100644
--- a/include/mbedtls/mbedtls_config.h
+++ b/include/mbedtls/mbedtls_config.h
@@ -386,7 +386,6 @@
 //#define MBEDTLS_GCM_ALT
 //#define MBEDTLS_NIST_KW_ALT
 //#define MBEDTLS_MD5_ALT
-//#define MBEDTLS_POLY1305_ALT
 //#define MBEDTLS_RIPEMD160_ALT
 //#define MBEDTLS_SHA1_ALT
 //#define MBEDTLS_SHA256_ALT
diff --git a/tests/include/alt-dummy/poly1305_alt.h b/tests/include/alt-dummy/poly1305_alt.h
deleted file mode 100644
index c8ed1bc060..0000000000
--- a/tests/include/alt-dummy/poly1305_alt.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* poly1305_alt.h with dummy types for MBEDTLS_POLY1305_ALT */
-/*
- *  Copyright The Mbed TLS Contributors
- *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
- */
-
-#ifndef POLY1305_ALT_H
-#define POLY1305_ALT_H
-
-typedef struct mbedtls_poly1305_context {
-    int dummy;
-}
-mbedtls_poly1305_context;
-
-
-#endif /* poly1305_alt.h */
diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/poly1305.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/poly1305.h
index 61bcaa6b64..b70bfb8db0 100644
--- a/tf-psa-crypto/drivers/builtin/include/mbedtls/poly1305.h
+++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/poly1305.h
@@ -33,8 +33,6 @@
 extern "C" {
 #endif
 
-#if !defined(MBEDTLS_POLY1305_ALT)
-
 typedef struct mbedtls_poly1305_context {
     uint32_t MBEDTLS_PRIVATE(r)[4];      /** The value for 'r' (low 128 bits of the key). */
     uint32_t MBEDTLS_PRIVATE(s)[4];      /** The value for 's' (high 128 bits of the key). */
@@ -44,10 +42,6 @@ typedef struct mbedtls_poly1305_context {
 }
 mbedtls_poly1305_context;
 
-#else  /* MBEDTLS_POLY1305_ALT */
-#include "poly1305_alt.h"
-#endif /* MBEDTLS_POLY1305_ALT */
-
 /**
  * \brief           This function initializes the specified Poly1305 context.
  *
diff --git a/tf-psa-crypto/drivers/builtin/src/poly1305.c b/tf-psa-crypto/drivers/builtin/src/poly1305.c
index c9ebe9e1da..81a484691a 100644
--- a/tf-psa-crypto/drivers/builtin/src/poly1305.c
+++ b/tf-psa-crypto/drivers/builtin/src/poly1305.c
@@ -18,8 +18,6 @@
 
 #include "mbedtls/platform.h"
 
-#if !defined(MBEDTLS_POLY1305_ALT)
-
 #define POLY1305_BLOCK_SIZE_BYTES (16U)
 
 /*
@@ -373,8 +371,6 @@ cleanup:
     return ret;
 }
 
-#endif /* MBEDTLS_POLY1305_ALT */
-
 #if defined(MBEDTLS_SELF_TEST)
 
 static const unsigned char test_keys[2][32] =