diff --git a/.travis.yml b/.travis.yml
index 333aaac..8b87bef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,8 @@ matrix:
       env: TOXENV=py35
     - python: 3.6
       env: TOXENV=py36
-    - python: pypy
-      env: TOXENV=pypy27
+    - python: pypy2.7
+      env: TOXENV=pypy
     - python: pypy3.5
       env: TOXENV=pypy3
 
diff --git a/tox.ini b/tox.ini
index 281ac91..0f6f3f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.7.2
-envlist = flake8, py3flake8, py27, py33, py34, py35, py36, pypy27, pypy35
+envlist = flake8, py3flake8, py27, py33, py34, py35, py36, pypy, pypy3
 skip_missing_interpreters = true
 
 [testenv]