diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index fced997..18f95db 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -124,15 +124,26 @@ jobs:
         GITHUB_WEBHOOK_SECRET: 'test-secret'
         GITHUB_TOKEN: 'test-token'
 
-  # E2E tests - full system testing
+  # E2E tests - run after Docker images are built
   test-e2e:
     name: E2E Tests
     runs-on: ubuntu-latest
+    needs: [docker-build]
+    if: always() && (needs.docker-build.result == 'success' || needs.docker-build.result == 'skipped')
     
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
 
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Build Docker images for e2e tests
+      run: |
+        # Build images with the names e2e tests expect
+        docker build -t claude-github-webhook:latest -f Dockerfile .
+        docker build -t claude-code-runner:latest -f Dockerfile.claudecode .
+
     - name: Setup Node.js
       uses: actions/setup-node@v4
       with:
@@ -274,7 +285,7 @@ jobs:
     name: Docker Build Test
     runs-on: ubuntu-latest
     if: needs.changes.outputs.docker == 'true' || needs.changes.outputs.src == 'true'
-    needs: [test-unit, test-e2e, lint, changes, security, codeql]
+    needs: [test-unit, lint, changes, security, codeql]
     
     steps:
     - name: Checkout code