diff --git a/.drone.yml b/.drone.yml
index 0681a0d38b..0011e397cc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -75,39 +75,22 @@ pipeline:
     when:
       status: success
 
-  vic-unit-test:
-    image: 'wdc-harbor-ci.eng.vmware.com/default-project/vic-integration-test:1.48'
-    pull: true
-    environment:
-      BIN: bin
-      GOPATH: /go
-      SHELL: /bin/bash
-    secrets:
-      - drone_server
-      - drone_token
-      - github_automation_api_key
-      - codecov_token
-    commands:
-      - tests/unit-test-check.sh
-    when:
-      status: success
-
-  custom-bootstrap-iso:
-    image: 'gcr.io/eminent-nation-87317/vic-build-image:yum'
-    pull: true
-    environment:
-      BIN: bin
-      GOPATH: /go
-      SHELL: /bin/bash
-    secrets:
-    - drone_server
-    - drone_token
-    - github_automation_api_key
-    - codecov_token
-    commands:
-    - export BUILD_NUMBER=${DRONE_BUILD_NUMBER}
-    - ./tests/generate-custom-iso.sh centos-6.9
-    when:
+  custom-bootstrap-iso:    
+    image: 'gcr.io/eminent-nation-87317/vic-build-image:yum'    
+    pull: true    
+    environment:    
+      BIN: bin    
+      GOPATH: /go    
+      SHELL: /bin/bash    
+    secrets:    
+    - drone_server    
+    - drone_token    
+    - github_automation_api_key    
+    - codecov_token    
+    commands:    
+    - export BUILD_NUMBER=${DRONE_BUILD_NUMBER}    
+    - ./tests/generate-custom-iso.sh centos-6.9    
+    when:    
       status: success
 
   vic-integration-test-on-pr:
diff --git a/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot b/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot
index 388ef822e7..038f190cb7 100644
--- a/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot
+++ b/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot
@@ -59,21 +59,21 @@ Run Docker Checks
     Should Be Equal As Integers  ${rc}  0
 
 
-    ${status}=  Get State Of Github Issue  5653
-    Run Keyword If  '${status}' == 'closed'  Should Contain  ${output}  Exited (143)
-    Run Keyword If  '${status}' == 'closed'  Fail  Exit code check below needs to be updated now that Issue #5653 has been resolved
+    #${status}=  Get State Of Github Issue  5653
+    #Run Keyword If  '${status}' == 'closed'  Should Contain  ${output}  Exited (143)
+    #Run Keyword If  '${status}' == 'closed'  Fail  Exit code check below needs to be updated now that Issue #5653 has been resolved
     # Disabling the precise check for error code until https://github.com/vmware/vic/issues/5653 is fixed - we can get rid of the
     # conditional around the exit code check once the issue is closed
-    #Should Contain  ${output}  Exited (143)
+    Should Contain  ${output}  Exited (143)
 
     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start vch-restart-test1
     Should Be Equal As Integers  ${rc}  0
     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
     Should Be Equal As Integers  ${rc}  0
 
-    ${status}=  Get State Of Github Issue  7534
-    Run Keyword If  '${status}' == 'closed'  Fail  Exit code check below needs to be updated now that Issue #7534 has been resolved
-    #Should Not Contain  ${output}  Exited (0)
+    # ${status}=  Get State Of Github Issue  7534
+    # Run Keyword If  '${status}' == 'closed'  Fail  Exit code check below needs to be updated now that Issue #7534 has been resolved
+    Should Not Contain  ${output}  Exited (0)
 
     # Check that rename works on a container from a VCH that supports rename
     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}