diff --git a/.travis.yml b/.travis.yml
index 55f7c310..5ce1af6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,17 @@
 language: python
-python: 3.5
 dist: trusty
 sudo: required
 services:
     - docker
-env: # These should match the tox env list
-    - TOXENV=py27
-    - TOXENV=py34
-    - TOXENV=py35
-    - TOXENV=pypy
-    - TOXENV=py27 LATEST_GIT=1
+matrix:
+    include:
+        -   env: TOXENV=py27
+        -   env: TOXENV=py27 LATEST_GIT=1
+        -   env: TOXENV=py35
+            python: 3.5
+        -   env: TOXENV=py36
+            python: 3.6
+        -   env: TOXENV=pypy
 install: pip install coveralls tox
 script: tox
 before_install:
@@ -22,11 +24,8 @@ before_install:
             export PATH="/tmp/git/bin:$PATH"
         fi
     - git --version
-    - |
-        ./get-swift.sh
-        export PATH="/tmp/swift/usr/bin:$PATH"
-after_success:
-    - coveralls
+    - './get-swift.sh && export PATH="/tmp/swift/usr/bin:$PATH"'
+after_success: coveralls
 cache:
     directories:
         - $HOME/.cache/pip
diff --git a/appveyor.yml b/appveyor.yml
index c02598dc..013e1421 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,10 +4,10 @@ environment:
         TOX_TESTENV_PASSENV: COVERAGE_IGNORE_WINDOWS
     matrix:
         - TOXENV: py27
-        - TOXENV: py35
+        - TOXENV: py36
 
 install:
-    - "SET PATH=C:\\Python35;C:\\Python35\\Scripts;%PATH%"
+    - "SET PATH=C:\\Python36;C:\\Python36\\Scripts;%PATH%"
     - pip install tox virtualenv --upgrade
     - "mkdir -p C:\\Temp"
     - "SET TMPDIR=C:\\Temp"
diff --git a/setup.py b/setup.py
index 4d0206a7..a248dde2 100644
--- a/setup.py
+++ b/setup.py
@@ -20,8 +20,8 @@ setup(
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],