diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
index 2b08e40b76..b3cea1b505 100644
--- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
+++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
@@ -252,8 +252,9 @@ outputs:
             - name: reboot to perform the upgrade
               reboot:
                 reboot_timeout: "{{upgrade_leapp_reboot_timeout}}"
+                # TODO(holser): ansible 2.10 and higher provides boot_time_command to detect boot_id before and after reboot.
                 test_command: >-
-                  systemctl is-system-running | grep -e running -e degraded
+                  source /etc/os-release; [ "${VERSION_ID%.*}" -ge "8" ] && systemctl is-system-running | grep -qE "running|degraded" || exit 1
                 post_reboot_delay: "{{ upgrade_leapp_post_reboot_delay }}"
 
         - name: Package and repo update tasks