--- old/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java	2015-11-25 11:30:22.614863461 -0800
+++ new/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java	2015-11-25 11:30:22.510863464 -0800
@@ -109,20 +109,20 @@
          * Exclude below options as their maximum value would consume too much memory
          * and would affect other tests that run in parallel.
          */
-        allOptionsAsMap.remove("ConcGCThreads");
+        excludeTestMaxRange("ConcGCThreads");
         excludeTestMaxRange("G1ConcRefinementThreads");
         excludeTestMaxRange("G1RSetRegionEntries");
         excludeTestMaxRange("G1RSetSparseRegionEntries");
         excludeTestMaxRange("G1UpdateBufferSize");
         excludeTestMaxRange("InitialBootClassLoaderMetaspaceSize");
-        allOptionsAsMap.remove("InitialHeapSize");
-        allOptionsAsMap.remove("MaxHeapSize");
-        allOptionsAsMap.remove("MaxRAM");
-        allOptionsAsMap.remove("NewSize");
-        allOptionsAsMap.remove("OldSize");
-        allOptionsAsMap.remove("ParallelGCThreads");
+        excludeTestMaxRange("InitialHeapSize");
+        excludeTestMaxRange("MaxHeapSize");
+        excludeTestMaxRange("MaxRAM");
+        excludeTestMaxRange("NewSize");
+        excludeTestMaxRange("OldSize");
+        excludeTestMaxRange("ParallelGCThreads");
 
-        allOptionsAsMap.remove("VMThreadStackSize");
+        excludeTestMaxRange("VMThreadStackSize");
 
         /*
          * Remove parameters controlling the code cache. As these