diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 36d5fa4..0b42c77 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -3961,6 +3961,7 @@
     scripts/config.py unset MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_EPHEMERAL_ENABLED
     scripts/config.py unset MBEDTLS_SSL_TLS1_3_KEY_EXCHANGE_MODE_PSK_EPHEMERAL_ENABLED
     scripts/config.py unset MBEDTLS_ECDH_C
+    scripts/config.py unset MBEDTLS_DHM_C
     scripts/config.py unset MBEDTLS_X509_CRT_PARSE_C
     scripts/config.py unset MBEDTLS_X509_RSASSA_PSS_SUPPORT
     scripts/config.py unset MBEDTLS_SSL_SERVER_NAME_INDICATION
@@ -3999,6 +4000,7 @@
     scripts/config.py unset MBEDTLS_X509_RSASSA_PSS_SUPPORT
     scripts/config.py unset MBEDTLS_SSL_SERVER_NAME_INDICATION
     scripts/config.py unset MBEDTLS_ECDSA_C
+    scripts/config.py unset MBEDTLS_DHM_C
     scripts/config.py unset MBEDTLS_PKCS1_V21
     scripts/config.py unset MBEDTLS_PKCS7_C
     scripts/config.py set   MBEDTLS_SSL_EARLY_DATA
@@ -4018,6 +4020,7 @@
     scripts/config.py unset MBEDTLS_X509_RSASSA_PSS_SUPPORT
     scripts/config.py unset MBEDTLS_SSL_SERVER_NAME_INDICATION
     scripts/config.py unset MBEDTLS_ECDSA_C
+    scripts/config.py unset MBEDTLS_DHM_C
     scripts/config.py unset MBEDTLS_PKCS1_V21
     scripts/config.py unset MBEDTLS_PKCS7_C
     scripts/config.py set   MBEDTLS_SSL_EARLY_DATA
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index c8d6504..88e328e 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -11265,7 +11265,7 @@
             0 \
             -s "Protocol is TLSv1.3" \
             -s "Ciphersuite is TLS1-3-CHACHA20-POLY1305-SHA256" \
-            -s "ECDH group: x25519" \
+            -s "ECDH/FFDH group: x25519" \
             -s "selected signature algorithm ecdsa_secp256r1_sha256"
 
 requires_openssl_tls1_3
@@ -12352,6 +12352,7 @@
 requires_config_enabled MBEDTLS_SSL_CLI_C
 requires_config_enabled MBEDTLS_SSL_SRV_C
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
+requires_config_enabled PSA_WANT_ALG_FFDH
 run_test "TLS 1.3: Test ffdh groups (ffdhe2048)" \
          "$P_SRV debug_level=5 force_version=tls13 curves=ffdhe2048" \
          "$P_CLI debug_level=5 force_version=tls13 curves=ffdhe2048" \
@@ -12365,6 +12366,7 @@
 requires_config_enabled MBEDTLS_SSL_CLI_C
 requires_config_enabled MBEDTLS_SSL_SRV_C
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
+requires_config_enabled PSA_WANT_ALG_FFDH
 run_test "TLS 1.3: Test ffdh groups (ffdhe3072)" \
          "$P_SRV debug_level=4 force_version=tls13 curves=ffdhe3072" \
          "$P_CLI debug_level=4 force_version=tls13 curves=ffdhe3072" \
@@ -12378,6 +12380,7 @@
 requires_config_enabled MBEDTLS_SSL_CLI_C
 requires_config_enabled MBEDTLS_SSL_SRV_C
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
+requires_config_enabled PSA_WANT_ALG_FFDH
 run_test "TLS 1.3: Test ffdh groups (ffdhe4096)" \
          "$P_SRV debug_level=4 force_version=tls13 curves=ffdhe4096" \
          "$P_CLI debug_level=4 force_version=tls13 curves=ffdhe4096" \
@@ -12391,6 +12394,7 @@
 requires_config_enabled MBEDTLS_SSL_CLI_C
 requires_config_enabled MBEDTLS_SSL_SRV_C
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
+requires_config_enabled PSA_WANT_ALG_FFDH
 run_test "TLS 1.3: Test ffdh groups (ffdhe6144)" \
          "$P_SRV debug_level=4 force_version=tls13 curves=ffdhe6144" \
          "$P_CLI debug_level=4 force_version=tls13 curves=ffdhe6144" \
@@ -12404,6 +12408,7 @@
 requires_config_enabled MBEDTLS_SSL_CLI_C
 requires_config_enabled MBEDTLS_SSL_SRV_C
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
+requires_config_enabled PSA_WANT_ALG_FFDH
 run_test "TLS 1.3: Test ffdh groups (ffdhe8192)" \
          "$P_SRV debug_level=4 force_version=tls13 curves=ffdhe8192" \
          "$P_CLI debug_level=4 force_version=tls13 curves=ffdhe8192" \
@@ -12417,6 +12422,7 @@
 requires_config_enabled MBEDTLS_SSL_CLI_C
 requires_config_enabled MBEDTLS_SSL_SRV_C
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
+requires_config_enabled PSA_WANT_ALG_FFDH
 run_test "TLS 1.3: Test ffdh groups - no match(server: ffdhe2048 client: secp384r1)" \
          "$P_SRV debug_level=4 force_version=tls13 curves=ffdhe2048" \
          "$P_CLI debug_level=4 force_version=tls13 curves=secp384r1" \
@@ -12429,6 +12435,7 @@
 requires_config_enabled MBEDTLS_SSL_CLI_C
 requires_config_enabled MBEDTLS_SSL_SRV_C
 requires_config_enabled MBEDTLS_SSL_PROTO_TLS1_3
+requires_config_enabled PSA_WANT_ALG_FFDH
 run_test "TLS 1.3: Test ffdh groups - no match(server: secp384r1 client: ffdhe2048)" \
          "$P_SRV debug_level=4 force_version=tls13 curves=secp384r1" \
          "$P_CLI debug_level=4 force_version=tls13 curves=ffdhe2048" \