diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig
index 2f23f26725b..ea34298eb1e 100644
--- a/subsys/bluetooth/mesh/Kconfig
+++ b/subsys/bluetooth/mesh/Kconfig
@@ -1353,11 +1353,10 @@ config BT_MESH_USES_MBEDTLS_PSA
 	select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_BASIC
 	select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE
 	select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE
-	# Required, otherwise there are missing symbols for PK helpers at link time.
-	select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC
 	select PSA_WANT_ALG_CMAC
 	select PSA_WANT_ALG_ECB_NO_PADDING
 	select PSA_WANT_KEY_TYPE_AES
+	select MBEDTLS_CIPHER_AES_ENABLED
 	select MBEDTLS_AES_ROM_TABLES
 	select PSA_WANT_ALG_CCM
 	select PSA_WANT_KEY_TYPE_HMAC
diff --git a/tests/crypto/mbedtls/prj.conf b/tests/crypto/mbedtls/prj.conf
index 6da7c1489b7..7f9ee7aa459 100644
--- a/tests/crypto/mbedtls/prj.conf
+++ b/tests/crypto/mbedtls/prj.conf
@@ -9,5 +9,6 @@ CONFIG_MINIMAL_LIBC_NON_REENTRANT_FUNCTIONS=y
 CONFIG_MINIMAL_LIBC_RAND=y
 CONFIG_ENTROPY_GENERATOR=y
 CONFIG_TEST_RANDOM_GENERATOR=y
+CONFIG_MBEDTLS_CIPHER_AES_ENABLED=y
 CONFIG_MBEDTLS_USE_PSA_CRYPTO=n
 CONFIG_PSA_CRYPTO_ENABLE_ALL=n