diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go
index d9b64f3a847..a62fd5feb26 100644
--- a/test/e2e/e2e.go
+++ b/test/e2e/e2e.go
@@ -186,6 +186,7 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 		} else {
 			dumpAllNamespaceInfo(c, api.NamespaceSystem)
 		}
+		logFailedContainers(api.NamespaceSystem)
 		Failf("Error waiting for all pods to be running and ready: %v", err)
 	}
 
diff --git a/test/e2e/util.go b/test/e2e/util.go
index 05fcb6f0f9d..5f2caf13406 100644
--- a/test/e2e/util.go
+++ b/test/e2e/util.go
@@ -497,6 +497,33 @@ func waitForPodsRunningReady(ns string, minPods int, timeout time.Duration) erro
 	return nil
 }
 
+func logFailedContainers(ns string) {
+	c, err := loadClient()
+	if err != nil {
+		Logf("Failed to load client")
+		return
+	}
+	podList, err := c.Pods(ns).List(api.ListOptions{})
+	if err != nil {
+		Logf("Error getting pods in namespace '%s': %v", ns, err)
+		return
+	}
+	for _, pod := range podList.Items {
+		if res, err := podRunningReady(&pod); res && err == nil {
+			Logf("Ignoring Ready pod %v/%v", pod.Namespace, pod.Name)
+		} else {
+			for _, container := range pod.Spec.Containers {
+				logs, err := getPreviousPodLogs(c, ns, pod.Name, container.Name)
+				if err != nil {
+					Logf("Failed to get logs of pod %v, container %v, err: %v", pod.Name, container.Name, err)
+				}
+				By(fmt.Sprintf("Previous logs of %v/%v:%v on node %v", ns, pod.Name, container.Name, pod.Spec.NodeName))
+				Logf(logs)
+			}
+		}
+	}
+}
+
 // deleteNamespaces deletes all namespaces that match the given delete and skip filters.
 // Filter is by simple strings.Contains; first skip filter, then delete filter.
 // Returns the list of deleted namespaces or an error.