diff --git a/tests/software-upgrades/ONOS_AppsUpgrade.robot b/tests/software-upgrades/ONOS_AppsUpgrade.robot
index 485ff71..222ef7e 100644
--- a/tests/software-upgrades/ONOS_AppsUpgrade.robot
+++ b/tests/software-upgrades/ONOS_AppsUpgrade.robot
@@ -136,8 +136,8 @@
 Download App OAR File
     [Documentation]    This keyword downloads the app oar file from the given url to the specified location
     [Arguments]    ${oar_url}    ${oar_file}
-    ${rc}    Run And Return Rc    curl -L ${oar_url} > ${oar_file}
-    Should Be Equal As Integers    ${rc}    0
+    ${rc}    Run And Return Rc    curl --fail -sSL ${oar_url} > ${oar_file}
+    Should Be Equal As Integers    ${rc}    0   Can't download ONOS app from ${oar_url}
 
 Create ONOS Apps Under Test List
     [Documentation]    Creates a list of ONOS Apps to Test from the input variable string
diff --git a/tests/software-upgrades/Voltha_ComponentsUpgrade.robot b/tests/software-upgrades/Voltha_ComponentsUpgrade.robot
index 369f9b0..30016a7 100755
--- a/tests/software-upgrades/Voltha_ComponentsUpgrade.robot
+++ b/tests/software-upgrades/Voltha_ComponentsUpgrade.robot
@@ -101,6 +101,7 @@
         ${pod_image_1}    ${app_ver_1}    ${helm_chart_1}    Get Pod Image And App Version And Helm Chart By Label
         ...    ${NAMESPACE}    app    ${label}
         Log    ${label}: image, app ver & helm chart after upgrade: ${pod_image_1}, ${app_ver_1} & ${helm_chart_1}
+        Restart VOLTHA Port Forward     voltha-api
         Wait Until Keyword Succeeds    ${timeout}    2s    Perform Sanity Test     ${suppressaddsubscriber}
     END
     ${podStatusOutput}=    Run    kubectl get pods -n ${NAMESPACE}