diff --git a/.travis.yml b/.travis.yml
index c5b6d1a..0daff95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,8 +5,9 @@ python:
     - "3.3"
     - "3.4"
     - "3.5"
+    - "3.6"
 # command to install dependencies
-install: 
+install:
     - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then travis_retry pip install unittest2; fi
     - travis_retry pip install -r dev-requirements.txt
     - travis_retry pip install coveralls
diff --git a/setup.py b/setup.py
index 10c0a6f..882b9a0 100644
--- a/setup.py
+++ b/setup.py
@@ -25,13 +25,12 @@ setup(
     entry_points={
         'console_scripts': ['wakatime = wakatime.__init__:execute'],
     },
-    classifiers=(
+    classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
-        'Topic :: Text Editors',
         'Programming Language :: Python',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.6',
@@ -40,5 +39,7 @@ setup(
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
-    ),
+        'Programming Language :: Python :: 3.6',
+        'Topic :: Text Editors',
+    ],
 )