diff --git a/extended/code_update/bmc_code_update.robot b/extended/code_update/bmc_code_update.robot
index bdcfdd5..bdb9981 100644
--- a/extended/code_update/bmc_code_update.robot
+++ b/extended/code_update/bmc_code_update.robot
@@ -19,6 +19,9 @@
 
 Test Teardown     Test Teardown Execution
 
+# Force the test to timedout to prevent test hanging.
+Test Timeout      30 minutes
+
 Force Tags        BMC_Code_Update
 
 *** Variables ***
diff --git a/redfish/extended/redfish_bmc_code_update.robot b/redfish/extended/redfish_bmc_code_update.robot
index 7c1ade5..fafc3c5 100644
--- a/redfish/extended/redfish_bmc_code_update.robot
+++ b/redfish/extended/redfish_bmc_code_update.robot
@@ -26,6 +26,9 @@
 Test Setup               Printn
 Test Teardown            FFDC On Test Case Fail
 
+# Force the test to timedout to prevent test hanging.
+Test Timeout             30 minutes
+
 Force Tags               BMC_Code_Update
 
 *** Variables ***