diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2136507402..2701dd3d60 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -112,42 +112,10 @@ jobs:
         run: |
           make test-${{ matrix.module }}
 
-  set-test-package-matrix:
-    runs-on: ${{ fromJSON(vars.RUNNER) }}
-    needs:
-      - setup
-    outputs:
-      package-matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-      - name: Set up go
-        uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
-        with:
-          go-version: "${{ needs.setup.outputs.go-version }}"
-          cache: false
-      - name: Set up Go modules cache
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: |
-            ${{ needs.setup.outputs.cache-go-build }}
-            ${{ needs.setup.outputs.cache-go-mod }}
-            ${{ needs.setup.outputs.cache-go-bin }}
-          key: ${{ needs.setup.outputs.go-cache-key }}
-          restore-keys: |
-            ${{ runner.os }}-go
-          fail-on-cache-miss: true
-      - id: set-matrix
-        run: ./.github/scripts/set-test-package-matrix.sh
-
   test:
     needs:
       - setup
-      - set-test-package-matrix
-    runs-on: ${{ fromJSON(vars.RUNNER) }}
-    strategy:
-      fail-fast: false
-      matrix:
-        package: ${{ fromJson(needs.set-test-package-matrix.outputs.package-matrix) }}
+    runs-on: ${{ fromJSON(vars.RUNNER_LARGE) }}
     steps:
       - name: ulimit
         run: |
@@ -181,6 +149,12 @@ jobs:
           key: ${{ needs.setup.outputs.plugin-cache-key }}
           restore-keys: |
             ${{ runner.os }}-plugin
+      - name: GH fix for localhost resolution
+        if: github.repository == 'hashicorp/boundary'
+        run: |
+          cat /etc/hosts && echo "-----------"
+          sudo sed -i 's/::1 *localhost ip6-localhost ip6-loopback/::1 ip6 -localhost ip6-loopback/g' /etc/hosts
+          cat /etc/hosts
       - name: Initialize Test Database
         run: |
           which pg_isready || sudo apt-get update && sudo apt-get install -y postgresql-client
@@ -190,8 +164,7 @@ jobs:
       - name: Test
         uses: nick-fields/retry@943e742917ac94714d2f408a0e8320f2d1fcafcd   # TSCCR: no entry for repository "nick-fields/retry"
         env:
-          TEST_PACKAGE: "${{ matrix.package }}"
-          GOMAXPROCS: ${{ vars.TEST_GOMAXPROCS }}
+          TEST_PACKAGE: "./..."
           TESTARGS: -v
           TEST_TIMEOUT: 120m
         with: