diff --git a/sdks/python/run_mini_py3lint.sh b/sdks/python/run_mini_py3lint.sh
index f5e9acd70b3a..c4bd37fbb6ce 100755
--- a/sdks/python/run_mini_py3lint.sh
+++ b/sdks/python/run_mini_py3lint.sh
@@ -37,4 +37,5 @@ if test $# -gt 0; then
 fi
 
 echo "Running flake8 for module $MODULE:"
-flake8 $MODULE --count --select=E999 --show-source --statistics
+# TODO: Add F821 (undefined names) as soon as that test passes
+flake8 $MODULE --count --select=E9,F822,F823 --show-source --statistics
diff --git a/sdks/python/run_pylint.sh b/sdks/python/run_pylint.sh
index e3f9a8e267fc..93f68d40a730 100755
--- a/sdks/python/run_pylint.sh
+++ b/sdks/python/run_pylint.sh
@@ -63,7 +63,8 @@ pylint -j8 "$MODULE" --ignore-patterns="$FILES_TO_IGNORE"
 echo "Running pycodestyle for module $MODULE:"
 pycodestyle "$MODULE" --exclude="$FILES_TO_IGNORE"
 echo "Running flake8 for module $MODULE:"
-flake8 $MODULE --count --select=E999 --show-source --statistics
+# TODO: Add F821 (undefined names) as soon as that test passes
+flake8 $MODULE --count --select=E9,F822,F823 --show-source --statistics
 
 echo "Running isort for module $MODULE:"
 # Skip files where isort is behaving weirdly