diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index bec7687864..4c09e0cc51 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -59,6 +59,12 @@ parameters:
     description: Timeout (seconds) for the OS upgrade phase via Leapp
     type: number
     default: 3600
+  UpgradeLeappPostRebootDelay:
+    description: |
+      Maximum (seconds) to wait for machine to reboot and respond to a test
+      command.
+    type: number
+    default: 120
   UpgradeLeappToRemove:
     default: []
     description: List of packages to remove during Leapp upgrade.
@@ -128,6 +134,7 @@ outputs:
             upgrade_leapp_devel_skip: {get_param: UpgradeLeappDevelSkip}
             upgrade_leapp_command_options: {get_param: UpgradeLeappCommandOptions}
             upgrade_leapp_reboot_timeout: {get_param: UpgradeLeappRebootTimeout}
+            upgrade_leapp_post_reboot_delay: {get_param: UpgradeLeappPostRebootDelay}
           vars:
             _upgradeLeappEnabled: {get_param: UpgradeLeappEnabled}
           tags:
@@ -210,6 +217,9 @@ outputs:
             - name: reboot to perform the upgrade
               reboot:
                 reboot_timeout: "{{upgrade_leapp_reboot_timeout}}"
+                test_command: >-
+                  systemctl is-system-running | grep -e running -e degraded
+                post_reboot_delay: "{{ upgrade_leapp_post_reboot_delay }}"
 
         - name: Package and repo update tasks
           when: step|int == 0