diff --git a/jjb/geode/apache-geode-test/execute_stressnew.sh b/jjb/geode/apache-geode-test/execute_stressnew.sh
index dd75d6b..cf0ff78 100755
--- a/jjb/geode/apache-geode-test/execute_stressnew.sh
+++ b/jjb/geode/apache-geode-test/execute_stressnew.sh
@@ -111,9 +111,9 @@
 GRADLE_SKIP_TASK_OPTIONS="-x javadoc -x spotlessCheck -x rat"
 
 if [[ -n "${PARALLEL_DUNIT}" && "${PARALLEL_DUNIT}" == "true" ]]; then
-  PARALLEL_DUNIT="-PparallelDunit -PdunitDockerUser=geode"
+  PARALLEL_DUNIT="-PparallelDunit"
   if [ -n "${DUNIT_PARALLEL_FORKS}" ]; then
-    DUNIT_PARALLEL_FORKS="-PdunitParallelForks=${DUNIT_PARALLEL_FORKS}"
+    DUNIT_PARALLEL_FORKS="--max-workers=${DUNIT_PARALLEL_FORKS} -PtestMaxParallelForks=${DUNIT_PARALLEL_FORKS} -PdunitParallelForks=${DUNIT_PARALLEL_FORKS}"
   fi
 else
   PARALLEL_DUNIT=""
@@ -122,13 +122,26 @@
 
 case $ARTIFACT_SLUG in
   windows*)
+    echo "Making environment adjustments for windows."
     JAVA_BUILD_PATH=C:/java${JAVA_BUILD_VERSION}
     JAVA_TEST_PATH=C:/java${JAVA_TEST_VERSION}
+    TEST_JAVA_8_HOME=C:/java8
+    TEST_JAVA_11_HOME=C:/java11
+    TEST_JAVA_17_HOME=C:/java17
+    GRADLE_SKIP_TASK_OPTIONS="${GRADLE_SKIP_TASK_OPTIONS} -x docker"
     SEP=";"
+    OPTIONAL_KILL_ALL_CMD="${SEP} \
+      exit_code=\$? ${SEP} \
+      (taskkill //F //IM java.exe //T) ${SEP} \
+      exit \${exit_code}
+      "
     ;;
   *)
     JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64
     JAVA_TEST_PATH=/usr/lib/jvm/java-${JAVA_TEST_VERSION}-openjdk-amd64
+    TEST_JAVA_8_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+    TEST_JAVA_11_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
+    TEST_JAVA_17_HOME=/usr/lib/jvm/java-17-openjdk-amd64/
     SEP="&&"
     ;;
 esac
@@ -138,9 +151,11 @@
     -PcompileJVMVer=${JAVA_BUILD_VERSION} \
     -PtestJVM=${JAVA_TEST_PATH} \
     -PtestJVMVer=${JAVA_TEST_VERSION} \
+    -PtestJava8Home=${TEST_JAVA_8_HOME} \
+    -PtestJava11Home=${TEST_JAVA_11_HOME} \
+    -PtestJava17Home=${TEST_JAVA_17_HOME} \
     ${PARALLEL_DUNIT} \
     ${DUNIT_PARALLEL_FORKS} \
-    -PdunitDockerImage=\$(docker images --format '{{.Repository}}:{{.Tag}}' | grep test-container) \
     ${DEFAULT_GRADLE_TASK_OPTIONS} \
     ${GRADLE_SKIP_TASK_OPTIONS} \
     ${GRADLE_TASK} \
@@ -154,16 +169,8 @@
   cd geode $SEP \
   cp gradlew gradlewStrict $SEP \
   sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.bak gradlewStrict $SEP \
-  GRADLE_JVM=${JAVA_BUILD_PATH} ./gradlewStrict ${GRADLE_ARGS}'"
+  GRADLE_JVM=${JAVA_BUILD_PATH} JAVA_TEST_PATH=${JAVA_TEST_PATH} ./gradlewStrict ${GRADLE_ARGS}'"
 echo "${EXEC_COMMAND}"
 eval "${EXEC_COMMAND}"
 
-# Cleanup
-# Make sure all test containers are stopped and removed when tests are finished
-DOCKER_CONTAINERS=$(sudo docker ps -a -q 2> /dev/null)
-if [ -n "${DOCKER_CONTAINERS}" ]; then
-  docker stop ${DOCKER_CONTAINERS} > /dev/null
-  echo -e  "Removing containers with ID:"
-  docker rm ${DOCKER_CONTAINERS}
-fi
 
