diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h
index a3185238c8..8748cdd6d0 100644
--- a/include/mbedtls/mbedtls_config.h
+++ b/include/mbedtls/mbedtls_config.h
@@ -351,7 +351,6 @@
 //#define MBEDTLS_TIMING_ALT
 
 //#define MBEDTLS_ARIA_ALT
-//#define MBEDTLS_CAMELLIA_ALT
 //#define MBEDTLS_CMAC_ALT
 //#define MBEDTLS_DES_ALT
 //#define MBEDTLS_NIST_KW_ALT
diff --git a/tests/include/alt-dummy/camellia_alt.h b/tests/include/alt-dummy/camellia_alt.h
deleted file mode 100644
index 97bc16b78f..0000000000
--- a/tests/include/alt-dummy/camellia_alt.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* camellia_alt.h with dummy types for MBEDTLS_CAMELLIA_ALT */
-/*
- *  Copyright The Mbed TLS Contributors
- *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
- */
-
-#ifndef CAMELLIA_ALT_H
-#define CAMELLIA_ALT_H
-
-typedef struct mbedtls_camellia_context {
-    int dummy;
-}
-mbedtls_camellia_context;
-
-
-#endif /* camellia_alt.h */
diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/camellia.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/camellia.h
index 557f472531..39266bf26c 100644
--- a/tf-psa-crypto/drivers/builtin/include/mbedtls/camellia.h
+++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/camellia.h
@@ -31,10 +31,6 @@
 extern "C" {
 #endif
 
-#if !defined(MBEDTLS_CAMELLIA_ALT)
-// Regular implementation
-//
-
 /**
  * \brief          CAMELLIA context structure
  */
@@ -44,10 +40,6 @@ typedef struct mbedtls_camellia_context {
 }
 mbedtls_camellia_context;
 
-#else  /* MBEDTLS_CAMELLIA_ALT */
-#include "camellia_alt.h"
-#endif /* MBEDTLS_CAMELLIA_ALT */
-
 /**
  * \brief          Initialize a CAMELLIA context.
  *
diff --git a/tf-psa-crypto/drivers/builtin/src/camellia.c b/tf-psa-crypto/drivers/builtin/src/camellia.c
index b1c0a08ca2..d863699f19 100644
--- a/tf-psa-crypto/drivers/builtin/src/camellia.c
+++ b/tf-psa-crypto/drivers/builtin/src/camellia.c
@@ -22,8 +22,6 @@
 
 #include "mbedtls/platform.h"
 
-#if !defined(MBEDTLS_CAMELLIA_ALT)
-
 static const unsigned char SIGMA_CHARS[6][8] =
 {
     { 0xa0, 0x9e, 0x66, 0x7f, 0x3b, 0xcc, 0x90, 0x8b },
@@ -657,7 +655,6 @@ int mbedtls_camellia_crypt_ctr(mbedtls_camellia_context *ctx,
     return 0;
 }
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
-#endif /* !MBEDTLS_CAMELLIA_ALT */
 
 #if defined(MBEDTLS_SELF_TEST)