diff --git a/tests/test_association.robot b/tests/test_association.robot
index a2f2b92..8ca51e5 100755
--- a/tests/test_association.robot
+++ b/tests/test_association.robot
@@ -178,9 +178,7 @@
     ${pre_reboot_association_content} =     Read Attribute    ${association_uri}    endpoints
 
     ${output}=      Execute Command    /sbin/reboot
-    Sleep   ${SYSTEM_SHUTDOWN_TIME}
-    Wait For Host To Ping   ${OPENBMC_HOST}
-    Sleep   ${WAIT_FOR_SERVICES_UP}
+    Check If BMC is Up   5 min    10 sec
 
     ${post_reboot_association_content} =     Read Attribute    ${association_uri}    endpoints
     Should Be Equal        ${pre_reboot_association_content}    ${pre_reboot_association_content}