diff --git a/.github/workflows/aocc-auto.yml b/.github/workflows/aocc-auto.yml
index a1927eb0403..b556737e3b1 100644
--- a/.github/workflows/aocc-auto.yml
+++ b/.github/workflows/aocc-auto.yml
@@ -79,24 +79,32 @@ jobs:
 
       - name: Autotools Build
         shell: bash
-        env:
-          NPROCS: 2
         run: |
           export PATH=/home/runner/work/hdf5/hdf5/openmpi-4.1.6-install/bin:/usr/local/bin:$PATH
           make -j3
         working-directory: ${{ runner.workspace }}/build
 
+      # ph5diff tests are in the tools/tests directory so they will get run
+      # here, so leave NPROCS set here as well
       - name: Autotools Run Tests
         env:
           NPROCS: 2
         run: |
           export PATH=/home/runner/work/hdf5/hdf5/openmpi-4.1.6-install/bin:/usr/local/bin:$PATH
-          make check -j
+          cd test && make check -j2 && cd ..
+          cd tools && make check -j2 && cd ..
+          cd hl && make check -j2 && cd ..
         working-directory: ${{ runner.workspace }}/build
 
-      - name: Autotools Install
+      - name: Autotools Run Parallel Tests
         env:
           NPROCS: 2
+        run: |
+          export PATH=/home/runner/work/hdf5/hdf5/openmpi-4.1.6-install/bin:/usr/local/bin:$PATH
+          cd testpar && make check && cd ..
+        working-directory: ${{ runner.workspace }}/build
+
+      - name: Autotools Install
         run: |
           export PATH=/home/runner/work/hdf5/hdf5/openmpi-4.1.6-install/bin:/usr/local/bin:$PATH
           make install
diff --git a/.github/workflows/aocc-cmake.yml b/.github/workflows/aocc-cmake.yml
index 71966caf41e..92ac0d25fe8 100644
--- a/.github/workflows/aocc-cmake.yml
+++ b/.github/workflows/aocc-cmake.yml
@@ -89,5 +89,11 @@ jobs:
       - name: CMake Run Tests
         shell: bash
         run: |
-          ctest . --parallel 2 -C ${{ inputs.build_mode }} -V
+          ctest . -E MPI_TEST --parallel 2 -C ${{ inputs.build_mode }} -V
+        working-directory: ${{ runner.workspace }}/build
+
+      - name: CMake Run Parallel Tests
+        shell: bash
+        run: |
+          ctest . -R MPI_TEST -C ${{ inputs.build_mode }} -V
         working-directory: ${{ runner.workspace }}/build