diff --git a/.travis.yml b/.travis.yml
index 0df2417..d39f361 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,14 @@
 language: python
-python: 3.5
+python: 3.6
 sudo: false
 cache: pip
 
 env:
   - TOXENV=py26
   - TOXENV=py27
-  - TOXENV=py33
   - TOXENV=py34
   - TOXENV=py35
+  - TOXENV=py36
   - TOXENV=pypy
   - TOXENV=pyparsing1
   - TOXENV=flask08
diff --git a/tox.ini b/tox.ini
index ebd2bd4..7dbbcf5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,9 +2,9 @@
 envlist =
 	py26,
 	py27,
-	py33,
 	py34,
 	py35,
+	py36,
 	pypy,
 	pyparsing1,
 	flask08,
@@ -53,8 +53,10 @@ deps =
 	mock
 	scandir
 
-[testenv:py33]
-basepython = python3.3
+[testenv:py34]
+basepython = python3.4
+commands =
+	python -Wall -m unittest discover
 deps =
 	{[testenv]deps}
 	Flask
@@ -62,8 +64,8 @@ deps =
 	pyparsing
 	scandir
 
-[testenv:py34]
-basepython = python3.4
+[testenv:py35]
+basepython = python3.5
 commands =
 	python -Wall -m unittest discover
 deps =
@@ -71,10 +73,9 @@ deps =
 	Flask
 	Flask-Cache
 	pyparsing
-	scandir
 
-[testenv:py35]
-basepython = python3.5
+[testenv:py36]
+basepython = python3.6
 commands =
 	python -Wall -m unittest discover
 deps =