diff --git a/tests/manual-test-cases/Group5-Functional-Tests/5-29-Opaque-Network.robot b/tests/manual-test-cases/Group5-Functional-Tests/5-29-Opaque-Network.robot
index 8d2ac2bb9c..2d40ff4840 100644
--- a/tests/manual-test-cases/Group5-Functional-Tests/5-29-Opaque-Network.robot
+++ b/tests/manual-test-cases/Group5-Functional-Tests/5-29-Opaque-Network.robot
@@ -16,7 +16,7 @@
 Documentation  Test 5-29 - Opaque Network
 Resource  ../../resources/Util.robot
 Suite Setup  Vdnet NSXT Topology Setup
-Suite Teardown  Vdnet NSXT Topology Cleanup  ${NIMBUS_POD}  ${testrunid}
+#Suite Teardown  Vdnet NSXT Topology Cleanup  ${NIMBUS_POD}  ${testrunid}
 
 *** Variables ***
 ${NIMBUS_LOCATION}  sc
@@ -211,16 +211,16 @@ Selenium Grid Test in NSXT
     Set Environment Variable  BRIDGE_NETWORK  ${bridge_ls_name_2}
     Install VIC Appliance and Run Selenium Grid Test  Grid2  cleanup=${false}
   
-    ${status}=  Get State Of Github Issue  8435
-    Run Keyword If  '${status}' == 'closed'  Fail this case now that Issue #8435 has been resolved
+ #   ${status}=  Get State Of Github Issue  8435
+ #   Run Keyword If  '${status}' == 'closed'  Fail this case now that Issue #8435 has been resolved
     
-#    uncoment the followings when #8435 is resolved
-#    Sleep  300
-#    Run Keyword And Continue On Failure  Cleanup VIC Appliance On Test Server
-#
-#    Set Environment Variable  VCH-NAME  ${vch_name_1}
-#    Set Environment Variable  BRIDGE_NETWORK  ${bridge_ls_name_1}
-#    Set Environment Variable  VCH-PARAMS  ${vch_params_1}
-#    Set Environment Variable  VIC-ADMIN  ${vic_admin_1}
-#
-#    Run Keyword And Continue On Failure  Cleanup VIC Appliance On Test Server
+    #uncoment the followings when #8435 is resolved
+    Sleep  300
+    Run Keyword And Continue On Failure  Cleanup VIC Appliance On Test Server
+
+    Set Environment Variable  VCH-NAME  ${vch_name_1}
+    Set Environment Variable  BRIDGE_NETWORK  ${bridge_ls_name_1}
+    Set Environment Variable  VCH-PARAMS  ${vch_params_1}
+    Set Environment Variable  VIC-ADMIN  ${vic_admin_1}
+
+    Run Keyword And Continue On Failure  Cleanup VIC Appliance On Test Server