diff --git a/.github/workflows/run-all-tests-main.yml b/.github/workflows/run-all-tests-main.yml
deleted file mode 100644
index c93b36f22..000000000
--- a/.github/workflows/run-all-tests-main.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-name: CI Main
-on:
-  push:
-    branches: [ main ]
-  merge_group:
-
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
-jobs:
-
-  test_junit_springboot:
-    name: Spring Boot
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 17
-      - name: Run Spring Boot example
-        # The Spring Boot example project is built with Maven. The shell script builds the project
-        # against the local version of Jazzer and runs its unit and fuzz tests.
-        # Spring version 6 requires JDK 17.
-        run: |
-          cd examples/junit-spring-web
-          ./build-and-run-tests.sh
-        shell: bash
-
-  build_and_test:
-    runs-on: ${{ matrix.os }}
-    name: Build & Test
-    strategy:
-      matrix:
-        os: [ macos-14, windows-2022 ]
-        # Test JDK 8 on Windows and mac only on main.
-        jdk: [8]
-        include:
-          - os: macos-14
-            arch: "macos-arm64"
-            bazel_args: "--xcode_version_config=//.github:host_xcodes"
-          - os: windows-2022
-            arch: "windows"
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: zulu
-          java-version: 21
-
-      - name: Install Clang on Windows
-        if: matrix.os == 'windows-2022'
-        run: |
-          choco install llvm --version=19.1.0 --force
-          echo "C:\Program Files\LLVM\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-
-      - name: Set Build Buddy config
-        run: .github/scripts/echoBuildBuddyConfig.sh ${{ secrets.BUILDBUDDY_API_KEY }} >> $GITHUB_ENV
-        shell: bash
-
-      - name: Build & Test
-        run: bazelisk test ${{env.BUILD_BUDDY_CONFIG}} --java_runtime_version=remotejdk_${{ matrix.jdk }} ${{ matrix.bazel_args }} ${{ matrix.extra_bazel_args }} --build_tag_filters="-no-${{ matrix.arch }},-no-${{ matrix.arch }}-jdk${{ matrix.jdk }},-no-jdk${{ matrix.jdk }}" --test_tag_filters="-no-${{ matrix.arch }},-no-${{ matrix.arch }}-jdk${{ matrix.jdk }},-no-jdk${{ matrix.jdk }}" //...
-
-      - name: Copy Bazel log
-        if: always()
-        shell: bash
-        run: cp "$(readlink bazel-out)"/../../../java.log* .
-
-      - name: Upload test logs
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: testlogs-${{ matrix.arch }}-${{ matrix.jdk }}
-          # https://github.com/actions/upload-artifact/issues/92#issuecomment-711107236
-          path: |
-            bazel-testlogs*/**/test.log
-            java.log*
diff --git a/.github/workflows/run-all-tests-pr.yml b/.github/workflows/run-all-tests-pr.yml
index 42f50b42b..8efd5e238 100644
--- a/.github/workflows/run-all-tests-pr.yml
+++ b/.github/workflows/run-all-tests-pr.yml
@@ -12,13 +12,32 @@ concurrency:
 
 jobs:
 
+  test_junit_springboot:
+    name: Spring Boot
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: zulu
+          java-version: 17
+      - name: Run Spring Boot example
+        # The Spring Boot example project is built with Maven. The shell script builds the project
+        # against the local version of Jazzer and runs its unit and fuzz tests.
+        # Spring version 6 requires JDK 17.
+        run: |
+          cd examples/junit-spring-web
+          ./build-and-run-tests.sh
+        shell: bash
+
   build_and_test:
     runs-on: ${{ matrix.os }}
     name: Build & Test
     strategy:
       matrix:
         os: [ubuntu-22.04, windows-2022, macos-14]
-        jdk: [21]
+        jdk: [21, 8]
         include:
           - jdk: 21
             # Workaround for https://github.com/bazelbuild/bazel/issues/14502
@@ -27,8 +46,7 @@ jobs:
 #            arch: "linux"
 #            bazel_args: "//launcher/android:jazzer_android"
           - os: ubuntu-22.04
-            # Use JDK 8 only on Ubuntu in PRs.
-            jdk: 8
+            arch: "linux"
           - os: macos-14
             arch: "macos-arm64"
             bazel_args: "--xcode_version_config=//.github:host_xcodes"