diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 1861b5203..542c8cd0d 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -2245,7 +2245,11 @@ static int parse_sae_password(struct hostapd_bss_config *bss, const char *val)
 	}
 
 #ifdef CONFIG_SAE_PK
-	if (pw->pk && !sae_pk_valid_password(pw->password)) {
+	if (pw->pk &&
+#ifdef CONFIG_TESTING_OPTIONS
+	    !bss->sae_pk_password_check_skip &&
+#endif /* CONFIG_TESTING_OPTIONS */
+	    !sae_pk_valid_password(pw->password)) {
 		wpa_printf(MSG_INFO,
 			   "Invalid SAE password for a SAE-PK sae_password entry");
 		goto fail;
@@ -4137,6 +4141,8 @@ static int hostapd_config_fill(struct hostapd_config *conf,
 		bss->sae_commit_status = atoi(pos);
 	} else if (os_strcmp(buf, "sae_pk_omit") == 0) {
 		bss->sae_pk_omit = atoi(pos);
+	} else if (os_strcmp(buf, "sae_pk_password_check_skip") == 0) {
+		bss->sae_pk_password_check_skip = atoi(pos);
 	} else if (os_strcmp(buf, "sae_commit_override") == 0) {
 		wpabuf_free(bss->sae_commit_override);
 		bss->sae_commit_override = wpabuf_parse_bin(pos);
diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
index 769f7fab6..04535a163 100644
--- a/src/ap/ap_config.c
+++ b/src/ap/ap_config.c
@@ -1126,12 +1126,20 @@ static bool hostapd_sae_pk_password_without_pk(struct hostapd_bss_config *bss)
 	bool res = false;
 
 	if (bss->ssid.wpa_passphrase &&
+#ifdef CONFIG_TESTING_OPTIONS
+	    !bss->sae_pk_password_check_skip &&
+#endif /* CONFIG_TESTING_OPTIONS */
 	    sae_pk_valid_password(bss->ssid.wpa_passphrase))
 		res = true;
 
 	for (pw = bss->sae_passwords; pw; pw = pw->next) {
-		if (!pw->pk && sae_pk_valid_password(pw->password))
+		if (!pw->pk &&
+#ifdef CONFIG_TESTING_OPTIONS
+		    !bss->sae_pk_password_check_skip &&
+#endif /* CONFIG_TESTING_OPTIONS */
+		    sae_pk_valid_password(pw->password))
 			return true;
+
 		if (bss->ssid.wpa_passphrase && res && pw->pk &&
 		    os_strcmp(bss->ssid.wpa_passphrase, pw->password) == 0)
 			res = false;
diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
index b705c378f..bada04c3e 100644
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -671,6 +671,7 @@ struct hostapd_bss_config {
 	int sae_reflection_attack;
 	int sae_commit_status;
 	int sae_pk_omit;
+	int sae_pk_password_check_skip;
 	struct wpabuf *sae_commit_override;
 	struct wpabuf *rsne_override_eapol;
 	struct wpabuf *rsnxe_override_eapol;