diff --git a/test/cli/cli.go b/test/cli/cli.go
index bf6494be08..8ab0c14dd3 100644
--- a/test/cli/cli.go
+++ b/test/cli/cli.go
@@ -31,7 +31,7 @@ import (
 )
 
 const (
-	timeout = 5 * time.Minute
+	timeout = 10 * time.Minute
 )
 
 // TknRunner contains information about the current test execution tkn binary path
diff --git a/test/e2e/eventlistener/eventListener_test.go b/test/e2e/eventlistener/eventListener_test.go
index 9a7cf296ff..aa68369b8f 100644
--- a/test/e2e/eventlistener/eventListener_test.go
+++ b/test/e2e/eventlistener/eventListener_test.go
@@ -45,7 +45,7 @@ func TestEventListenerE2E(t *testing.T) {
 	createResources(t, c, namespace)
 	kubectl.MustSucceed(t, "create", "-f", helper.GetResourcePath("eventlistener/eventlistener.yaml"))
 	// Wait for pods to become available for next test
-	kubectl.MustSucceed(t, "wait", "--for=condition=Ready", "pod", "-n", namespace, "--timeout=2m", "--all")
+	kubectl.MustSucceed(t, "wait", "--for=condition=Ready", "pod", "-n", namespace, "--timeout=5m", "--all")
 
 	t.Run("Assert if EventListener AVAILABLE status is true", func(t *testing.T) {
 		res := tkn.MustSucceed(t, "eventlistener", "list")
@@ -56,7 +56,7 @@ func TestEventListenerE2E(t *testing.T) {
 	t.Logf("Scaling EventListener %s to 3 replicas in namespace %s", elName, namespace)
 	kubectl.MustSucceed(t, "apply", "-f", helper.GetResourcePath("eventlistener/eventlistener-multi-replica.yaml"))
 	// Wait for pods to become available for next test
-	kubectl.MustSucceed(t, "wait", "--for=condition=Ready", "pod", "-n", namespace, "--timeout=2m", "--all")
+	kubectl.MustSucceed(t, "wait", "--for=condition=Ready", "pod", "-n", namespace, "--timeout=5m", "--all")
 }
 
 func TestEventListenerLogsE2E(t *testing.T) {
@@ -73,7 +73,7 @@ func TestEventListenerLogsE2E(t *testing.T) {
 	createResources(t, c, namespace)
 	kubectl.MustSucceed(t, "create", "-f", helper.GetResourcePath("eventlistener/eventlistener_log.yaml"))
 	// Wait for pods to run and crash for next test
-	kubectl.MustSucceed(t, "wait", "--for=jsonpath=.status.phase=Running", "pod", "-n", namespace, "--timeout=2m", "--all")
+	kubectl.MustSucceed(t, "wait", "--for=jsonpath=.status.phase=Running", "pod", "-n", namespace, "--timeout=5m", "--all")
 
 	t.Run("Get logs of EventListener", func(t *testing.T) {
 		res := tkn.MustSucceed(t, "eventlistener", "logs", elName, "-t", "1")
@@ -108,7 +108,7 @@ func TestEventListener_v1beta1LogsE2E(t *testing.T) {
 	createResources(t, c, namespace)
 	kubectl.MustSucceed(t, "create", "-f", helper.GetResourcePath("eventlistener/eventlistener_v1beta1_log.yaml"))
 	// Wait for pods to run and crash for next test
-	kubectl.MustSucceed(t, "wait", "--for=jsonpath=.status.phase=Running", "pod", "-n", namespace, "--timeout=2m", "--all")
+	kubectl.MustSucceed(t, "wait", "--for=jsonpath=.status.phase=Running", "pod", "-n", namespace, "--timeout=5m", "--all")
 
 	t.Run("Get logs of EventListener", func(t *testing.T) {
 		res := tkn.MustSucceed(t, "eventlistener", "logs", elName, "-t", "1")
@@ -143,7 +143,7 @@ func TestEventListener_v1beta1E2E(t *testing.T) {
 	createResources(t, c, namespace)
 	kubectl.MustSucceed(t, "create", "-f", helper.GetResourcePath("eventlistener/eventlistener_v1beta1.yaml"))
 	// Wait for pods to become available for next test
-	kubectl.MustSucceed(t, "wait", "--for=condition=Ready", "pod", "-n", namespace, "--timeout=2m", "--all")
+	kubectl.MustSucceed(t, "wait", "--for=condition=Ready", "pod", "-n", namespace, "--timeout=5m", "--all")
 
 	t.Run("Assert if EventListener AVAILABLE status is true", func(t *testing.T) {
 		res := tkn.MustSucceed(t, "eventlistener", "list")
@@ -154,7 +154,7 @@ func TestEventListener_v1beta1E2E(t *testing.T) {
 	t.Logf("Scaling EventListener %s to 3 replicas in namespace %s", elName, namespace)
 	kubectl.MustSucceed(t, "apply", "-f", helper.GetResourcePath("eventlistener/eventlistener_v1beta1-multi-replica.yaml"))
 	// Wait for pods to become available for next test
-	kubectl.MustSucceed(t, "wait", "--for=condition=Ready", "pod", "-n", namespace, "--timeout=2m", "--all")
+	kubectl.MustSucceed(t, "wait", "--for=condition=Ready", "pod", "-n", namespace, "--timeout=5m", "--all")
 }
 
 func createResources(t *testing.T, c *framework.Clients, namespace string) {
diff --git a/test/framework/helper.go b/test/framework/helper.go
index e32d71bea5..f1021e98d0 100644
--- a/test/framework/helper.go
+++ b/test/framework/helper.go
@@ -85,14 +85,12 @@ func TearDown(t *testing.T, cs *Clients, namespace string) {
 			t.Log(string(bs))
 		}
 		Header(t.Logf, fmt.Sprintf("Dumping logs from Pods in the %s", namespace))
-		taskruns, err := cs.TaskRunClient.List(context.Background(), metav1.ListOptions{})
+		pods, err := cs.KubeClient.CoreV1().Pods(namespace).List(context.Background(), metav1.ListOptions{})
 		if err != nil {
-			t.Errorf("Error getting TaskRun list %s", err)
+			t.Errorf("Error getting pods list %s", err)
 		}
-		for _, tr := range taskruns.Items {
-			if tr.Status.PodName != "" {
-				CollectPodLogs(cs, tr.Status.PodName, namespace, t.Logf)
-			}
+		for _, pod := range pods.Items {
+			CollectPodLogs(cs, pod.Name, namespace, t.Logf)
 		}
 	}
 
diff --git a/test/resources/eventlistener/eventlistener_log.yaml b/test/resources/eventlistener/eventlistener_log.yaml
index 5e14e80130..1c52e50a08 100644
--- a/test/resources/eventlistener/eventlistener_log.yaml
+++ b/test/resources/eventlistener/eventlistener_log.yaml
@@ -18,7 +18,7 @@ kind: EventListener
 metadata:
   name: github-listener-interceptor
 spec:
-  serviceAccountName: tekton-triggers-github-log-sa
+  serviceAccountName: tekton-triggers-github-sa
   triggers:
     - name: github-listener
       interceptors:
@@ -82,18 +82,13 @@ spec:
                   - name: url
                     value: $(tt.params.gitrepositoryurl)
 ---
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: tekton-triggers-github-log-sa
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: tekton-triggers-github-binding
 subjects:
   - kind: ServiceAccount
-    name: tekton-triggers-github-log-sa
+    name: tekton-triggers-github-sa
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role
diff --git a/test/resources/eventlistener/eventlistener_v1beta1_log.yaml b/test/resources/eventlistener/eventlistener_v1beta1_log.yaml
index cf13060851..c622d90103 100644
--- a/test/resources/eventlistener/eventlistener_v1beta1_log.yaml
+++ b/test/resources/eventlistener/eventlistener_v1beta1_log.yaml
@@ -18,7 +18,7 @@ kind: EventListener
 metadata:
   name: github-listener-interceptor
 spec:
-  serviceAccountName: tekton-triggers-github-log-sa
+  serviceAccountName: tekton-triggers-github-sa
   triggers:
     - name: github-listener
       interceptors:
@@ -89,18 +89,13 @@ spec:
                   - name: url
                     value: $(tt.params.gitrepositoryurl)
 ---
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: tekton-triggers-github-log-sa
----
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: tekton-triggers-github-binding
 subjects:
   - kind: ServiceAccount
-    name: tekton-triggers-github-log-sa
+    name: tekton-triggers-github-sa
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: Role