diff --git a/tox.ini b/tox.ini
index 0dac1b2..9f759b5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,19 +11,17 @@ deps =
     flake8-docstrings
     flake8-import-order
     pep8-naming
-    pycodestyle
-    pydocstyle
-    pyflakes
-    pylint
     pytest-cov
     pytest-flake8
+    pytest-flakes
     pytest-mypy
+    # 1.2+ is necessary for Python 3.5 support:
+    pytest-pycodestyle ~= 1.2
+    # 1.3+ is necessary for Python 3.5 support:
+    pytest-pydocstyle ~= 1.3
+    pytest-pylint
     pytest-randomly
 commands =
     ./setup.py check --metadata --strict
     keysmith --help
-    pytest --cov keysmith --cov-report term-missing --flake8 --mypy
-    pycodestyle keysmith.py test_keysmith.py setup.py
-    pydocstyle keysmith.py test_keysmith.py setup.py
-    pyflakes keysmith.py test_keysmith.py setup.py
-    pylint keysmith.py test_keysmith.py setup.py
+    pytest --cov keysmith --cov-report term-missing --mypy --pylint --codestyle --docstyle --flakes --flake8