diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h
index 8748cdd..193262b 100644
--- a/include/mbedtls/mbedtls_config.h
+++ b/include/mbedtls/mbedtls_config.h
@@ -350,7 +350,6 @@
  */
 //#define MBEDTLS_TIMING_ALT
 
-//#define MBEDTLS_ARIA_ALT
 //#define MBEDTLS_CMAC_ALT
 //#define MBEDTLS_DES_ALT
 //#define MBEDTLS_NIST_KW_ALT
diff --git a/tests/include/alt-dummy/aria_alt.h b/tests/include/alt-dummy/aria_alt.h
deleted file mode 100644
index 94db8c7..0000000
--- a/tests/include/alt-dummy/aria_alt.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* aria_alt.h with dummy types for MBEDTLS_ARIA_ALT */
-/*
- *  Copyright The Mbed TLS Contributors
- *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
- */
-
-#ifndef ARIA_ALT_H
-#define ARIA_ALT_H
-
-typedef struct mbedtls_aria_context {
-    int dummy;
-}
-mbedtls_aria_context;
-
-
-#endif /* aria_alt.h */
diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/aria.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/aria.h
index c685fc3..fa175f0 100644
--- a/tf-psa-crypto/drivers/builtin/include/mbedtls/aria.h
+++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/aria.h
@@ -42,10 +42,6 @@
 extern "C" {
 #endif
 
-#if !defined(MBEDTLS_ARIA_ALT)
-// Regular implementation
-//
-
 /**
  * \brief The ARIA context-type definition.
  */
@@ -56,10 +52,6 @@
 }
 mbedtls_aria_context;
 
-#else  /* MBEDTLS_ARIA_ALT */
-#include "aria_alt.h"
-#endif /* MBEDTLS_ARIA_ALT */
-
 /**
  * \brief          This function initializes the specified ARIA context.
  *
diff --git a/tf-psa-crypto/drivers/builtin/src/aria.c b/tf-psa-crypto/drivers/builtin/src/aria.c
index d9f84cc..f1958ee 100644
--- a/tf-psa-crypto/drivers/builtin/src/aria.c
+++ b/tf-psa-crypto/drivers/builtin/src/aria.c
@@ -21,8 +21,6 @@
 
 #include "mbedtls/platform.h"
 
-#if !defined(MBEDTLS_ARIA_ALT)
-
 #include "mbedtls/platform_util.h"
 
 /*
@@ -657,7 +655,6 @@
     return 0;
 }
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
-#endif /* !MBEDTLS_ARIA_ALT */
 
 #if defined(MBEDTLS_SELF_TEST)