--- a/test/TestCommon.gmk	Mon Aug 14 14:05:26 2017 -0400
+++ b/test/TestCommon.gmk	Tue Aug 15 16:26:30 2017 -0400
@@ -124,13 +124,6 @@
   PRODUCT_HOME := $(PRODUCT_HOME)
 endif
 
-# Expect JPRT to set JAVA_ARGS (e.g. -server etc.)
-ifdef JAVA_ARGS
-  JAVA_OPTIONS := $(JAVA_ARGS)
-else
-  JAVA_OPTIONS :=
-endif
-
 # Expect JPRT to set JPRT_PRODUCT_ARGS (e.g. -server etc.)
 #   Should be passed into 'java' only.
 #   Could include: -d64 -server -client OR any java option
@@ -374,7 +367,7 @@
   JTREG_BASIC_OPTIONS += -e:VS120COMNTOOLS=$(shell $(GETMIXEDPATH) "$(VS120COMNTOOLS)")
 endif
 # Set other vm and test options
-JTREG_TEST_OPTIONS += $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_OPTIONS:%=-vmoption:%) $(JAVA_VM_ARGS:%=-vmoption:%)
+JTREG_TEST_OPTIONS += $(JAVA_ARGS:%=-javaoptions:%) $(JAVA_VM_ARGS:%=-vmoption:%)
 ifneq ($(JIB_JAR), )
   JTREG_BASIC_OPTIONS += -cpa:$(shell $(GETMIXEDPATH) "$(JIB_JAR)")
 endif