diff --git a/build-tools/scripts/src/main/groovy/geode-test.gradle b/build-tools/scripts/src/main/groovy/geode-test.gradle
index 73a56dfd2f79..c3fb6733e368 100644
--- a/build-tools/scripts/src/main/groovy/geode-test.gradle
+++ b/build-tools/scripts/src/main/groovy/geode-test.gradle
@@ -181,7 +181,7 @@ gradle.taskGraph.whenReady({ graph ->
       }
 
       maxHeapSize '768m'
-      jvmArgs += ['-XX:+HeapDumpOnOutOfMemoryError', '-ea']
+      jvmArgs += ['-XX:+HeapDumpOnOutOfMemoryError', '-XX:+ExitOnOutOfMemoryError', '-ea']
       if (project.hasProperty('testJVMVer') && testJVMVer.toInteger() >= 9) {
         jvmArgs += [
                 "--add-opens=java.base/java.io=ALL-UNNAMED",