1 files changed, 28 insertions, 11 deletions

diff --git a/tox.ini b/tox.ini
index 41f8240..265cc3c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,35 @@
 [tox]
-envlist=flake8,py27,py33,py34,py35,pypy,pypy3
+envlist =
+    py27,
+    py33,
+    py34,
+    py35,
+    py36,
+    pypy,
+    pypy3,
+    flake8
 
 [testenv]
-deps=
-  pytest
-  pytest-cov
-commands=
-  sqlformat --version  # Sanity check.
-  py.test --cov=sqlparse/ tests
+deps =
+    pytest
+    pytest-cov
+    pytest-travis-fold
+passenv =
+    TRAVIS
+commands =
+    python --version
+    sqlformat --version
+    py.test --cov=sqlparse
 
 [testenv:flake8]
-basepython=python3.5
-deps=flake8
-commands=flake8 sqlparse
+deps =
+    flake8
+commands =
+    flake8 sqlparse tests setup.py
 
 [flake8]
-ignore = W503
+exclude =
+    sqlparse/compat.py
+ignore =
+    W503,
+    E731