diff --git a/test/test-shutdown.py b/test/test-shutdown.py
index b83487c5d4..870c1e269f 100755
--- a/test/test-shutdown.py
+++ b/test/test-shutdown.py
@@ -43,6 +43,10 @@ def run(args):
         console.send('c')
         console.expect('screen1 ', 10)
 
+        logger.info('wait for the machine to fully boot')
+        console.sendline('systemctl is-system-running --wait')
+        console.expect(r'\b(running|degraded)\b', 60)
+
 #        console.interact()
 
         console.sendline('tty')