diff --git a/.travis.yml b/.travis.yml
index 5ac29438..16670380 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ env:
 matrix:
   include:
     - python: 3.6
-      env: CI_TARGET=flake
+      env: CI_TARGET=checkqa TOXENV=checkqa
 python:
   # If the build matrix gets bigger, also update the number of runs
   # at the bottom of .scrutinizer.yml.
@@ -25,17 +25,11 @@ before_install:
   - if [ $CI_TARGET = tests ]; then
       eval "$(curl -Ss https://github.com/raw/neovim/bot-ci/master/scripts/travis-setup.sh) nightly-x64";
       pip install -q scrutinizer-ocular tox-travis;
-    else
-      pip install -q flake8 flake8-import-order flake8-docstrings pep8-naming;
     fi
 install:
   - pip install .
 script:
-  - if [ $CI_TARGET = tests ]; then
-      tox;
-    else
-      flake8 neovim;
-    fi
+  - tox
 after_script:
   - if [ $CI_TARGET = tests ]; then
       ocular;
diff --git a/tox.ini b/tox.ini
index 81d67059..62021ae8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,16 @@
 [tox]
 envlist = py{27,33,34,35,36}-{asyncio,pyuv},pypy
+
 [testenv]
 deps=
   nose
   pyuv: pyuv
 commands=nosetests
+
+[testenv:checkqa]
+deps =
+  flake8
+  flake8-import-order
+  flake8-docstrings
+  pep8-naming
+commands = flake8 {posargs:neovim}