diff --git a/test/changed.sh b/test/changed.sh
index 10f48b6b7e..4ad4121685 100755
--- a/test/changed.sh
+++ b/test/changed.sh
@@ -39,26 +39,29 @@ exitCode=0
 function cleanup {
     if [ -n "$CURRENT_RELEASE" ]; then
 
-      # Capture logs from test pods
-      kubectl get po --namespace ${NAMESPACE} --show-all -o go-template='{{range .items}}{{ $hook := print (index .metadata.annotations "helm.sh/hook") }}{{ if or (eq $hook "test-success") (eq $hook "test-failure") }}{{printf "%s\n" .metadata.name}}{{end}}{{end}}' | while read line; do
-        if [[ $line != "" ]]; then
-          echo "Logs from test pod $line:"
-          kubectl logs --namespace ${NAMESPACE} ${line}
-          printf "End of logs for $line\n\n"
-        fi
-      done
-
-      # Capture logs from application pods
+      # Before reporting the logs from all pods provide a helm status for
+      # the release
       helm status ${CURRENT_RELEASE}
-      helm status ${CURRENT_RELEASE} | sed -n '/Pod(related)/,/^$/p' | sed -e '1,2d' | awk '{ print $1 }' | while read line; do
+
+      # List all logs for all containers in all pods for the namespace which was
+      # created for this PR test run
+      kubectl get pods --show-all --no-headers --namespace ${NAMESPACE} | awk '{ print $1 }' | while read line; do
         if [[ $line != "" ]]; then
-          echo "logs for app pod $line:"
-          kubectl logs ${line}
-          printf "End of logs for $line\n\n"
+            echo "===Logs from pod $line:==="
+
+            # There can be multiple containers within a pod. We need to iterate
+            # over each of those
+            containers=`kubectl get pods --show-all -o jsonpath="{.spec.containers[*].name}" --namespace ${NAMESPACE} $line`
+            for cname in ${containers}; do
+                echo "---Logs from container $cname in pod $line:---"
+                kubectl logs --namespace ${NAMESPACE} -c ${cname} ${line}
+                printf "---End of logs for container $cname in pod $line---\n\n"
+            done
+
+            printf "===End of logs for pod $line===\n\n"
         fi
       done
 
-
       helm delete --purge ${CURRENT_RELEASE} > cleanup_log 2>&1 || true
     fi
     kubectl delete ns ${NAMESPACE} >> cleanup_log 2>&1 || true