diff --git a/test/06_docker_images/cibuildwheel_test.py b/test/06_docker_images/cibuildwheel_test.py
index 9f243664..4dbf40bd 100644
--- a/test/06_docker_images/cibuildwheel_test.py
+++ b/test/06_docker_images/cibuildwheel_test.py
@@ -14,8 +14,10 @@ def test():
     actual_wheels = utils.cibuildwheel_run(project_dir, add_env={
         'CIBW_MANYLINUX_X86_64_IMAGE': 'dockcross/manylinux2010-x64',
         'CIBW_MANYLINUX_I686_IMAGE': 'dockcross/manylinux2010-x86',
+        'CIBW_SKIP': 'pp*-*',
     })
 
     # also check that we got the right wheels built
-    expected_wheels = utils.expected_wheels('spam', '0.1.0')
+    expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0')
+                       if 'pypy' not in w]
     assert set(actual_wheels) == set(expected_wheels)
diff --git a/test/08_manylinuxXXXX_only/cibuildwheel_test.py b/test/08_manylinuxXXXX_only/cibuildwheel_test.py
index 439f428f..8ae314db 100644
--- a/test/08_manylinuxXXXX_only/cibuildwheel_test.py
+++ b/test/08_manylinuxXXXX_only/cibuildwheel_test.py
@@ -19,12 +19,19 @@ def test(manylinux_image):
         'CIBW_ENVIRONMENT': 'CFLAGS="$CFLAGS -Werror=implicit-function-declaration"',
         'CIBW_MANYLINUX_X86_64_IMAGE': manylinux_image,
         'CIBW_MANYLINUX_I686_IMAGE': manylinux_image,
+        'CIBW_MANYLINUX_PYPY_X86_64_IMAGE': manylinux_image,
     }
-    if manylinux_image == 'manylinux2014':
-        add_env['CIBW_SKIP'] = 'cp27*'  # not available on manylinux2014
+    if manylinux_image == 'manylinux1':
+        # We don't have a manylinux1 image for PyPy
+        add_env['CIBW_SKIP'] = 'pp*'
+    elif manylinux_image == 'manylinux2014':
+        # We don't have a manylinux2014 image for PyPy (yet?)
+        add_env['CIBW_SKIP'] = 'cp27* pp*'  # Python 2.7 not available on manylinux2014
     actual_wheels = utils.cibuildwheel_run(project_dir, add_env=add_env)
 
     expected_wheels = [w for w in utils.expected_wheels('spam', '0.1.0', manylinux_versions=[manylinux_image])]
     if manylinux_image == 'manylinux2014':
         expected_wheels = [w for w in expected_wheels if '-cp27' not in w]
+    if manylinux_image in ['manylinux1', 'manylinux2014']:
+        expected_wheels = [w for w in expected_wheels if '-pp' not in w]
     assert set(actual_wheels) == set(expected_wheels)