diff --git a/.travis.yml b/.travis.yml
index 30347bf..210ca7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,8 @@ python:
   - 3.4
   - 3.5
   - 3.6
-  - pypy-5.4.1
+  - pypy
+  - pypy3
 install:
   - pip install pip --upgrade
   - pip install -e .[dev,test]
diff --git a/tox.ini b/tox.ini
index b1f6dd6..c0572cd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35,py36,pypy
+envlist = py27,py34,py35,py36,pypy2,pypy
 
 [testenv]
 commands =