diff --git a/Makefile b/Makefile
index 9e4c319..345a077 100644
--- a/Makefile
+++ b/Makefile
@@ -8,10 +8,9 @@ all:
 	@echo "       make uninstall"
 	@echo "       test"
 
-test: test_pep
-
-test_pep:
-	pep8 --max-line-length=240 git_archive_all.py
+test:
+	pycodestyle --config=. --max-line-length=240 git_archive_all.py
+	python setup.py test
 
 install:
 	install -d -m 0755 $(TARGET_DIR)
diff --git a/requirements.txt b/requirements.txt
index 1695968..a77637b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,3 +2,4 @@ pytest==3.7.1; python_version>"2.6"
 pytest==3.2.5; python_version<="2.6"
 pytest-cov==2.5.1
 codecov==2.0.15
+pycodestyle==2.4.0