--- a/make/RunTests.gmk	Wed Oct 17 08:09:46 2018 -0700
+++ b/make/RunTests.gmk	Wed Oct 17 08:13:04 2018 -0700
@@ -132,19 +132,15 @@
 # Parse control variables
 ################################################################################
 
-### Jtreg
-
 ifneq ($(TEST_OPTS), )
   # Inform the user
   $(info Running tests using TEST_OPTS control variable '$(TEST_OPTS)')
 endif
 
+### Jtreg
+
 $(eval $(call SetTestOpt,VM_OPTIONS,JTREG))
 $(eval $(call SetTestOpt,JAVA_OPTIONS,JTREG))
-$(eval $(call SetTestOpt,VM_OPTIONS,GTEST))
-$(eval $(call SetTestOpt,JAVA_OPTIONS,GTEST))
-$(eval $(call SetTestOpt,VM_OPTIONS,MICRO))
-$(eval $(call SetTestOpt,JAVA_OPTIONS,MICRO))
 
 $(eval $(call SetTestOpt,JOBS,JTREG))
 $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG))
@@ -162,6 +158,9 @@
 
 ### Gtest
 
+$(eval $(call SetTestOpt,VM_OPTIONS,GTEST))
+$(eval $(call SetTestOpt,JAVA_OPTIONS,GTEST))
+
 $(eval $(call ParseKeywordVariable, GTEST, \
     SINGLE_KEYWORDS := REPEAT, \
     STRING_KEYWORDS := OPTIONS VM_OPTIONS JAVA_OPTIONS, \
@@ -174,6 +173,9 @@
 
 ### Microbenchmarks
 
+$(eval $(call SetTestOpt,VM_OPTIONS,MICRO))
+$(eval $(call SetTestOpt,JAVA_OPTIONS,MICRO))
+
 $(eval $(call ParseKeywordVariable, MICRO, \
     KEYWORDS := ITER FORK TIME WARMUP_ITER WARMUP_TIME, \
     STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS RESULTS_FORMAT TEST_JDK BENCHMARKS_JAR, \