diff --git a/tests/ovn.at b/tests/ovn.at
index dafaaa9ea2..8ce325c885 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -9450,7 +9450,7 @@ AT_CHECK([sort packets], [0], [expout])
 
 # Temporarily remove nat-addresses option to avoid race conditions
 # due to GARP backoff
-check ovn-nbctl lsp-set-options lrp0-rp router-port=lrp0 nat-addresses=""
+check ovn-nbctl --wait=hv lsp-set-options lrp0-rp router-port=lrp0 nat-addresses=""
 
 as hv1 reset_pcap_file snoopvif hv1/snoopvif