diff --git a/.github/workflows/sycl-linux-build.yml b/.github/workflows/sycl-linux-build.yml
index 13583e7a44142..e3b350fbac3cb 100644
--- a/.github/workflows/sycl-linux-build.yml
+++ b/.github/workflows/sycl-linux-build.yml
@@ -339,10 +339,6 @@ jobs:
         sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++
         extra_lit_opts: --param sycl_build_targets="spir;nvidia;amd"
 
-    - name: Remove E2E tests before spirv-backend run
-      if: ${{ inputs.e2e_binaries_spirv_backend_artifact && !cancelled() && steps.build.conclusion == 'success' }}
-      run: rm -rf build-e2e
-
     - name: Build E2E tests with SPIR-V Backend
       if: ${{ inputs.e2e_binaries_spirv_backend_artifact && !cancelled() && steps.build.conclusion == 'success' }}
       uses: ./devops/actions/run-tests/e2e
@@ -354,10 +350,6 @@ jobs:
         sycl_compiler: $GITHUB_WORKSPACE/toolchain/bin/clang++
         extra_lit_opts: --param spirv-backend=True
 
-    - name: Remove E2E tests before preview-mode run
-      if: ${{ inputs.e2e_binaries_preview_artifact && !cancelled() && steps.build.conclusion == 'success' }}
-      run: rm -rf build-e2e
-
     - name: Build E2E tests in Preview Mode
       if: ${{ inputs.e2e_binaries_preview_artifact && !cancelled() && steps.build.conclusion == 'success' }}
       uses: ./devops/actions/run-tests/e2e
diff --git a/devops/actions/run-tests/e2e/action.yml b/devops/actions/run-tests/e2e/action.yml
index c78935eab8eb5..f277e02518359 100644
--- a/devops/actions/run-tests/e2e/action.yml
+++ b/devops/actions/run-tests/e2e/action.yml
@@ -106,3 +106,8 @@ runs:
       name: ${{ inputs.binaries_artifact }}
       path: e2e_binaries.tar.zst
       retention-days: ${{ inputs.retention-days }}
+  - name: Cleanup E2E tests
+    if: ${{ !cancelled() }}
+    shell: bash
+    run: |
+      rm -rf build-e2e
diff --git a/devops/actions/run-tests/windows/e2e/action.yml b/devops/actions/run-tests/windows/e2e/action.yml
index 5400db21a7cf3..0a3ac8d92df04 100644
--- a/devops/actions/run-tests/windows/e2e/action.yml
+++ b/devops/actions/run-tests/windows/e2e/action.yml
@@ -121,3 +121,7 @@ runs:
       name: ${{ inputs.binaries_artifact }}
       path: e2e_bin.tar.gz
       retention-days: ${{ inputs.retention-days }}
+  - name: Cleanup E2E tests
+    if: ${{ !cancelled() }}
+    shell: bash
+    run: rm -rf build-e2e