diff --git a/.github/workflows/index_build_tests.yml b/.github/workflows/index_build_tests.yml
new file mode 100644
index 000000000000..6af39e69131e
--- /dev/null
+++ b/.github/workflows/index_build_tests.yml
@@ -0,0 +1,38 @@
+name: indexer tests
+
+permissions:
+  contents: read
+
+on:
+  pull_request:
+    paths:
+      - 'infra/base-images/base-builder/indexer/**'
+      - '.github/workflows/index_build_tests.yml'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    permissions:
+      actions: write
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
+    steps:
+      - uses: actions/checkout@v4
+        with:  # Needed for git diff to work. (get_changed_files)
+          fetch-depth: 0
+      - run: |
+          git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/master
+
+      - name: Setup python environment
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.11
+
+      - name: Get latest indexer binary
+        run: curl -O https://clusterfuzz-builds.storage.googleapis.com/oss-fuzz-artifacts/indexer && chmod +x indexer
+        working-directory: 'infra/base-images/base-builder/indexer'
+
+      - name: Run indexer tests
+        run: sudo env "PATH=$PATH" INDEX_BUILD_TESTS=1 python -m unittest index_build_test
+        working-directory: 'infra/base-images/base-builder/indexer'
\ No newline at end of file
diff --git a/infra/base-images/base-builder/indexer/index_build_test.py b/infra/base-images/base-builder/indexer/index_build_test.py
index 10567dcf5873..6f483b1a9f09 100644
--- a/infra/base-images/base-builder/indexer/index_build_test.py
+++ b/infra/base-images/base-builder/indexer/index_build_test.py
@@ -40,7 +40,7 @@ def _build_project(self, project: str, *additional_args) -> Sequence[Path]:
 
     out_dir = OSS_FUZZ_DIR / f'build/out/{project}'
     docker_args = [
-        'docker', 'run', '--rm', '-ti', '-e', f'PROJECT_NAME={project}', '-v',
+        'docker', 'run', '--rm', '-e', f'PROJECT_NAME={project}', '-v',
         f'{THIS_DIR}:/opt/indexer', '-v', f'{out_dir}:/out',
         f'gcr.io/oss-fuzz/{project}', '/opt/indexer/index_build.py'
     ]