diff --git a/.buildkite/test-apiserver-e2e.yml b/.buildkite/test-apiserver-e2e.yml
new file mode 100644
index 00000000000..e22bdebd551
--- /dev/null
+++ b/.buildkite/test-apiserver-e2e.yml
@@ -0,0 +1,22 @@
+- label: 'Test Apiserver E2E (nightly operator)'
+  instance_size: large
+  image: golang:1.24
+  commands:
+    - source .buildkite/setup-env.sh
+    - kind create cluster --wait 900s --config ./ci/kind-config-buildkite.yml
+    - kubectl config set clusters.kind-kind.server https://docker:6443
+    # Build nightly KubeRay operator image
+    - pushd ray-operator
+    - bash ../.buildkite/build-start-operator.sh
+    - kubectl wait --timeout=90s --for=condition=Available=true deployment kuberay-operator
+    # Build and start apiserver
+    - pushd ../apiserver
+    - KIND_CLUSTER_NAME=kind KIND=kind make install
+    - kubectl wait --namespace ray-system --for=condition=Available --timeout=90s deployment/kuberay-apiserver -n ray-system
+    # Run e2e tests and print KubeRay api server logs if tests fail
+    - echo "--- START:Running e2e apiserver (nightly operator) tests"
+    - set -o pipefail
+    - mkdir -p "$(pwd)/tmp" && export KUBERAY_TEST_OUTPUT_DIR=$(pwd)/tmp
+    - echo "KUBERAY_TEST_OUTPUT_DIR=$$KUBERAY_TEST_OUTPUT_DIR"
+    - E2E_API_SERVER_URL="http://docker:31888" go test -parallel 4 -timeout 60m -v ./test/e2e/... 2>&1 | awk -f ../.buildkite/format.awk | tee $$KUBERAY_TEST_OUTPUT_DIR/gotest.log || (kubectl logs -l app.kubernetes.io/component=kuberay-apiserver --namespace ray-system | tee $$KUBERAY_TEST_OUTPUT_DIR/kuberay-apiserver.log && cd $$KUBERAY_TEST_OUTPUT_DIR && find . -name "*.log" | tar -cf /artifact-mount/e2e-apiserver-log.tar -T - && exit 1)
+    - echo "--- END:Apiserver e2e (nightly operator) tests finished"
diff --git a/.buildkite/test-e2e.yml b/.buildkite/test-ray-operator-e2e.yml
similarity index 78%
rename from .buildkite/test-e2e.yml
rename to .buildkite/test-ray-operator-e2e.yml
index 8206b6ca678..fdb29b1701c 100644
--- a/.buildkite/test-e2e.yml
+++ b/.buildkite/test-ray-operator-e2e.yml
@@ -76,26 +76,3 @@
     - echo "KUBERAY_TEST_OUTPUT_DIR=$$KUBERAY_TEST_OUTPUT_DIR"
     - KUBERAY_TEST_TIMEOUT_SHORT=1m KUBERAY_TEST_TIMEOUT_MEDIUM=5m KUBERAY_TEST_TIMEOUT_LONG=10m KUBERAY_TEST_UPGRADE_IMAGE=v1.3.0 go test -timeout 30m -v ./test/e2eupgrade 2>&1 | awk -f ../.buildkite/format.awk | tee $$KUBERAY_TEST_OUTPUT_DIR/gotest.log || (kubectl logs --tail -1 -l app.kubernetes.io/name=kuberay | tee $$KUBERAY_TEST_OUTPUT_DIR/kuberay-operator.log && cd $$KUBERAY_TEST_OUTPUT_DIR && find . -name "*.log" | tar -cf /artifact-mount/e2e-upgrade-log.tar -T - && exit 1)
     - echo "--- END:e2e Operator upgrade (v1.2.2 to v1.3.0 operator) tests finished"
-
-- label: 'Test Apiserver E2E (nightly operator)'
-  instance_size: large
-  image: golang:1.24
-  commands:
-    - source .buildkite/setup-env.sh
-    - kind create cluster --wait 900s --config ./ci/kind-config-buildkite.yml
-    - kubectl config set clusters.kind-kind.server https://docker:6443
-    # Build nightly KubeRay operator image
-    - pushd ray-operator
-    - bash ../.buildkite/build-start-operator.sh
-    - kubectl wait --timeout=90s --for=condition=Available=true deployment kuberay-operator
-    # Build and start apiserver
-    - pushd ../apiserver
-    - KIND_CLUSTER_NAME=kind KIND=kind make install
-    - kubectl wait --namespace ray-system --for=condition=Available --timeout=90s deployment/kuberay-apiserver -n ray-system
-    # Run e2e tests and print KubeRay api server logs if tests fail
-    - echo "--- START:Running e2e apiserver (nightly operator) tests"
-    - set -o pipefail
-    - mkdir -p "$(pwd)/tmp" && export KUBERAY_TEST_OUTPUT_DIR=$(pwd)/tmp
-    - echo "KUBERAY_TEST_OUTPUT_DIR=$$KUBERAY_TEST_OUTPUT_DIR"
-    - E2E_API_SERVER_URL="http://docker:31888" go test -parallel 4 -timeout 60m -v ./test/e2e/... 2>&1 | awk -f ../.buildkite/format.awk | tee $$KUBERAY_TEST_OUTPUT_DIR/gotest.log || (kubectl logs -l app.kubernetes.io/component=kuberay-apiserver --namespace ray-system | tee $$KUBERAY_TEST_OUTPUT_DIR/kuberay-apiserver.log && cd $$KUBERAY_TEST_OUTPUT_DIR && find . -name "*.log" | tar -cf /artifact-mount/e2e-apiserver-log.tar -T - && exit 1)
-    - echo "--- END:Apiserver e2e (nightly operator) tests finished"