diff --git a/autotests/testEAP-PEAPv0-CryptoBinding/NoISK_test.py b/autotests/testEAP-PEAPv0-CryptoBinding/NoISK_test.py
index 9a1fa52c..0323fdc1 100644
--- a/autotests/testEAP-PEAPv0-CryptoBinding/NoISK_test.py
+++ b/autotests/testEAP-PEAPv0-CryptoBinding/NoISK_test.py
@@ -37,9 +37,6 @@ class Test(unittest.TestCase):
 
         hostapd.eapol_reauth(device.address)
 
-        hostapd.wait_for_event('CTRL-EVENT-EAP-STARTED')
-        hostapd.wait_for_event('CTRL-EVENT-EAP-SUCCESS')
-
         condition = 'obj.state == DeviceState.connected'
         wd.wait_for_object_condition(device, condition)
 
diff --git a/autotests/util/hostapd.py b/autotests/util/hostapd.py
index 6a9f37c7..ff5a97c1 100644
--- a/autotests/util/hostapd.py
+++ b/autotests/util/hostapd.py
@@ -163,8 +163,11 @@ class HostapdCLI(object):
         ctx.start_process(cmd).wait()
 
     def eapol_reauth(self, client_address):
-        cmd = 'IFNAME=' + self.ifname + ' EAPOL_REAUTH ' + client_address
+        self.events = []
+        cmd = 'EAPOL_REAUTH ' + client_address
         self.ctrl_sock.sendall(cmd.encode('utf-8'))
+        self.wait_for_event('CTRL-EVENT-EAP-STARTED')
+        self.wait_for_event('CTRL-EVENT-EAP-SUCCESS')
 
     def reload(self):
         # Seemingly all three commands needed for the instance to notice