diff --git a/config/nrfconnect/chip-module/Kconfig.defaults b/config/nrfconnect/chip-module/Kconfig.defaults
index 9875046bdfb..03d28e2f5e2 100644
--- a/config/nrfconnect/chip-module/Kconfig.defaults
+++ b/config/nrfconnect/chip-module/Kconfig.defaults
@@ -363,10 +363,10 @@ endif # CHIP_WIFI
 # Crypto configuration
 # ==============================================================================
 
-choice OPENTHREAD_SECURITY
+choice OPENTHREAD_SECURITY_CONFIG
     default OPENTHREAD_NRF_SECURITY_PSA_CHOICE if CHIP_CRYPTO_PSA
     default OPENTHREAD_NRF_SECURITY_CHOICE
-    
+
 endchoice
 
 choice RNG_GENERATOR_CHOICE
@@ -423,9 +423,6 @@ if !CHIP_CRYPTO_PSA
 config OBERON_BACKEND
     default y
 
-config NRF_SECURITY_ADVANCED
-    default y
-
 config MBEDTLS_AES_C
     default y
 
@@ -553,7 +550,7 @@ if CHIP_LIB_SHELL
 choice POSIX_AEP_CHOICE
 	default POSIX_AEP_CHOICE_NONE
 
-endchoice 
+endchoice
 
 endif # CHIP_LIB_SHELL
 
diff --git a/src/test_driver/nrfconnect/prj.conf b/src/test_driver/nrfconnect/prj.conf
index 78d22b95166..21fad7c2945 100644
--- a/src/test_driver/nrfconnect/prj.conf
+++ b/src/test_driver/nrfconnect/prj.conf
@@ -45,6 +45,7 @@ CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
 CONFIG_MBEDTLS_USER_CONFIG_FILE="app_mbedtls_config.h"
 CONFIG_MBEDTLS_ENTROPY_POLL_ZEPHYR=y
 CONFIG_MBEDTLS_ENTROPY_C=y
+CONFIG_MBEDTLS_X509_CRT_PARSE_C=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_MBEDTLS_MEMORY_DEBUG=y