diff --git a/.github/workflows/test_hpb.yml b/.github/workflows/test_hpb.yml
new file mode 100644
index 0000000..1bd6bf6
--- /dev/null
+++ b/.github/workflows/test_hpb.yml
@@ -0,0 +1,43 @@
+name: hpb tests
+
+on:
+  workflow_call:
+    inputs:
+      safe-checkout:
+        required: true
+        description: "The SHA key for the commit we want to run over"
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  # hpb tests are always run on presubmit
+  linux:
+    strategy:
+      fail-fast: false   # Don't cancel all jobs if one fails.
+      matrix:
+        config:
+          - { name: Optimized, flags: --config=opt }
+
+        include:
+          - targets: "//hpb/... //hpb_generator/..."
+          - image: "us-docker.pkg.dev/protobuf-build/containers/common/linux/bazel:8.0.1-e78301df86b3e4c46ec9ac4d98be00e19305d8f3"
+          - bazel_cmd: "test"
+
+    name: Linux ${{ matrix.config.name }}
+    runs-on: ubuntu-22-4core
+    steps:
+      - name: Checkout pending changes
+        uses: protocolbuffers/protobuf-ci/checkout@v4
+        with:
+          ref: ${{ inputs.safe-checkout }}
+      - name: Run tests
+        uses: protocolbuffers/protobuf-ci/bazel-docker@v4
+        with:
+          image: ${{ matrix.image }}
+          credentials: ${{ secrets.GAR_SERVICE_ACCOUNT }}
+          bazel-cache: hpb_linux
+          bazel: >-
+            ${{ matrix.bazel_cmd }} --cxxopt=-Wno-trigraphs
+            ${{ matrix.targets }} ${{ matrix.config.flags }}
diff --git a/.github/workflows/test_runner.yml b/.github/workflows/test_runner.yml
index 35218e4..cc656ed 100644
--- a/.github/workflows/test_runner.yml
+++ b/.github/workflows/test_runner.yml
@@ -236,6 +236,14 @@
       continuous-prefix: ${{ needs.set-vars.outputs.continuous-prefix }}
     secrets: inherit
 
+  hpb:
+    name: hpb
+    needs: [set-vars]
+    uses: ./.github/workflows/test_hpb.yml
+    with:
+      safe-checkout: ${{ needs.set-vars.outputs.checkout-sha }}
+    secrets: inherit
+
   staleness:
     name: Staleness
     needs: [set-vars]
@@ -250,7 +258,7 @@
   # This test depends on all blocking tests and indicates whether they all suceeded.
   all-blocking-tests:
     name: All Blocking Tests${{ github.event_name == 'pull_request_target' && ' (fork)' || ''}}
-    needs: [set-vars, validate-yaml, bazel, cpp, java, python, ruby, php, php-ext, csharp, objectivec, rust, upb, staleness]
+    needs: [set-vars, validate-yaml, bazel, cpp, java, python, ruby, php, php-ext, csharp, objectivec, rust, upb, hpb, staleness]
     runs-on: ubuntu-latest
     steps:
       - name: Check test results