diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 533f0d76..248cf43b 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -48,8 +48,6 @@ jobs:
       - name: Build macos-12 wheels
         if: matrix.os == 'macos-12'
         env:
-          # all cp3xx, since old macs seem to only use osx 12+ builds if this is set not "none"
-          # see consistency with get_tag() in setup.py
           MACOSX_DEPLOYMENT_TARGET: 12
           CIBW_BUILD: cp311-*
           CIBW_SKIP: pp*
@@ -138,7 +136,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ macos-12, macos-13, macos-13-xlarge, macos-14, ubuntu-latest, windows-latest ]
+        os: [ macos-12, macos-13, macos-14, ubuntu-20.04, windows-latest ]
 
     steps:
       - uses: actions/setup-python@v5
diff --git a/.travis.yml b/.travis.yml
index c93e0169..45e560dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,6 +39,7 @@ jobs:
         - FORTRAN="test"
       language: minimal
     - name: "Jammy + Python 3.12"
+      if: NOT commit_message =~ /\[pypi\]/ AND NOT commit_message =~ /\[testpypi\]/
       addons:
         apt:
           packages:
diff --git a/fortran/Makefile b/fortran/Makefile
index 314332d3..4bf28d89 100644
--- a/fortran/Makefile
+++ b/fortran/Makefile
@@ -102,9 +102,6 @@ SFFLAGS += -static-libgfortran -static-libgcc -static-libquadmath
 endif
 else
 SFFLAGS = -shared -fpic
-ifneq ($(CIBW_BUILD),)
-SFFLAGS += -static-libgfortran -static-libgcc
-endif
 endif
 
 
diff --git a/setup.py b/setup.py
index 2595d0f9..20176068 100644
--- a/setup.py
+++ b/setup.py
@@ -287,5 +287,4 @@ def run(self):
           package_data={'camb': [DLLNAME, 'HighLExtrapTemplate_lenspotentialCls.dat',
                                  'PArthENoPE_880.2_marcucci.dat', 'PArthENoPE_880.2_standard.dat',
                                  'PRIMAT_Yp_DH_Error.dat', 'PRIMAT_Yp_DH_ErrorMC_2021.dat']},
-          test_suite='camb.tests'
           )