diff --git a/gui/test/server_config/test_obmc_gui_firmware_update.robot b/gui/test/server_config/test_obmc_gui_firmware_update.robot
index 528d35e..bbfc52c 100644
--- a/gui/test/server_config/test_obmc_gui_firmware_update.robot
+++ b/gui/test/server_config/test_obmc_gui_firmware_update.robot
@@ -85,8 +85,8 @@
     Input Text  ${xpath_tftp_server_ip}  ${TFTP_SERVER}
     Input Text  ${xpath_tftp_filename}  ${firmware_file_name}
     Click Button  ${xpath_download_firmware}
-    Sleep  180s
-    Wait Until Page Does Not Contain Element  ${xpath_download_progress}
+    Wait Until Element Is Visible  ${xpath_download_progress}  timeout=180
+    Wait Until Element Is Not Visible  ${xpath_download_progress}  timeout=180
 
     # ${message}=  Handle Alert  timeout=300s
     # Didn't work so commenting out currently.