diff --git a/pep8-requirements.txt b/pep8-requirements.txt
index ad15a55a5..c10070760 100644
--- a/pep8-requirements.txt
+++ b/pep8-requirements.txt
@@ -4,4 +4,3 @@
 
 flake8==2.5.5  # MIT
 flake8-import-order==0.12  # LGPLv3
-pylint>=1.9
diff --git a/pylint-requirements.txt b/pylint-requirements.txt
new file mode 100644
index 000000000..a18a6491f
--- /dev/null
+++ b/pylint-requirements.txt
@@ -0,0 +1,5 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+
+pylint>=1.9
diff --git a/tox.ini b/tox.ini
index 181d77820..4b2a9ae4c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = pep8,py35,py27
+envlist = pep8,pylint,py35,py27
 
 
 [testenv]
@@ -23,7 +23,7 @@ whitelist_externals=
 commands =
     coverage erase
     find . -type f -name "*.pyc" -delete
-    stestr --test-path ./tobiko/tests run {posargs}
+    stestr --test-path ./tobiko/tests/cmd run {posargs}
     coverage combine
     coverage html -d cover
     coverage xml -o cover/coverage.xml
@@ -33,13 +33,18 @@ deps =
     -r{toxinidir}/test-requirements.txt
 
 
+[testenv:neutron]
+commands =
+    stestr --test-path ./tobiko/tests/scenario run {posargs}
+
+
 [testenv:venv]
 basepython = python3
 
 deps =
 
 commands =
-    /bin/bash {posargs}
+    {posargs}
 
 
 [testenv:pep8]
@@ -51,6 +56,16 @@ deps =
 
 commands =
     flake8
+
+
+[testenv:pylint]
+basepython = python3
+
+deps =
+    -r{toxinidir}/test-requirements.txt
+    -r{toxinidir}/pylint-requirements.txt
+
+commands =
     pylint -E --rcfile=.pylintrc -e W,E tobiko