diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 7947ce36c3..bb52bea676 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -177,6 +177,10 @@ symbols, where xxx can be: USE, IMPORT, EXPORT, GENERATE, DERIVE"
 #error "PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_DERIVE defined, but feature is not supported"
 #endif
 
+#if defined(PSA_WANT_KEY_TYPE_DH_KEY_PAIR_DERIVE)
+#error "PSA_WANT_KEY_TYPE_DH_KEY_PAIR_DERIVE defined, but feature is not supported"
+#endif
+
 #if defined(MBEDTLS_PK_PARSE_C) && !defined(MBEDTLS_ASN1_PARSE_C)
 #error "MBEDTLS_PK_PARSE_C defined, but not all prerequisites"
 #endif
diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h
index 8dc396a752..0e41504544 100644
--- a/include/mbedtls/config_psa.h
+++ b/include/mbedtls/config_psa.h
@@ -420,13 +420,6 @@ extern "C" {
 #endif /* !MBEDTLS_PSA_ACCEL_KEY_TYPE_DH_KEY_PAIR_GENERATE */
 #endif /* PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE */
 
-#if defined(PSA_WANT_KEY_TYPE_DH_KEY_PAIR_DERIVE)
-#if !defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_DH_KEY_PAIR_DERIVE)
-#define MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_DERIVE 1
-#define MBEDTLS_BIGNUM_C
-#endif /* !MBEDTLS_PSA_ACCEL_KEY_TYPE_DH_KEY_PAIR_DERIVE */
-#endif /* PSA_WANT_KEY_TYPE_DH_KEY_PAIR_DERIVE */
-
 #if defined(PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY)
 #if !defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_PUBLIC_KEY)
 #define MBEDTLS_PSA_BUILTIN_KEY_TYPE_ECC_PUBLIC_KEY 1
@@ -791,7 +784,6 @@ extern "C" {
 #define PSA_WANT_KEY_TYPE_DH_KEY_PAIR_USE 1
 #define PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT 1
 #define PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT 1
-#define PSA_WANT_KEY_TYPE_DH_KEY_PAIR_DERIVE 1
 #define PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE 1
 #define PSA_WANT_KEY_TYPE_DH_PUBLIC_KEY 1
 #define PSA_WANT_ALG_FFDH 1
@@ -801,7 +793,6 @@ extern "C" {
 #define MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_IMPORT 1
 #define MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_EXPORT 1
 #define MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_GENERATE 1
-#define MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_DERIVE 1
 #define MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_PUBLIC_KEY 1
 #endif /* MBEDTLS_DHM_C */
 
@@ -1062,8 +1053,7 @@ extern "C" {
 #if defined(PSA_WANT_KEY_TYPE_DH_KEY_PAIR_USE) && \
     defined(PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT) && \
     defined(PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT) && \
-    defined(PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE) && \
-    defined(PSA_WANT_KEY_TYPE_DH_KEY_PAIR_DERIVE)
+    defined(PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE)
 #define MBEDTLS_PSA_WANT_KEY_TYPE_DH_KEY_PAIR_LEGACY
 #endif
 
@@ -1088,8 +1078,7 @@ extern "C" {
 #if defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_USE) && \
     defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_IMPORT) && \
     defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_EXPORT) && \
-    defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_GENERATE) && \
-    defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_DERIVE)
+    defined(MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_GENERATE)
 #define MBEDTLS_PSA_BUILTIN_KEY_TYPE_DH_KEY_PAIR_LEGACY
 #endif
 
diff --git a/include/psa/crypto_config.h b/include/psa/crypto_config.h
index 0a6c6e396b..0bae3ba5e6 100644
--- a/include/psa/crypto_config.h
+++ b/include/psa/crypto_config.h
@@ -152,7 +152,7 @@
 #define PSA_WANT_KEY_TYPE_DH_KEY_PAIR_IMPORT    1
 #define PSA_WANT_KEY_TYPE_DH_KEY_PAIR_EXPORT    1
 #define PSA_WANT_KEY_TYPE_DH_KEY_PAIR_GENERATE  1
-#define PSA_WANT_KEY_TYPE_DH_KEY_PAIR_DERIVE    1
+//#define PSA_WANT_KEY_TYPE_DH_KEY_PAIR_DERIVE    1 /* Not supported */
 
 /*
  * PSA_WANT_KEY_TYPE_xxx_KEY_PAIR_LEGACY and
diff --git a/tests/include/test/drivers/crypto_config_test_driver_extension.h b/tests/include/test/drivers/crypto_config_test_driver_extension.h
index 2aa4151c99..ba9021c6aa 100644
--- a/tests/include/test/drivers/crypto_config_test_driver_extension.h
+++ b/tests/include/test/drivers/crypto_config_test_driver_extension.h
@@ -271,14 +271,6 @@
 #endif
 #endif
 
-#if defined(PSA_WANT_KEY_TYPE_DH_KEY_PAIR_DERIVE)
-#if defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_DH_KEY_PAIR_DERIVE)
-#undef MBEDTLS_PSA_ACCEL_KEY_TYPE_DH_KEY_PAIR_DERIVE
-#else
-#define MBEDTLS_PSA_ACCEL_KEY_TYPE_DH_KEY_PAIR_DERIVE 1
-#endif
-#endif
-
 #if defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_USE)
 #if defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR_USE)
 #undef MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR_USE