diff --git a/build/scripts/common_tests.gant b/build/scripts/common_tests.gant
index 14891f74808c..f7a94081028f 100644
--- a/build/scripts/common_tests.gant
+++ b/build/scripts/common_tests.gant
@@ -63,7 +63,7 @@ target('run_tests': 'Run java tests') {
         };
       }
 
-      commonJvmArgs().each { jvmarg(value: it) }
+      commonJvmArgsForTests().each { jvmarg(value: it) }
 
       jvmarg(value: "-Dbootstrap.testcases=$testCase")
 
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 117fa4a957f3..43e3dc825cd1 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -243,7 +243,7 @@ binding.setVariable("wireBuildDate", { String buildNumber, String appInfoFile ->
   patchFiles([appInfoFile], ["BUILD_NUMBER": buildNumber, "BUILD_DATE": DSTAMP])
 })
 
-binding.setVariable("commonJvmArgs", {
+binding.setVariable("commonJvmArgsForTests", {
   def jdwp = "-Xrunjdwp:transport=dt_socket,server=y,suspend=$debugSuspend"
   if (debugPort != null) jdwp += ",address=$debugPort"
   return [