diff --git a/.kokoro/presubmit/presubmit.cfg b/.kokoro/presubmit/presubmit.cfg
index 7706e71ca7..bd5b9d991f 100644
--- a/.kokoro/presubmit/presubmit.cfg
+++ b/.kokoro/presubmit/presubmit.cfg
@@ -11,5 +11,5 @@ env_vars: {
 # Run unit tests in parallel, splitting up by file
 env_vars: {
     key: "PYTEST_ADDOPTS"
-    value: "-n=auto --dist=loadscope"
+    value: "-n=16 --dist=loadfile"
 }