diff --git a/.github/workflows/UnitTests.yml b/.github/workflows/UnitTests.yml
index aedd88a30..3fa52ea38 100644
--- a/.github/workflows/UnitTests.yml
+++ b/.github/workflows/UnitTests.yml
@@ -523,6 +523,8 @@ jobs:
         include:
           - container: ghcr.io/juliaparallel/github-actions-buildcache:mvapich2-jq
             name: "MVAPICH 2.3.7"
+          - container: ghcr.io/juliaparallel/github-actions-buildcache:mvapich3-jq
+            name: "MVAPICH 3.0"
 
       fail-fast: false
 
@@ -534,6 +536,9 @@ jobs:
       JULIA_MPI_TEST_BINARY: system
       JULIA_MPI_TEST_EXCLUDE: test_spawn.jl
       MV2_SMP_USE_CMA: 0
+      # Work around issue with affinity not set.  Ref:
+      # https://github.com/JuliaParallel/MPI.jl/pull/810#issuecomment-1920255386
+      MVP_ENABLE_AFFINITY: 0
 
     steps:
     - name: Checkout
diff --git a/lib/MPIPreferences/src/MPIPreferences.jl b/lib/MPIPreferences/src/MPIPreferences.jl
index 847a14d21..b6a0b220e 100644
--- a/lib/MPIPreferences/src/MPIPreferences.jl
+++ b/lib/MPIPreferences/src/MPIPreferences.jl
@@ -297,7 +297,7 @@ function identify_implementation_version_abi(version_string::AbstractString)
             end
         end
 
-    elseif startswith(version_string, "MVAPICH2")
+    elseif startswith(version_string, "MVAPICH")
         impl = "MVAPICH"
         # "MVAPICH2 Version      :\t%s\n")
         if (m = match(r"^MVAPICH2? Version\s*:\t(\S*)\n", version_string)) !== nothing