diff --git a/.circleci/config.yml b/.circleci/config.yml
index 29f05869612d..90c5f95229ff 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,18 +7,41 @@ workflows:
   build-and-test:
     jobs:
 
-      # Builds MAPL in a "default" way
+      # Builds MAPL in a "default" way - Intel
       - ci/build:
           name: build-and-test-MAPL-on-<< matrix.compiler >>
           context:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [gfortran, ifort]
+              compiler: [ifort]
+          repo: MAPL
+          mepodevelop: false
+          run_unit_tests: true
+          ctest_options: "-LE PERFORMANCE --output-on-failure"
+
+      # Builds MAPL in a "default" way - GNU
+      #
+      # NOTE: Currently Open MPI fails on the bundleio with:
+      #
+      #   The OSC pt2pt component does not support MPI_THREAD_MULTIPLE in this release.
+      #   Workarounds are to run on a single node, or to use a system with an RDMA
+      #   capable network such as Infiniband.
+      #
+      # For now, we run GNU/Open MPI without the bundleio tests. Some indications that
+      # Open MPI 5 will not have this limitation
+
+      - ci/build:
+          name: build-and-test-MAPL-on-<< matrix.compiler >>
+          context:
+            - docker-hub-creds
+          matrix:
+            parameters:
+              compiler: [gfortran]
           repo: MAPL
           mepodevelop: false
           run_unit_tests: true
-          ctest_options: "-R MAPL -LE PERFORMANCE --output-on-failure"
+          ctest_options: "-E bundleio -LE PERFORMANCE --output-on-failure"
 
       # Builds MAPL like UFS does (no FLAP and pFlogger, static)
       - ci/build:
@@ -32,7 +55,7 @@ workflows:
           mepodevelop: false
           extra_cmake_options: "-DBUILD_WITH_FLAP=OFF -DBUILD_WITH_PFLOGGER=OFF -DBUILD_SHARED_MAPL=OFF"
           run_unit_tests: true
-          ctest_options: "-R MAPL -LE PERFORMANCE --output-on-failure"
+          ctest_options: "-LE PERFORMANCE --output-on-failure"
 
       # Build GEOSgcm
       - ci/build:
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 05fa5f62f17a..6b393d5260a3 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -61,7 +61,15 @@ jobs:
           cd build
           make -j4 build-tests
           # skip performance tests
-          ctest -R MAPL -LE PERFORMANCE --output-on-failure
+          # NOTE: Currently Open MPI fails on the bundleio with:
+          #
+          #   The OSC pt2pt component does not support MPI_THREAD_MULTIPLE in this release.
+          #   Workarounds are to run on a single node, or to use a system with an RDMA
+          #   capable network such as Infiniband.
+          #
+          # For now, we run GNU/Open MPI without the bundleio tests. Some indications that
+          # Open MPI 5 will not have this limitation
+          ctest -E bundleio -LE PERFORMANCE --output-on-failure
   build_test_mapl_intel:
     name: Build and Test MAPL Intel
     runs-on: ubuntu-latest
@@ -106,4 +114,4 @@ jobs:
           cd build
           make -j4 build-tests
           # skip performance tests
-          ctest -R MAPL -LE PERFORMANCE --output-on-failure
+          ctest -LE PERFORMANCE --output-on-failure
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a0a4489f9c0..9864344ee9fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Update CI to work with latest GEOSadas `develop` (Uses a special branch of GEOSadas)
+- Fix bundleio tests
 
 ### Added
 
@@ -19,7 +20,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Enable GCM run test in CircleCI (1-hour, no ExtData)
 - Added monotonic regridding option
 - Make availalbe to History and ExtData2G all supported regridding methods
-- Fix bundleio tests
 
 ### Changed
 
@@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Updated the ESMA_cmake version to v3.16.0
 - Updated GitHub Actions MAPL build tests
 - Added assert for missing file with ExtData2G
+- Re-enable bundleio tests in CI
 
 ### Removed