diff --git a/.travis.yml b/.travis.yml
index 1470343..f185b23 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,8 @@ python:
   - "3.6"
   - "nightly"
 install:
-  - "pip install pycodestyle"
-  - "pip install nose"
-  - "pip install coverage"
-  - "pip install coveralls"
+  - "pip install pip --upgrade"
+  - "pip install -r tests-requirements.txt"
   - "pip install -r requirements.txt"
 script:
   ./tests.sh
diff --git a/tests-requirements.txt b/tests-requirements.txt
new file mode 100644
index 0000000..2795de2
--- /dev/null
+++ b/tests-requirements.txt
@@ -0,0 +1,5 @@
+pycodestyle; python_version >= '3.0'
+pyflakes; python_version >= '3.0'
+nose; python_version >= '3.0'
+coverage; python_version >= '3.0'
+coveralls; python_version >= '3.0'
diff --git a/tests.sh b/tests.sh
index ae073fe..588d030 100755
--- a/tests.sh
+++ b/tests.sh
@@ -7,4 +7,8 @@ set -ev
 
 pycodestyle --ignore=W605 catcli/
 pycodestyle tests/
+
+pyflakes catcli/
+pyflakes tests/
+
 PYTHONPATH=catcli python3 -m nose -s --with-coverage --cover-package=catcli