diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-24-Non-vSphere-Local-Cluster.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-24-Non-vSphere-Local-Cluster.robot
index e5b521b58c..98e71e1bb1 100644
--- a/tests/manual-test-cases/Group5-Functional-Tests/5-24-Non-vSphere-Local-Cluster.robot
+++ b/tests/manual-test-cases/Group5-Functional-Tests/5-24-Non-vSphere-Local-Cluster.robot
@@ -34,7 +34,9 @@ Non vSphere Local Cluster Install Setup
     Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_USER}-${vc}
 
     # Finish vCenter deploy
-    ${output}=  Wait For Process  ${pid}
+    ${output}=  Wait For Process  ${pid}  timeout=70 minutes  on_timeout=terminate
+    Log  ${output.stdout}
+    Log  ${output.stderr}
     Should Contain  ${output.stdout}  Overall Status: Succeeded
 
     Open Connection  %{NIMBUS_GW}
diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-3-Enhanced-Linked-Mode.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-3-Enhanced-Linked-Mode.robot
index 55201116dd..013724a4bb 100644
--- a/tests/manual-test-cases/Group5-Functional-Tests/5-3-Enhanced-Linked-Mode.robot
+++ b/tests/manual-test-cases/Group5-Functional-Tests/5-3-Enhanced-Linked-Mode.robot
@@ -62,7 +62,7 @@ Enhanced Link Mode Setup
     ${esx6-ip}=  Get From List  ${esx-ips}  2
 
     # Finish test bed deploy
-    ${output}=  Wait For Process  ${pid}
+    ${output}=  Wait For Process  ${pid}  timeout=70 minutes  on_timeout=terminate
     Log  ${output.stdout}
     Log  ${output.stderr}
     Should Be Equal As Integers  ${output.rc}  0
@@ -99,7 +99,6 @@ Enhanced Link Mode Setup
     Set Environment Variable  GOVC_URL  ${vc1-ip}
     Set Environment Variable  GOVC_USERNAME  administrator@vsphere.local
     Set Environment Variable  GOVC_PASSWORD  Admin!23
-    
     ${license}=  Run  govc license.ls
 
     # First VC cluster