diff --git a/Makefile b/Makefile
index 2eeff853..7bd0d866 100644
--- a/Makefile
+++ b/Makefile
@@ -235,9 +235,9 @@ test.sh:
 	shellcheck -x .config.sh
 
 test.pep8: pyenvinstall
-	@echo "TEST      pep8"
-	$(Q)$(PY_ENV_ACT); pep8 --exclude='searx/static, searx/languages.py, searx/engines/gigablast.py' \
-        --max-line-length=120 --ignore "E402,W503" searx tests
+	@echo "TEST      pycodestyle (formerly pep8)"
+	$(Q)$(PY_ENV_ACT); pycodestyle --exclude='searx/static, searx/languages.py, searx/engines/gigablast.py' \
+        --max-line-length=120 --ignore "E117,E252,E402,E722,E741,W503,W504,W605" searx tests
 
 test.unit: pyenvinstall
 	@echo "TEST      tests/unit"
diff --git a/requirements-dev.txt b/requirements-dev.txt
index c94d4af3..d0d1ecc9 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,7 +1,7 @@
 mock==2.0.0
 nose2[coverage_plugin]==0.9.2
 cov-core==1.15.0
-pep8==1.7.0
+pycodestyle==2.6.0
 pylint==2.4.4
 plone.testing==5.0.0
 splinter==0.11.0