diff --git a/test/case/system/upgrade/test.py b/test/case/system/upgrade/test.py
index a1c452bb..90bf6860 100755
--- a/test/case/system/upgrade/test.py
+++ b/test/case/system/upgrade/test.py
@@ -141,7 +141,7 @@ with infamy.Test() as test:
         with test.step("Verify boot order has changed and reboot"):
             print(get_boot_order(target))
             print(old_bootorder)
-            assert(old_bootorder != get_boot_order(target))
+            until(lambda: get_boot_order(target) != old_bootorder)
             target.reboot()
 
             if not wait_boot(target, env):