diff --git a/test-requirements.txt b/test-requirements.txt
index 8bc49f6..b654985 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,4 @@
 pytest
 pytest-cov
-pytest-pep8
+flake8
 coverage
diff --git a/tox.ini b/tox.ini
index 8e897c6..6d2e4bc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,13 +7,13 @@ usedevelop = True
 basepython = python3
 usedevelop=True
 setenv = COVERAGE_FILE = .coverage
-commands = py.test --cov=pygtktalog --cov-report=term-missing
+commands = py.test --cov=pycatalog --cov-report=term-missing
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]
 usedevelop=True
-commands = py.test --pep8 -m pep8
+commands = flake8
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt