diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d96bec4ad..7d3e937fa 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -112,6 +112,7 @@ jobs:
       MAKEFLAGS: -j4
       CC: clang
       CXX: clang++
+      FC: gfortran-15
       CMAKE_BUILD_TYPE: ${{matrix.build_type}}
       OMPI_MCA_rmaps_base_oversubscribe: 1
       PRTE_MCA_rmaps_default_mapping_policy: :oversubscribe
@@ -124,8 +125,8 @@ jobs:
       uses: actions/setup-python@v6
       with:
         python-version: '3.14'
-    - name: Install MPI (macOS)
-      run: brew install open-mpi
+    - name: Install MPI (macOS) and doxygen
+      run: brew install open-mpi doxygen
     - name: Install Python Dependencies
       run: |
         python -m pip install --upgrade pip
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c5526b61..06ebee3cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,8 @@ and this project adheres to
   different kind happen
 * `PDI_STATUS_MSG` has been added to offer an english description of error
   codes.
+* Added support for MacOS and fixed all CI issues on MacOS, fix
+  [#688](https://github.com/pdidev/pdi/issues/688)
 
 #### Changed
 
diff --git a/bin/build_and_run_all_tests b/bin/build_and_run_all_tests
index b77e6ae57..4da902208 100755
--- a/bin/build_and_run_all_tests
+++ b/bin/build_and_run_all_tests
@@ -86,12 +86,6 @@ then
 	CMAKE_FLAGS="${CMAKE_FLAGS} -DBUILD_NETCDF_PARALLEL=OFF"
 fi
 
-if [[ "x${PDI_SYSTEM}" =~ ^xmacos ]]
-then
-	# Workaround: not all plugins work on OSX yet (https://github.com/pdidev/pdi/issues/580)
-	CMAKE_FLAGS="${CMAKE_FLAGS} -DBUILD_BENCHMARKING=OFF -DBUILD_DOCUMENTATION=OFF -DBUILD_FORTRAN=OFF"
-fi
-
 
 
 # And now for the actual tests