diff --git a/Makefile b/Makefile
index b91bb2c0..d9a47f53 100644
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,7 @@ coverage: clean
 	coverage html
 	coverage report
 
-ci: pyenv
-	tox
+ci: pyenv tox
 	CODECOV_TOKEN=`cat .codecov-token` codecov
 
 build: clean
diff --git a/setup.py b/setup.py
index 36ce1782..99635fee 100755
--- a/setup.py
+++ b/setup.py
@@ -72,6 +72,6 @@ def extract_metaitem(meta):
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
 )
diff --git a/tox.ini b/tox.ini
index a56de655..c072ade8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = clean,py27,py35,pypy,pypy3,codestyle,coverage
+envlist = clean,py27,py36,pypy,pypy3,codestyle,coverage
 skip_missing_interpreters = True
 
 [testenv]