diff --git a/.kokoro/common.sh b/.kokoro/common.sh
index 188dbfbb4443..3b3c8745febc 100644
--- a/.kokoro/common.sh
+++ b/.kokoro/common.sh
@@ -344,20 +344,20 @@ function run_graalvm_tests() {
 function generate_graalvm_presubmit_modules_list() {
   modules_assigned_list=()
   generate_modified_modules_list
-  if [[ ${#modified_module_list[@]} -gt 4 ]]; then
-    # Too many modules modified, run a subset
-    echo "Too many modules modified, running a subset"
-    module_list="java-aiplatform,java-compute"
-  elif [[ ${#modified_module_list[@]} -gt 0 ]]; then
+  if [[ ${#modified_module_list[@]} -gt 0 && ${#modified_module_list[@]} -lt 5 ]]; then
     # If only a few modules have been modified, focus presubmit testing only on them.
     module_list=$(
       IFS=,
       echo "${modified_module_list[*]}"
     )
   else
-    # no modules modified
-    echo "No modules modified"
-    module_list=""
+    # If no modules have been modified or if too many have been modified, just test the modules
+    # specified in the MAVEN_MODULES env var.
+    if [ -z "${MAVEN_MODULES}" ]; then
+      echo "MAVEN_MODULES not defined in environment."
+      exit 1
+    fi
+    module_list=${MAVEN_MODULES}
   fi
 }
 
diff --git a/.kokoro/presubmit/graalvm-native-a-presubmit.cfg b/.kokoro/presubmit/graalvm-native-a-presubmit.cfg
index 4311598f04ff..d61c074a7657 100644
--- a/.kokoro/presubmit/graalvm-native-a-presubmit.cfg
+++ b/.kokoro/presubmit/graalvm-native-a-presubmit.cfg
@@ -31,3 +31,8 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "cloud-java-ci-it-service-account, java-bigqueryconnection-samples-secrets"
 }
+
+env_vars: {
+  key: "MAVEN_MODULES"
+  value: "java-aiplatform,java-compute"
+}
\ No newline at end of file
diff --git a/.kokoro/presubmit/graalvm-native-b-presubmit.cfg b/.kokoro/presubmit/graalvm-native-b-presubmit.cfg
index b0e48b147a09..d795cdb8fe8c 100644
--- a/.kokoro/presubmit/graalvm-native-b-presubmit.cfg
+++ b/.kokoro/presubmit/graalvm-native-b-presubmit.cfg
@@ -31,3 +31,8 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "cloud-java-ci-it-service-account, java-bigqueryconnection-samples-secrets"
 }
+
+env_vars: {
+  key: "MAVEN_MODULES"
+  value: "java-aiplatform,java-compute"
+}
\ No newline at end of file
diff --git a/.kokoro/presubmit/graalvm-native-c-presubmit.cfg b/.kokoro/presubmit/graalvm-native-c-presubmit.cfg
index ba577630c304..b3a291e09966 100644
--- a/.kokoro/presubmit/graalvm-native-c-presubmit.cfg
+++ b/.kokoro/presubmit/graalvm-native-c-presubmit.cfg
@@ -31,3 +31,8 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "cloud-java-ci-it-service-account, java-bigqueryconnection-samples-secrets"
 }
+
+env_vars: {
+  key: "MAVEN_MODULES"
+  value: "java-aiplatform,java-compute"
+}
\ No newline at end of file