diff --git a/.buildkite/test-e2e.yml b/.buildkite/test-e2e.yml
index c736f4fa19..e5ce56cb18 100644
--- a/.buildkite/test-e2e.yml
+++ b/.buildkite/test-e2e.yml
@@ -11,10 +11,8 @@
     - kind load docker-image kuberay/operator:nightly
     - IMG=kuberay/operator:nightly make deploy
     - kubectl wait --timeout=90s --for=condition=Available=true deployment kuberay-operator
-    # Run e2e tests
-    - KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m go test -timeout 30m -v ./test/e2e
-    # Printing KubeRay operator logs
-    - kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay
+    # Run e2e tests and print KubeRay operator logs if tests fail
+    - KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m go test -timeout 30m -v ./test/e2e || (kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay && exit 1)
 
 - label: 'Test E2E rayservice (nightly operator)'
   instance_size: large
@@ -29,10 +27,8 @@
     - kind load docker-image kuberay/operator:nightly
     - IMG=kuberay/operator:nightly make deploy
     - kubectl wait --timeout=90s --for=condition=Available=true deployment kuberay-operator
-    # Run e2e tests
-    - KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m go test -timeout 30m -v ./test/e2erayservice
-    # Printing KubeRay operator logs
-    - kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay
+    # Run e2e tests and print KubeRay operator logs if tests fail
+    - KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m go test -timeout 30m -v ./test/e2erayservice || (kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay && exit 1)
 
 - label: 'Test Autoscaler E2E (nightly operator)'
   instance_size: large
@@ -47,7 +43,5 @@
     - kind load docker-image kuberay/operator:nightly
     - IMG=kuberay/operator:nightly make deploy
     - kubectl wait --timeout=90s --for=condition=Available=true deployment kuberay-operator
-    # Run e2e tests
-    - KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m go test -timeout 30m -v ./test/e2eautoscaler
-    # Printing KubeRay operator logs
-    - kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay
+    # Run e2e tests and print KubeRay operator logs if tests fail
+    - KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m go test -timeout 30m -v ./test/e2eautoscaler || (kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay && exit 1)