diff --git a/.github/workflows/build-common.yml b/.github/workflows/build-common.yml
index e4585ec7f6cd..a81d6c319979 100644
--- a/.github/workflows/build-common.yml
+++ b/.github/workflows/build-common.yml
@@ -213,6 +213,9 @@ jobs:
           - 1
           - 2
           - 3
+        test-indy:
+          - false
+          - true
         exclude:
           - vm: ${{ inputs.skip-openj9-tests && 'openj9' || '' }}
       fail-fast: false
@@ -281,6 +284,7 @@ jobs:
           ${{ env.test-tasks }}
           -PtestJavaVersion=${{ matrix.test-java-version }}
           -PtestJavaVM=${{ matrix.vm }}
+          -PtestIndy=${{ matrix.test-indy }}
           -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
           -Porg.gradle.java.installations.auto-download=false
           ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
diff --git a/.github/workflows/build-daily-no-build-cache.yml b/.github/workflows/build-daily-no-build-cache.yml
index 596b46773834..4ceddf36c825 100644
--- a/.github/workflows/build-daily-no-build-cache.yml
+++ b/.github/workflows/build-daily-no-build-cache.yml
@@ -19,12 +19,6 @@ jobs:
       max-test-retries: 0
       no-build-cache: true
 
-  test-indy:
-    uses: ./.github/workflows/reusable-test-indy.yml
-    with:
-      max-test-retries: 0
-      no-build-cache: true
-
   # muzzle is not included here because it doesn't use gradle cache anyway and so is already covered
   # by the normal daily build
 
diff --git a/.github/workflows/build-daily.yml b/.github/workflows/build-daily.yml
index 2e6aae3033bc..09891f97b4fe 100644
--- a/.github/workflows/build-daily.yml
+++ b/.github/workflows/build-daily.yml
@@ -17,11 +17,6 @@ jobs:
     with:
       max-test-retries: 0
 
-  test-indy:
-    uses: ./.github/workflows/reusable-test-indy.yml
-    with:
-      max-test-retries: 0
-
   muzzle:
     uses: ./.github/workflows/reusable-muzzle.yml
 
diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml
index 4008f6e2d316..e5ebea0e4274 100644
--- a/.github/workflows/build-pull-request.yml
+++ b/.github/workflows/build-pull-request.yml
@@ -26,11 +26,6 @@ jobs:
     with:
       cache-read-only: true
 
-  test-indy:
-    uses: ./.github/workflows/reusable-test-indy.yml
-    with:
-      cache-read-only: true
-
   test-native:
     uses: ./.github/workflows/reusable-native-tests.yml
     with:
diff --git a/.github/workflows/reusable-test-indy.yml b/.github/workflows/reusable-test-indy.yml
deleted file mode 100644
index cacebf8458a8..000000000000
--- a/.github/workflows/reusable-test-indy.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-name: Reusable - Test latest deps
-
-on:
-  workflow_call:
-    inputs:
-      cache-read-only:
-        type: boolean
-        required: false
-      no-build-cache:
-        type: boolean
-        required: false
-      max-test-retries:
-        type: string
-        required: false
-
-permissions:
-  contents: read
-
-jobs:
-  test-indy:
-    name: testIndy${{ matrix.test-partition }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        test-partition:
-          - 0
-          - 1
-          - 2
-          - 3
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Free disk space
-        run: .github/scripts/gha-free-disk-space.sh
-
-      - name: Set up JDK for running Gradle
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
-        with:
-          distribution: temurin
-          java-version-file: .java-version
-
-      - name: Increase gradle daemon heap size
-        run: |
-          sed -i "s/org.gradle.jvmargs=/org.gradle.jvmargs=-Xmx3g /" gradle.properties
-
-      # vaadin 14 tests fail with node 18
-      - name: Set up Node
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
-        with:
-          node-version: 16
-
-      # vaadin tests use pnpm
-      - name: Cache pnpm modules
-        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
-        with:
-          path: ~/.pnpm-store
-          key: ${{ runner.os }}-test-latest-cache-pnpm-modules
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
-        with:
-          cache-read-only: ${{ inputs.cache-read-only }}
-          # gradle enterprise is used for the build cache
-          gradle-home-cache-excludes: caches/build-cache-1
-
-      - name: List tests
-        run: >
-          ./gradlew
-          check -x spotlessCheck
-          listTestsInPartition
-          -PtestPartition=${{ matrix.test-partition }}
-
-      - name: Set test tasks
-        run: |
-          echo "test-tasks=$(cat test-tasks.txt | xargs echo | sed 's/\n/ /g')" >> $GITHUB_ENV
-
-      - name: Test
-        run: >
-          ./gradlew
-          ${{ env.test-tasks }}
-          -PtestIndy=true
-          ${{ inputs.no-build-cache && ' --no-build-cache' || '' }}
-          ${{ inputs.max-test-retries && format(' -PmaxTestRetries={0}', inputs.max-test-retries) || '' }}
-
-      - name: Build scan
-        if: ${{ !cancelled() && hashFiles('build-scan.txt') != '' }}
-        run: cat build-scan.txt