diff --git a/.github/workflows/pypy.yml b/.github/workflows/pypy.yml
index a0295b1..1ea8942 100644
--- a/.github/workflows/pypy.yml
+++ b/.github/workflows/pypy.yml
@@ -1,6 +1,10 @@
 name: PyPy
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   build:
@@ -21,7 +25,7 @@ jobs:
           architecture: x64
 
       - name: Install test dependencies
-        run: pip install cffi flake8 pytest
+        run: pip install cffi flake8 pytest wheel
 
       - name: Install libsnappy-dev
         run: sudo apt-get install libsnappy-dev
diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml
index b22f6b1..9efd18d 100644
--- a/.github/workflows/wheel.yml
+++ b/.github/workflows/wheel.yml
@@ -1,6 +1,10 @@
 name: PyPi wheel and sdist
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request:
 
 jobs:
   sdist:
@@ -14,7 +18,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.9"
           architecture: x64
 
       - name: Install test dependencies
@@ -50,7 +54,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, macos-10.15, windows-2019]
+        os: [ubuntu-20.04, macos-11, windows-2019]
         architecture: ['x64']
         linux_archs: ["auto s390x"]
         include:
@@ -85,15 +89,9 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: "3.8"
+          python-version: "3.9"
           architecture: ${{ matrix.architecture }}
 
-#      - name: Install Visual C++ for Python 2.7
-#        if: runner.os == 'Windows'
-#        run: |
-#          choco install vcpython27 -f -y
-
-
       - name: Set up QEMU
         if: runner.os == 'Linux'
         uses: docker/setup-qemu-action@v1
@@ -110,7 +108,7 @@ jobs:
           python -m pip install delvewheel==0.0.9
 
       - name: Build wheels
-        uses: joerick/cibuildwheel@v1.9.0
+        uses: joerick/cibuildwheel@v1.12.0
 
       - uses: actions/upload-artifact@v2
         with:
diff --git a/setup.py b/setup.py
index 3f87a9c..1bb22e1 100644
--- a/setup.py
+++ b/setup.py
@@ -59,8 +59,8 @@
 if 'PyPy' in sys.version:
     from setuptools import setup
     ext_modules = []
-    install_requires = ['cffi>=1.0.0']
-    setup_requires = ['cffi>=1.0.0']
+    install_requires = ['cffi>=1.15.0']
+    setup_requires = ['cffi>=1.15.0']
     cffi_modules = ['./src/snappy/snappy_cffi_builder.py:ffi']
 
 setup(