diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h
index 83b9c92de8..33b89ef469 100644
--- a/include/mbedtls/mbedtls_config.h
+++ b/include/mbedtls/mbedtls_config.h
@@ -351,7 +351,6 @@
 //#define MBEDTLS_TIMING_ALT
 
 //#define MBEDTLS_CMAC_ALT
-//#define MBEDTLS_NIST_KW_ALT
 //#define MBEDTLS_MD5_ALT
 //#define MBEDTLS_RIPEMD160_ALT
 //#define MBEDTLS_SHA1_ALT
diff --git a/tests/include/alt-dummy/nist_kw_alt.h b/tests/include/alt-dummy/nist_kw_alt.h
deleted file mode 100644
index 1274d40812..0000000000
--- a/tests/include/alt-dummy/nist_kw_alt.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* nist_kw_alt.h with dummy types for MBEDTLS_NIST_KW_ALT */
-/*
- *  Copyright The Mbed TLS Contributors
- *  SPDX-License-Identifier: Apache-2.0 OR GPL-2.0-or-later
- */
-
-#ifndef NIST_KW_ALT_H
-#define NIST_KW_ALT_H
-
-typedef struct {
-    int dummy;
-} mbedtls_nist_kw_context;
-
-
-#endif /* nist_kw_alt.h */
diff --git a/tf-psa-crypto/drivers/builtin/include/mbedtls/nist_kw.h b/tf-psa-crypto/drivers/builtin/include/mbedtls/nist_kw.h
index d353f3d1a8..a99d925076 100644
--- a/tf-psa-crypto/drivers/builtin/include/mbedtls/nist_kw.h
+++ b/tf-psa-crypto/drivers/builtin/include/mbedtls/nist_kw.h
@@ -37,10 +37,6 @@ typedef enum {
     MBEDTLS_KW_MODE_KWP = 1
 } mbedtls_nist_kw_mode_t;
 
-#if !defined(MBEDTLS_NIST_KW_ALT)
-// Regular implementation
-//
-
 /**
  * \brief    The key wrapping context-type definition. The key wrapping context is passed
  *           to the APIs called.
@@ -52,10 +48,6 @@ typedef struct {
     mbedtls_cipher_context_t MBEDTLS_PRIVATE(cipher_ctx);    /*!< The cipher context used. */
 } mbedtls_nist_kw_context;
 
-#else  /* MBEDTLS_NIST_key wrapping_ALT */
-#include "nist_kw_alt.h"
-#endif /* MBEDTLS_NIST_KW_ALT */
-
 /**
  * \brief           This function initializes the specified key wrapping context
  *                  to make references valid and prepare the context
diff --git a/tf-psa-crypto/drivers/builtin/src/nist_kw.c b/tf-psa-crypto/drivers/builtin/src/nist_kw.c
index 8faafe43f1..a4b4be759d 100644
--- a/tf-psa-crypto/drivers/builtin/src/nist_kw.c
+++ b/tf-psa-crypto/drivers/builtin/src/nist_kw.c
@@ -30,8 +30,6 @@
 
 #include "mbedtls/platform.h"
 
-#if !defined(MBEDTLS_NIST_KW_ALT)
-
 #define KW_SEMIBLOCK_LENGTH    8
 #define MIN_SEMIBLOCKS_COUNT   3
 
@@ -449,8 +447,6 @@ cleanup:
     return ret;
 }
 
-#endif /* !MBEDTLS_NIST_KW_ALT */
-
 #if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C)
 
 /*