diff --git a/.travis.yml b/.travis.yml
index 544c2de..2e13fed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@ language: python
 
 python:
     - "2.7"
-    - "3.3"
-    - "3.4"
+    - "3.5"
+    - "3.6"
     - "pypy"
 
 install:
diff --git a/appveyor.yml b/appveyor.yml
index 7e2b929..0738db0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,7 +3,7 @@ build: false
 environment:
   matrix:
     - PYTHON: "C:\\Python27-x64"
-    - PYTHON: "C:\\Python35-x64"
+    - PYTHON: "C:\\Python36-x64"
 
 init:
   - SET PATH=%PYTHON%;%PATH%
diff --git a/setup.py b/setup.py
index 474a7b8..7c26321 100644
--- a/setup.py
+++ b/setup.py
@@ -46,10 +46,13 @@ def fopen(filename):
         'Operating System :: POSIX',
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: Implementation',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',