diff --git a/.github/bazel_version.json b/.github/bazel_version.json
deleted file mode 100644
index 98faab3e..00000000
--- a/.github/bazel_version.json
+++ /dev/null
@@ -1,6 +0,0 @@
-[
-    "6.5.0",
-    "7.7.1",
-    "8.5.1"
-]
-
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 2e3995e7..928b8423 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -35,29 +35,15 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  load_versions:
-    name: "Load bazel versions for tests"
-    runs-on: ubuntu-24.04
-    outputs:
-      bazel_version: ${{ steps.generate_matrix.outputs.matrix_json }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        
-      - name: Load versions
-        id: generate_matrix
-        run: |
-          JSON=$(jq -c . ./.github/bazel_version.json)
-          echo "matrix_json=$JSON" >> $GITHUB_OUTPUT
-
   ubuntu_test:
     name: "Tests: Bazel ${{ matrix.bazel_version }} (Ubuntu)"
     runs-on: ubuntu-24.04
-    needs: load_versions
     strategy:
       fail-fast: false
       matrix:
-        bazel_version: ${{ fromJson(needs.load_versions.outputs.bazel_version) }}
+        bazel_version:
+          - "7.7.1"
+          - "8.5.1"
 
     steps:
       - name: Checkout repository
@@ -116,11 +102,12 @@ jobs:
     container:
       image: redhat/ubi9:latest
       options: --init
-    needs: load_versions
     strategy:
       fail-fast: false
       matrix:
-        bazel_version: ${{ fromJson(needs.load_versions.outputs.bazel_version) }}
+        bazel_version:
+          - "7.7.1"
+          - "8.5.1"
 
     steps:
       - name: Checkout repository
diff --git a/test/unit/external_repository/test_external_repo.py b/test/unit/external_repository/test_external_repo.py
index 12c6d764..22dbdaf1 100644
--- a/test/unit/external_repository/test_external_repo.py
+++ b/test/unit/external_repository/test_external_repo.py
@@ -103,14 +103,7 @@ def test_compile_commands_external_lib(self):
             "compile_commands.json",
         )
 
-        # The ~override part is a consquence of using Bzlmod.
-        if self.BAZEL_VERSION.startswith("6"):  # type: ignore
-            pattern1 = "-isystem external/external_lib~override/include"
-            pattern2 = (
-                "-isystem bazel-out/k8-fastbuild/bin/external/"
-                "external_lib~override/include"
-            )
-        elif self.BAZEL_VERSION.startswith("7"):  # type: ignore
+        if self.BAZEL_VERSION.startswith("7"):  # type: ignore
             pattern1 = "-isystem external/external_lib~/include"
             pattern2 = (
                 "-isystem bazel-out/k8-fastbuild/bin/external/"