diff --git a/.github/workflows/ci_docs.yml b/.github/workflows/ci_docs.yml
index 62cf388cb7d..e75d638fb58 100644
--- a/.github/workflows/ci_docs.yml
+++ b/.github/workflows/ci_docs.yml
@@ -135,29 +135,14 @@ jobs:
           python -m pip install dist/*
 
       - name: Build the HTML documentation
+        run: make -C doc clean html
         env:
           GMT_DATA_SERVER: https://opentopography.s3.sdsc.edu/gmtdata
-        run: |
-          log_file="${RUNNER_TEMP}/sphinx-html.log"
-          make -C doc clean html 2>&1 | tee "${log_file}"
-          exit_code=${PIPESTATUS[0]}
-          if [[ "${RUNNER_OS}" == "Windows" && "${exit_code}" -eq 2 ]] && grep -q "make: .* Error 2816" "${log_file}"; then
-            echo "Sphinx HTML build exited with make error 2816 (segmentation fault) on Windows; allowing workflow to continue."
-            exit 0
-          fi
-          exit "${exit_code}"
 
       - name: Build the PDF documentation
+        run:  make -C doc pdf
         env:
           GMT_DATA_SERVER: https://opentopography.s3.sdsc.edu/gmtdata
-        run: |
-          log_file="${RUNNER_TEMP}/sphinx-pdf.log"
-          make -C doc pdf 2>&1 | tee "${log_file}"
-          exit_code=${PIPESTATUS[0]}
-          if [[ "${RUNNER_OS}" == "Windows" && "${exit_code}" -eq 2 ]] && grep -q "make: .* Error 2816" "${log_file}"; then
-            echo "Sphinx PDF build exited with make error 2816 (segmentation fault) on Windows; allowing workflow to continue."
-            exit 0
-          fi
 
       - name: Create the HTML ZIP archive and rename the PDF file
         run: |
diff --git a/.github/workflows/ci_doctests.yaml b/.github/workflows/ci_doctests.yaml
index bda06d0491d..8240b9f4b0d 100644
--- a/.github/workflows/ci_doctests.yaml
+++ b/.github/workflows/ci_doctests.yaml
@@ -84,14 +84,6 @@ jobs:
 
       # Run the doctests
       - name: Run doctests
+        run: make doctest PYTEST_EXTRA="-r P"
         env:
-          GMT_DATA_SERVER: https://opentopography.s3.sdsc.edu/gmtdata
-        run: |
-          log_file="${RUNNER_TEMP}/pytest.log"
-          make doctest PYTEST_EXTRA="-r P" 2>&1 | tee "${log_file}"
-          exit_code=${PIPESTATUS[0]}
-          if [[ "${RUNNER_OS}" == "Windows" && "${exit_code}" -eq 2 ]] && grep -q "make: .* Error 2816" "${log_file}"; then
-            echo "Doctests exited with make error 2816 (segmentation fault) on Windows; allowing workflow to continue."
-            exit 0
-          fi
-          exit "${exit_code}"
+          GMT_DATA_SERVER: https://opentopography.s3.sdsc.edu/gmtdata
\ No newline at end of file
diff --git a/.github/workflows/ci_tests.yaml b/.github/workflows/ci_tests.yaml
index a19ad3fc4bf..c42180a3629 100644
--- a/.github/workflows/ci_tests.yaml
+++ b/.github/workflows/ci_tests.yaml
@@ -189,18 +189,10 @@ jobs:
 
       # Run the regular tests
       - name: Run tests
+        run: make test PYTEST_EXTRA="-r P --reruns 2"
         env:
           GMT_DATA_SERVER: https://opentopography.s3.sdsc.edu/gmtdata
-        run: |
-          log_file="${RUNNER_TEMP}/pytest.log"
-          make test PYTEST_EXTRA="-r P --reruns 2" 2>&1 | tee "${log_file}"
-          exit_code=${PIPESTATUS[0]}
-          if [[ "${RUNNER_OS}" == "Windows" && "${exit_code}" -eq 2 ]] && grep -q "make: .* Error 2816" "${log_file}"; then
-            echo "Tests exited with make error 2816 (segmentation fault) on Windows; allowing workflow to continue."
-            exit 0
-          fi
-          exit "${exit_code}"
-
+ 
       # Upload diff images on test failure
       - name: Upload diff images if any test fails
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1