diff --git a/hostapd/defconfig b/hostapd/defconfig
index a641feb99..db19c651f 100644
--- a/hostapd/defconfig
+++ b/hostapd/defconfig
@@ -385,3 +385,5 @@ CONFIG_INTERWORKING=y
 #CFLAGS += -DDEFAULT_WPA_DISABLE_EAPOL_KEY_RETRIES=1
 
 CONFIG_TESTING_OPTIONS=y
+
+CONFIG_SAE=y
diff --git a/research/README.md b/research/README.md
index 4b431894d..dd36596cc 100644
--- a/research/README.md
+++ b/research/README.md
@@ -943,3 +943,23 @@ start the test tool as follows:
 
 After the tool executed, you can directly run it again with a new `$COMMAND`.
 
+<a id="id-wpa3-sae"></a>
+## 9.9. Testing WPA3 and SAE devices
+
+You can test a WPA3/SAE AP by including the following two lines in `client.conf`:
+
+	key_mgmt=SAE
+	ieee80211w=1
+
+To test WPA3/SAE clients you can modify `hostapd.conf` and set the parameters:
+
+	wpa_key_mgmt=SAE
+	ieee80211w=2
+
+We tested the above with an Intel 8265, Intel 3160, Netgear WN111v2 (`carl9170`),
+TP-Link TL-WN722N (`ath9k_htc`) and WNDA3200 (`ath9k_htc`). With those
+devices I was able to connect with the AP and run some tests. So it
+seems this should work with all already supported dongles. Note that I
+haven't tested this in detail: my assumption has been that whether a
+device is operating in WPA2 or WPA3 mode won't impact test results.
+
diff --git a/research/client.conf b/research/client.conf
index 6bc589ba6..d597e4877 100644
--- a/research/client.conf
+++ b/research/client.conf
@@ -8,6 +8,10 @@ network={
 
 	pairwise=CCMP
 	#group=CCMP
+
+	# Enable these to test WPA3/SAE APs
+	#key_mgmt=SAE
+	#ieee80211w=1
 }
 
 # Enterprise network