diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 9d5739cb4ef0..0913128f69f4 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -112,9 +112,10 @@ binding.setVariable("guessHome", {
 binding.setVariable("loadProject", {
   requireProperty("jdkHome", requireProperty("jdk16.home", guessJdk()))
   def mac = isMac()
-  def sdk = jdk("IDEA jdk", jdkHome) { }
-  if (!mac) {
-    sdk.addClaspath "$jdkHome/lib/tools.jar"
+  jdk("IDEA jdk", jdkHome) {
+    if (!mac) {
+      classpath "$jdkHome/lib/tools.jar"
+    }
   }
   IdeaProjectLoader.loadFromPath(project, "${home}")
 })
diff --git a/jps/build.gant b/jps/build.gant
index f25d4b840c9b..1b050123fd9f 100644
--- a/jps/build.gant
+++ b/jps/build.gant
@@ -10,15 +10,19 @@ def gantHome = GANT_HOME
 
 projectBuilder.targetFolder = "${projectHome}/build"
     
-library("ANT") {}.addClasspath("$libs/ant-1.7.1.jar")
-
-library("groovy") {}.addClasspath("$libs/groovy-all-1.7.1.jar")
-
-def gantLib = library("gant") {}
-new File("$gantHome/lib").eachFile {
-  gantLib.addClasspath it.toString()
+library("ANT") {
+  classpath "$libs/ant-1.7.1.jar"
 }
 
+library("groovy") {
+  classpath "$libs/groovy-all-1.7.1.jar"
+}
+
+library("gant") {
+  new File("$gantHome/lib").eachFile {
+    classpath it
+  }
+}
 
 module("JPS") {
   targetLevel ="1.5"