diff --git a/drivers/net/wireless/cnss/Kconfig b/drivers/net/wireless/cnss/Kconfig
index 1a436b816a84..8f478af1f018 100644
--- a/drivers/net/wireless/cnss/Kconfig
+++ b/drivers/net/wireless/cnss/Kconfig
@@ -84,7 +84,6 @@ config CLD_HL_SDIO_CORE
 
 config CLD_LL_CORE
 	tristate "Qualcomm Technologies Inc. Core wlan driver"
-	select NL80211_TESTMODE
 	select WEXT_CORE
 	select WEXT_PRIV
 	select WEXT_SPY
diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig
index 6c606120abfe..fc63988d6a50 100644
--- a/net/wireless/Kconfig
+++ b/net/wireless/Kconfig
@@ -31,6 +31,7 @@ config CFG80211
 
 config NL80211_TESTMODE
 	bool "nl80211 testmode command"
+	default y
 	depends on CFG80211
 	help
 	  The nl80211 testmode command helps implementing things like