diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 94397d94bd..5e5a149701 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,8 @@ jobs:
         - '3.9'
         - '3.10'
         # - '3.11-dev'
-        - pypy-3.7
+        - 'pypy-3.7-v7.3.5'
+        - 'pypy-3.8'
 
         # Items in here will either be added to the build matrix (if not
         # present), or add new keys to an existing matrix element if all the
@@ -186,7 +187,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - python-version: "3.10"
+        # TODO: Fails on 3.10, investigate
+        - python-version: "3.9"
           python-debug: true
           valgrind: true
       # - python-version: "3.11-dev"
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 86465a13ba..ec32bf1dae 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,6 +1,7 @@
 --extra-index-url https://antocuni.github.io/pypy-wheels/manylinux2010/
 numpy==1.16.6; python_version<"3.6" and sys_platform!="win32"
-numpy==1.18.0; platform_python_implementation=="PyPy" and sys_platform=="darwin" and python_version>="3.6"
+numpy==1.19.0; platform_python_implementation=="PyPy" and sys_platform=="darwin" and python_version=="3.6"
+numpy==1.20.0; platform_python_implementation=="PyPy" and sys_platform=="darwin" and python_version=="3.7"
 numpy==1.19.3; (platform_python_implementation!="PyPy" or sys_platform=="linux") and python_version=="3.6"
 numpy==1.21.2; (platform_python_implementation!="PyPy" or sys_platform=="linux") and python_version>="3.7" and python_version<"3.10"
 numpy==1.21.2; platform_python_implementation!="PyPy" and sys_platform=="linux" and python_version=="3.10"