diff --git a/tests/test_boot_devices.robot b/tests/test_boot_devices.robot
index 215f43c..a358e49 100644
--- a/tests/test_boot_devices.robot
+++ b/tests/test_boot_devices.robot
@@ -302,6 +302,8 @@
    FFDC On Test Case Fail
    Set Boot Source  ${BOOT_SOURCE_DEFAULT}
    Set Boot Mode  ${BOOT_MODE_REGULAR}
+   Run Keyword If  '${PLATFORM_ARCH_TYPE}' == 'x86'
+   ...  Set Boot Type  ${BOOT_TYPE_EFI}
 
 Test Suite Setup
     [Documentation]  Do the initial suite setup.