diff --git a/.travis.yml b/.travis.yml
index 870be45..da74105 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,10 @@ python:
     - 3.4
     - 3.5
     - 3.6
-    - pypy
-    - pypy3
+    - pypy-5.4.1
+    - pypy3.3-5.2-alpha1
 install:
-    - pip install .[test]
+    - pip install -e .[test]
 script:
     - python setup.py -q test -q
 notifications:
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..2a9acf1
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1
diff --git a/setup.py b/setup.py
index 4e80c81..554571f 100644
--- a/setup.py
+++ b/setup.py
@@ -23,21 +23,6 @@
 from setuptools import setup
 
 
-if platform.python_implementation() == 'PyPy' \
-        and platform.python_version() > '3':
-    extras = dict(
-        use_2to3=True,
-        convert_2to3_doctests=[
-            'src/zope/testing/doctest.txt',
-            'src/zope/testing/formparser.txt',
-            'src/zope/testing/module.txt',
-            'src/zope/testing/setupstack.txt',
-        ],
-    )
-else:
-    extras = {}
-
-
 def read(*rnames):
     with open(os.path.join(os.path.dirname(__file__), *rnames)) as f:
         return f.read()
@@ -104,5 +89,4 @@ def read(*rnames):
     include_package_data=True,
     zip_safe=False,
     test_suite='zope.testing.tests.test_suite',
-    **extras
 )