diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index d2966145..d83c2988 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -42,7 +42,7 @@ jobs:
       - run: echo "PKG_CONFIG_PATH=${{ github.workspace }}/.local/lib/pkgconfig" >> $env:GITHUB_ENV
         if: ${{ startsWith(matrix.os, 'windows') }}
       - name: Build wheels
-        uses: pypa/cibuildwheel@v3.4.0
+        uses: pypa/cibuildwheel@v3.4.1
       - uses: actions/upload-artifact@v7
         with:
           name: wheels-${{ matrix.os }}
diff --git a/pyproject.toml b/pyproject.toml
index fdaac951..55976962 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -62,7 +62,7 @@ select = ["E", "F", "I", "PT", "W", "Q", "SIM"]
 
 [tool.cibuildwheel]
 build-frontend = {name="build", args=["--verbose", "-Csetup-args=--vsenv"]}
-enable = "pypy cpython-prerelease cpython-freethreading graalpy"
+enable = "pypy cpython-prerelease graalpy"
 skip = "gp311_242* gp3*win*amd64*"
 
 before-all = "sh scripts/cibw_before_all.sh"
diff --git a/tests/test_mpz.py b/tests/test_mpz.py
index 72b4cb72..1f490819 100644
--- a/tests/test_mpz.py
+++ b/tests/test_mpz.py
@@ -127,9 +127,9 @@ def test_format_interface():
         mx.__format__(321)
     with pytest.raises(ValueError, match="Unknown format code"):
         format(mx, "q")
-    if platform.python_implementation() != "PyPy":  # XXX: pypy/pypy#5311
-        with pytest.raises(ValueError, match="Unknown format code"):
-            format(mx, "\x81")
+    with pytest.raises(ValueError,
+                       match="(Unknown format code|Invalid format specifier)"):
+        format(mx, "\x81")
     with pytest.raises(ValueError,
                        match=(r"Negative zero coercion \(z\) not allowed|"
                               "Invalid conversion specification")):
@@ -195,10 +195,6 @@ def test_format_interface():
         assert format(mx, ".,f") == "123.000,000"
         assert format(mx, "._f") == "123.000_000"
 
-    if (platform.python_implementation() == "PyPy"
-            and sys.pypy_version_info[:3] <= (7, 3, 20)):
-        return  # XXX: pypy/pypy#5311
-
     try:
         locale.setlocale(locale.LC_ALL, "ru_RU.UTF-8")
         s = locale.localeconv()["thousands_sep"]
@@ -700,11 +696,11 @@ def test_power_mod(x, y, z):
         assert pow(mx, my, mz) == r
         assert pow(mx, my, z) == r
         assert pow(mx, y, mz) == r
-        if platform.python_implementation() == "PyPy":
-            return  # XXX: pypy/pypy#5207
         assert pow(x, my, mz) == r
         assert pow(mx, y, z) == r
         assert pow(x, my, z) == r
+        if platform.python_implementation() == "PyPy":
+            return  # XXX: pypy/pypy#5207
         assert pow(x, y, mz) == r
 
 
diff --git a/utils.h b/utils.h
index f13b23c1..4bf83020 100644
--- a/utils.h
+++ b/utils.h
@@ -1,14 +1,8 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#if defined(__MINGW32__) && defined(__GNUC__)
-#  pragma GCC diagnostic push
-#  pragma GCC diagnostic ignored "-Warray-bounds"
-#endif
-#if defined(__clang__)
-#  pragma GCC diagnostic push /* XXX: pypy/pypy#5312 */
-#  pragma GCC diagnostic ignored "-Wnewline-eof"
-#endif
+/* For GraalVM: unicodeobject.h, implicit conversion changes
+   signedness: 'enum PyUnicode_Kind' to 'int' */
 #if defined(__GNUC__) || defined(__clang__)
 #  pragma GCC diagnostic push /* XXX: oracle/graalpython#580 */
 #  pragma GCC diagnostic ignored "-Wsign-conversion"
@@ -22,12 +16,6 @@
 #if defined(__GNUC__) || defined(__clang__)
 #  pragma GCC diagnostic pop
 #endif
-#if defined(__clang__)
-#  pragma GCC diagnostic pop
-#endif
-#if defined(__MINGW32__) && defined(__GNUC__)
-#  pragma GCC diagnostic pop
-#endif
 
 typedef struct gmp_pyargs {
     Py_ssize_t maxpos;