diff --git a/build/lib/gant/jps-sources.zip b/build/lib/gant/jps-sources.zip
index 985632f5cc3d..43b79e0d3a5e 100644
Binary files a/build/lib/gant/jps-sources.zip and b/build/lib/gant/jps-sources.zip differ
diff --git a/build/lib/gant/lib/jps.jar b/build/lib/gant/lib/jps.jar
index 34cb9fa28de0..74b65ee1b81c 100644
Binary files a/build/lib/gant/lib/jps.jar and b/build/lib/gant/lib/jps.jar differ
diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index 8974a752cbf2..912428c2ace7 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -66,6 +66,12 @@ binding.setVariable("guessHome", {
 
 binding.setVariable("loadProject", {
   requireProperty("jdkHome", requireProperty("jdk16.home", guessJdk()))
+  def mac = isMac()
+  jdk("IDEA jdk", jdkHome) {
+    if (!mac) {
+      classpath "$jdkHome/lib/tools.jar"
+    }
+  }
   IdeaProjectLoader.loadFromPath(project, "${home}")
 
   binding.ant.patternset(id: "idea.compiler.resources") {
@@ -77,12 +83,6 @@ binding.setVariable("loadProject", {
   }
 
   project["compiler.resources.id"] = "idea.compiler.resources"
-
-  if (!isMac()) {
-    project.modules.values().each {
-      it.classpath << project.resolve("$jdkHome/lib/tools.jar")
-    }
-  }
 })
 
 requireProperty("home", guessHome())