diff --git a/test/case/ietf_system/upgrade/test.py b/test/case/ietf_system/upgrade/test.py
index a0971fe5c..367e628cc 100755
--- a/test/case/ietf_system/upgrade/test.py
+++ b/test/case/ietf_system/upgrade/test.py
@@ -11,7 +11,7 @@
 import netifaces
 import infamy
 import infamy.file_server as srv
-from infamy.util import wait_boot
+from infamy.util import wait_boot, until
 
 SRVPORT = 8008
 
@@ -134,5 +134,7 @@ def set_boot_order(self, order):
                 test.fail()
 
         with test.step("Verify the boot order is the orignal configured"):
-             assert(old_bootorder == bootloader.get_boot_order())
+            # Wait for sshd to start.
+            until(lambda: old_bootorder == bootloader.get_boot_order())
+
     test.succeed()