diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 955ca769..4320c656 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,7 +64,7 @@ jobs:
           - "pypy-3.11"
         os: ["ubuntu-latest"]
         include:
-          - os: "macos-13"
+          - os: "macos-15-intel"
             python-version: "3.10"
           - os: "macos-latest"
             python-version: "3.10"
@@ -136,7 +136,7 @@ jobs:
         shell: bash -l {0}
     strategy:
       matrix:
-        os: ["ubuntu-latest", "macos-13", "windows-latest"]
+        os: ["ubuntu-latest", "macos-15-intel", "windows-latest"]
         python_version: [ "python" ]
         include:
           - os: "ubuntu-latest"
@@ -172,8 +172,8 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
-          - macos-13
-          - macos-14
+          - macos-15-intel
+          - macos-latest
           - windows-latest
         cibw_archs_linux: ["x86_64"]
         cibw_before_all_linux:
@@ -216,6 +216,7 @@ jobs:
       - name: Build wheels
         run: cibuildwheel --output-dir dist
         env:
+          CIBW_ENABLE: "pypy"
           CIBW_SKIP: "*-win32 *-manylinux_i686 cp38-macosx_*arm64 cp39-macosx_*arm64"  # Skip 32 bit and problematic mac builds.
           CIBW_ARCHS_LINUX: ${{ matrix.cibw_archs_linux }}
           CIBW_BEFORE_ALL_LINUX: ${{ matrix.cibw_before_all_linux }}
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 36e20a2d..b8471793 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -8,6 +8,10 @@ Changelog
 .. that users understand how the changes affect the new version.
 
 
+version 1.8.1-dev
+-----------------
++ Restore PyPy wheel builds.
+
 version 1.8.0
 -----------------
 + Python 3.14 is supported.
diff --git a/tox.ini b/tox.ini
index 256ee95e..c01b469a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,10 +23,12 @@ commands =
     coverage xml -i
 
 [testenv:asan]
+# Use debug python as default python gives address sanitization errors.
+basepython=python3d
 setenv=
     PYTHONDEVMODE=1
     PYTHONMALLOC=malloc
-    CFLAGS=-lasan -fsanitize=address -fno-omit-frame-pointer
+    CFLAGS=-lasan -fsanitize=address -fno-omit-frame-pointer -Og -g
 allowlist_externals=bash
 commands=
     bash -c 'export LD_PRELOAD=$(gcc -print-file-name=libasan.so) && printenv LD_PRELOAD && python -c "from isal import isal_zlib" && pytest tests'