diff --git a/tests/hwsim/test_ssid.py b/tests/hwsim/test_ssid.py
index 3384975ea..8dca7f620 100644
--- a/tests/hwsim/test_ssid.py
+++ b/tests/hwsim/test_ssid.py
@@ -62,6 +62,17 @@ def test_ssid_hidden(dev, apdev):
     if ev is not None:
         raise Exception("Unexpected connection")
 
+def test_ssid_hidden2(dev, apdev):
+    """Hidden SSID using zero octets as payload"""
+    hostapd.add_ap(apdev[0]['ifname'], { "ssid": 'secret2',
+                                         "ignore_broadcast_ssid": "2" })
+    dev[1].connect("secret2", key_mgmt="NONE", scan_freq="2412",
+                   wait_connect=False)
+    dev[0].connect("secret2", key_mgmt="NONE", scan_freq="2412", scan_ssid="1")
+    ev = dev[1].wait_event(["CTRL-EVENT-CONNECTED"], timeout=1)
+    if ev is not None:
+        raise Exception("Unexpected connection")
+
 def test_ssid_hidden_wpa2(dev, apdev):
     """Hidden SSID with WPA2-PSK"""
     params = hostapd.wpa2_params(ssid="secret", passphrase="12345678")