diff --git a/.kokoro/presubmit_tests_functions.cfg b/.kokoro/presubmit_tests_functions.cfg
index 7dbe90ec6f2c..1b37bf7db233 100644
--- a/.kokoro/presubmit_tests_functions.cfg
+++ b/.kokoro/presubmit_tests_functions.cfg
@@ -11,5 +11,5 @@ env_vars: {
 
 env_vars: {
     key: "NOX_SESSION"
-    value: "functions and py27 and not venv"
+    value: "functions and (py36 or lint) and not venv"
 }