--- old/test/hotspot/jtreg/gc/shenandoah/options/TestArgumentRanges.java	2020-06-17 13:38:22.939923601 +0200
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestArgumentRanges.java	2020-06-17 13:38:22.659916009 +0200
@@ -46,7 +46,9 @@
     private static void testHeuristics() throws Exception {
 
         {
-            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
+                    "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-XX:ShenandoahGCHeuristics=aggressive",
@@ -55,7 +57,9 @@
             output.shouldHaveExitValue(0);
         }
         {
-            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
+                    "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-XX:ShenandoahGCHeuristics=static",
@@ -64,7 +68,9 @@
             output.shouldHaveExitValue(0);
         }
         {
-            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
+                    "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-XX:ShenandoahGCHeuristics=fluff",
@@ -77,7 +83,9 @@
 
     private static void testRange(String option, int min, int max) throws Exception {
         {
-            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
+                    "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-XX:" + option + "=" + (max + 1),
@@ -86,7 +94,9 @@
             output.shouldHaveExitValue(1);
         }
         {
-            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
+                    "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-XX:" + option + "=" + max,
@@ -95,7 +105,9 @@
             output.shouldHaveExitValue(0);
         }
         {
-            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
+                    "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-XX:" + option + "=" + (min - 1),
@@ -104,7 +116,9 @@
             output.shouldHaveExitValue(1);
         }
         {
-            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
+                    "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-XX:" + option + "=" + min,
--- old/test/hotspot/jtreg/gc/shenandoah/options/TestClassUnloadingArguments.java	2020-06-17 13:38:23.603941594 +0200
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestClassUnloadingArguments.java	2020-06-17 13:38:23.323934005 +0200
@@ -39,9 +39,10 @@
 public class TestClassUnloadingArguments {
 
     public static void testWith(String msg, boolean cu, boolean cuConc, String... args) throws Exception {
-        String[] cmds = Arrays.copyOf(args, args.length + 2);
-        cmds[args.length] = "-XX:+PrintFlagsFinal";
-        cmds[args.length + 1] = "-version";
+        String[] cmds = Arrays.copyOf(args, args.length + 3);
+        cmds[args.length] = "-Xmx128m";
+        cmds[args.length + 1] = "-XX:+PrintFlagsFinal";
+        cmds[args.length + 2] = "-version";
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(cmds);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
--- old/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java	2020-06-17 13:38:24.251959159 +0200
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java	2020-06-17 13:38:23.975951678 +0200
@@ -61,6 +61,7 @@
 
         {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-Xlog:gc",
@@ -77,6 +78,7 @@
 
         {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-Xlog:gc",
@@ -94,6 +96,7 @@
 
         {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-Xlog:gc",
@@ -111,6 +114,7 @@
 
         {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-Xlog:gc",
@@ -128,6 +132,7 @@
 
         {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-Xlog:gc",
--- old/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGCNoConcurrent.java	2020-06-17 13:38:24.907976935 +0200
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGCNoConcurrent.java	2020-06-17 13:38:24.631969458 +0200
@@ -61,6 +61,7 @@
 
         for (String opt : opts) {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-Xlog:gc",
--- old/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java	2020-06-17 13:38:25.571994930 +0200
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java	2020-06-17 13:38:25.295987452 +0200
@@ -53,6 +53,7 @@
     private static void testWith(String h, Mode mode) throws Exception {
         {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:-UnlockDiagnosticVMOptions",
                     "-XX:-UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
@@ -73,6 +74,7 @@
 
         {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:-UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
@@ -93,6 +95,7 @@
 
         {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:-UnlockDiagnosticVMOptions",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
--- old/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousThresholdArgs.java	2020-06-17 13:38:26.228012710 +0200
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousThresholdArgs.java	2020-06-17 13:38:25.948005122 +0200
@@ -38,7 +38,9 @@
 public class TestHumongousThresholdArgs {
     public static void main(String[] args) throws Exception {
         {
-            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockExperimentalVMOptions",
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
+                    "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-version");
             OutputAnalyzer output = new OutputAnalyzer(pb.start());
@@ -49,7 +51,9 @@
         int[] invalid = new int[] {-100, -1, 0, 101, 1000};
 
         for (int v : valid) {
-            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockExperimentalVMOptions",
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
+                    "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-XX:ShenandoahHumongousThreshold=" + v,
                     "-version");
@@ -58,7 +62,9 @@
         }
 
         for (int v : invalid) {
-            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockExperimentalVMOptions",
+            ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
+                    "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
                     "-XX:ShenandoahHumongousThreshold=" + v,
                     "-version");
--- old/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java	2020-06-17 13:38:26.888030596 +0200
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java	2020-06-17 13:38:26.608023005 +0200
@@ -40,9 +40,10 @@
 public class TestLoopMiningArguments {
 
     public static void testWith(String msg, boolean cls, int iters, String... args) throws Exception {
-        String[] cmds = Arrays.copyOf(args, args.length + 2);
-        cmds[args.length] = "-XX:+PrintFlagsFinal";
-        cmds[args.length + 1] = "-version";
+        String[] cmds = Arrays.copyOf(args, args.length + 3);
+        cmds[args.length] = "-Xmx128m";
+        cmds[args.length + 1] = "-XX:+PrintFlagsFinal";
+        cmds[args.length + 2] = "-version";
         ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(cmds);
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
         output.shouldHaveExitValue(0);
--- old/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java	2020-06-17 13:38:27.536048156 +0200
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java	2020-06-17 13:38:27.260040677 +0200
@@ -52,6 +52,7 @@
     private static void testWith(String h, Mode mode) throws Exception {
         {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:-UnlockDiagnosticVMOptions",
                     "-XX:-UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
@@ -72,6 +73,7 @@
 
         {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:-UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
@@ -92,6 +94,7 @@
 
         {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:-UnlockDiagnosticVMOptions",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
--- old/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCounts.java	2020-06-17 13:38:28.192065933 +0200
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCounts.java	2020-06-17 13:38:27.916058454 +0200
@@ -45,7 +45,9 @@
     }
 
     private static void testWith(int conc, int par) throws Exception {
-        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-XX:+UnlockDiagnosticVMOptions",
+        ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                "-Xmx128m",
+                "-XX:+UnlockDiagnosticVMOptions",
                 "-XX:+UnlockExperimentalVMOptions",
                 "-XX:+UseShenandoahGC",
                 "-XX:ConcGCThreads=" + conc,
--- old/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCountsOverride.java	2020-06-17 13:38:28.852083815 +0200
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCountsOverride.java	2020-06-17 13:38:28.576076336 +0200
@@ -39,6 +39,7 @@
     public static void main(String[] args) throws Exception {
         {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                "-Xmx128m",
                 "-XX:+UnlockDiagnosticVMOptions",
                 "-XX:+UnlockExperimentalVMOptions",
                 "-XX:+UseShenandoahGC",
@@ -53,6 +54,7 @@
 
         {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                "-Xmx128m",
                 "-XX:+UnlockDiagnosticVMOptions",
                 "-XX:+UnlockExperimentalVMOptions",
                 "-XX:+UseShenandoahGC",
--- old/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java	2020-06-17 13:38:29.512101702 +0200
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java	2020-06-17 13:38:29.236094222 +0200
@@ -62,6 +62,7 @@
     private static void shouldFailAll(String h, String[] barriers) throws Exception {
         for (String b : barriers) {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
@@ -79,6 +80,7 @@
     private static void shouldPassAll(String h, String[] barriers) throws Exception {
         for (String b : barriers) {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
--- old/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java	2020-06-17 13:38:30.172119583 +0200
+++ new/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java	2020-06-17 13:38:29.888111890 +0200
@@ -56,6 +56,7 @@
     private static void shouldFailAll(String h, String[] barriers) throws Exception {
         for (String b : barriers) {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",
@@ -73,6 +74,7 @@
     private static void shouldPassAll(String h, String[] barriers) throws Exception {
         for (String b : barriers) {
             ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+                    "-Xmx128m",
                     "-XX:+UnlockDiagnosticVMOptions",
                     "-XX:+UnlockExperimentalVMOptions",
                     "-XX:+UseShenandoahGC",