diff --git a/.travis.yml b/.travis.yml
index cfb8966..66e2df5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,6 @@
 language: python
-python: 2.7
 sudo: false
-env:
-  - TOX_ENV=py27
-  - TOX_ENV=py33
-  - TOX_ENV=py34
-  - TOX_ENV=pypy
+
 install:
   - pip install coveralls tox
 script:
@@ -15,11 +10,15 @@ after_success:
   - coveralls --verbose
 
 matrix:
-  allow_failures:
-    - env: TOX_ENV=py27
-    - env: TOX_ENV=py33
-    - env: TOX_ENV=py34
-    - env: TOX_ENV=pypy
   include:
-    python: 3.5
-    env: TOX_ENV=py35
+    - python: 2.7
+      env: TOX_ENV=py27
+    - python: 3.5
+      env: TOX_ENV=py35
+    - python: 3.6
+      env: TOX_ENV=py36
+    - python: pypy
+      env: TOX_ENV=pypy
+  allow_failures:
+    - python: pypy3
+      env: TOX_ENV=pypy3
diff --git a/tox.ini b/tox.ini
index 0e7e8fe..1f7d50b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,6 @@
 [tox]
 envlist =
         py27,
-        py34,
         py35,
         pypy,
         pycodestyle,
@@ -22,7 +21,7 @@ deps=
     pytest-remove-stale-bytecode
     requests-mock
 
-[pep8]
+[pycodestyle]
 show-source = True
 statistics = True
 exclude=.svn,CVS,.bzr,.hg,.git,__pycache__,.tox,docs
@@ -52,11 +51,21 @@ deps=
     {[py]deps}
 basepython = python3.5
 
+[testenv:py36]
+deps=
+    {[py]deps}
+basepython = python3.6
+
 [testenv:pypy]
 deps=
     {[py]deps}
 basepython = pypy
 
+[testenv:pypy3]
+deps=
+    {[py]deps}
+basepython = pypy3
+
 [testenv:pycodestyle]
 deps =
      {[py]deps}