diff --git a/jjb/geode/apache-geode-test/execute_tests.sh b/jjb/geode/apache-geode-test/execute_tests.sh
index 4c134fb..c728518 100755
--- a/jjb/geode/apache-geode-test/execute_tests.sh
+++ b/jjb/geode/apache-geode-test/execute_tests.sh
@@ -44,9 +44,9 @@
 GRADLE_SKIP_TASK_OPTIONS="-x javadoc -x spotlessCheck -x rat"
 
 if [[ -n "${PARALLEL_DUNIT}" && "${PARALLEL_DUNIT}" == "true" ]]; then
-  PARALLEL_DUNIT="-PparallelDunit -PdunitDockerUser=geode"
+  PARALLEL_DUNIT="-PparallelDunit"
   if [ -n "${DUNIT_PARALLEL_FORKS}" ]; then
-    DUNIT_PARALLEL_FORKS="-PdunitParallelForks=${DUNIT_PARALLEL_FORKS}"
+    DUNIT_PARALLEL_FORKS="--max-workers=${DUNIT_PARALLEL_FORKS} -PtestMaxParallelForks=${DUNIT_PARALLEL_FORKS} -PdunitParallelForks=${DUNIT_PARALLEL_FORKS}"
   fi
 else
   PARALLEL_DUNIT=""
@@ -55,13 +55,26 @@
 
 case $ARTIFACT_SLUG in
   windows*)
+    echo "Making environment adjustments for windows."
     JAVA_BUILD_PATH=C:/java${JAVA_BUILD_VERSION}
     JAVA_TEST_PATH=C:/java${JAVA_TEST_VERSION}
+    TEST_JAVA_8_HOME=C:/java8
+    TEST_JAVA_11_HOME=C:/java11
+    TEST_JAVA_17_HOME=C:/java17
+    GRADLE_SKIP_TASK_OPTIONS="${GRADLE_SKIP_TASK_OPTIONS} -x docker"
     SEP=";"
+    OPTIONAL_KILL_ALL_CMD="${SEP} \
+      exit_code=\$? ${SEP} \
+      (taskkill //F //IM java.exe //T) ${SEP} \
+      exit \${exit_code}
+      "
     ;;
   *)
     JAVA_BUILD_PATH=/usr/lib/jvm/java-${JAVA_BUILD_VERSION}-openjdk-amd64
     JAVA_TEST_PATH=/usr/lib/jvm/java-${JAVA_TEST_VERSION}-openjdk-amd64
+    TEST_JAVA_8_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+    TEST_JAVA_11_HOME=/usr/lib/jvm/java-11-openjdk-amd64/
+    TEST_JAVA_17_HOME=/usr/lib/jvm/java-17-openjdk-amd64/
     SEP="&&"
     ;;
 esac
@@ -71,9 +84,11 @@
     -PcompileJVMVer=${JAVA_BUILD_VERSION} \
     -PtestJVM=${JAVA_TEST_PATH} \
     -PtestJVMVer=${JAVA_TEST_VERSION} \
+    -PtestJava8Home=${TEST_JAVA_8_HOME} \
+    -PtestJava11Home=${TEST_JAVA_11_HOME} \
+    -PtestJava17Home=${TEST_JAVA_17_HOME} \
     ${PARALLEL_DUNIT} \
     ${DUNIT_PARALLEL_FORKS} \
-    -PdunitDockerImage=\$(docker images --format '{{.Repository}}:{{.Tag}}' | grep test-container) \
     ${DEFAULT_GRADLE_TASK_OPTIONS} \
     ${GRADLE_SKIP_TASK_OPTIONS} \
     ${GRADLE_TASK} \
@@ -87,16 +102,7 @@
   cd geode $SEP \
   cp gradlew gradlewStrict $SEP \
   sed -e 's/JAVA_HOME/GRADLE_JVM/g' -i.bak gradlewStrict $SEP \
-  GRADLE_JVM=${JAVA_BUILD_PATH} ./gradlewStrict ${GRADLE_ARGS}'"
+  GRADLE_JVM=${JAVA_BUILD_PATH} JAVA_TEST_PATH=${JAVA_TEST_PATH} ./gradlewStrict ${GRADLE_ARGS}'"
+
 echo "${EXEC_COMMAND}"
 eval "${EXEC_COMMAND}"
-
-# Cleanup
-# Make sure all test containers are stopped and removed when tests are finished
-DOCKER_CONTAINERS=$(sudo docker ps -a -q 2> /dev/null)
-if [ -n "${DOCKER_CONTAINERS}" ]; then
-  docker stop ${DOCKER_CONTAINERS} > /dev/null
-  echo -e  "Removing containers with ID:"
-  docker rm ${DOCKER_CONTAINERS}
-fi
-