diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh
index c8a892b0f..83b457af0 100755
--- a/.github/workflows/build.sh
+++ b/.github/workflows/build.sh
@@ -1,16 +1,11 @@
 
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-  if [[ "$MB_PYTHON_VERSION" == "pypy3.6-7.3" ]]; then
-    # for https://foss.heptapod.net/pypy/pypy/-/issues/3229
-    # TODO remove when that is fixed
-    brew install tcl-tk
-  fi
   # these cause a conflict with built webp and libtiff,
   # curl from brew requires zstd, use system curl
   brew remove --ignore-dependencies webp zstd xz libtiff curl
 fi
 
-if [[ "$MB_PYTHON_VERSION" == "pypy3.6-7.3" ]]; then
+if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then
   if [[ "$TRAVIS_OS_NAME" != "macos-latest" ]]; then
     MB_ML_VER="2010"
     DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT"
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index e9ca07b13..4aa28ae35 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu-16.04", "macos-latest" ]
-        python: [ "pypy3.6-7.3", "3.6", "3.7", "3.8", "3.9" ]
+        python: [ "pypy3.7-7.3.3","pypy3.6-7.3", "3.6", "3.7", "3.8", "3.9" ]
         platform: [ "x86_64", "i686" ]
         exclude:
           - os: "macos-latest"
@@ -59,7 +59,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu-16.04", "macos-latest" ]
-        python: [ "pypy3.6-7.3", "3.6", "3.7", "3.8", "3.9" ]
+        python: [ "pypy3.7-7.3.3", "pypy3.6-7.3", "3.6", "3.7", "3.8", "3.9" ]
         platform: [ "x86_64", "i686" ]
         exclude:
           - os: "macos-latest"