diff --git a/autotests/testRoamRetry/fast_retry_test.py b/autotests/testRoamRetry/fast_retry_test.py
index d6324c31..e8b5455d 100644
--- a/autotests/testRoamRetry/fast_retry_test.py
+++ b/autotests/testRoamRetry/fast_retry_test.py
@@ -82,7 +82,7 @@ class Test(unittest.TestCase):
         # schedule another attempt for 60 seconds later
         rule0.signal = -8000
 
-        wd.wait(20)
+        device.wait_for_event('no-roam-candidates')
 
         self.assertEqual(device.state, iwd.DeviceState.connected)
         self.assertTrue(bss_hostapd[0].list_sta())
@@ -99,13 +99,12 @@ class Test(unittest.TestCase):
         wd.wait(1)
 
         # Assert low signal for BSS 0, check that iwd starts transition to BSS 1
-        # in less than 10 seconds. Because of the neighbor report a scan should
-        # not be necessary.
+        # in less than 10 seconds.
         rule0.signal = -8000
         rule1.signal = -2000
 
         condition = 'obj.state == DeviceState.roaming'
-        wd.wait_for_object_condition(device, condition, max_wait=10)
+        wd.wait_for_object_condition(device, condition, max_wait=15)
 
         # Check that iwd is on BSS 1 once out of roaming state and doesn't
         # go through 'disconnected', 'autoconnect', 'connecting' in between
diff --git a/autotests/testRoamRetry/main.conf b/autotests/testRoamRetry/main.conf
new file mode 100644
index 00000000..f0d1c0f4
--- /dev/null
+++ b/autotests/testRoamRetry/main.conf
@@ -0,0 +1,2 @@
+[General]
+RoamRetryInterval=5
diff --git a/autotests/testRoamRetry/stop_retry_test.py b/autotests/testRoamRetry/stop_retry_test.py
index be9776a5..3bf166d8 100644
--- a/autotests/testRoamRetry/stop_retry_test.py
+++ b/autotests/testRoamRetry/stop_retry_test.py
@@ -99,7 +99,7 @@ class Test(unittest.TestCase):
 
         condition = 'obj.state == DeviceState.roaming'
         self.assertRaises(TimeoutError, wd.wait_for_object_condition, device,
-                          condition, max_wait=70)
+                          condition, max_wait=10)
 
         device.disconnect()