diff --git a/Makefile b/Makefile
index 02341f06f..12059c978 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ linter:
 	cd web && yarn run linter
 
 check: install-node bundle linter
-	cd web && yarn run karma start --single-run && python regression/runtests.py
+	cd web && pycodestyle --config=.pycodestyle . && yarn run karma start --single-run && python regression/runtests.py
 
 check-pep8:
 	cd web && pycodestyle --config=.pycodestyle .
diff --git a/ci/run_python_tests.sh b/ci/run_python_tests.sh
index 3ad02a3a6..d25bdc8ca 100755
--- a/ci/run_python_tests.sh
+++ b/ci/run_python_tests.sh
@@ -26,6 +26,11 @@ fi
 $WORKSPACE/pgadmin-venv/bin/pip install -r requirements.txt || { echo 'ERROR: Failed to install the application requirements.' ; exit 1; }
 $WORKSPACE/pgadmin-venv/bin/pip install -r web/regression/requirements.txt || { echo 'ERROR: Failed to install the regression test requirements.' ; exit 1; }
 
+echo "Running PEP-8 checks..."
+echo
+
+make check-pep8
+
 echo "Running regression tests..."
 echo