diff --git a/build/scripts/utils.gant b/build/scripts/utils.gant
index b62e377c11eb..a63b606da136 100644
--- a/build/scripts/utils.gant
+++ b/build/scripts/utils.gant
@@ -897,11 +897,11 @@ private bundledJDK(boolean win64) {
       setProperty("linuxJDK", getPathToBundledJDK(new File("${home}/build/jdk/linux"), "jdk" + p("jdk.linux"), ".tar"))
       extractRedistJre(linuxJDK, "${paths.sandbox}/jdk.linux/jre")
     }
-    def customJdkDir = new File("${home}/build/jdk/custom")
+    def customJdkDir = new File("${home}/build/jdk/mac/custom")
     if (p("jdk.mac") != "false" && (customJdkDir.exists() && customJdkDir.isDirectory())) {
       setProperty("macCustomJDK", getPathToBundledJDK(customJdkDir, "openjdk.1.8", ".tar.gz"))
     }
-    customJdkDir = new File("${home}/build/jdk/custom/linux")
+    customJdkDir = new File("${home}/build/jdk/linux/custom")
     if (p("jdk.custom.linux") != "false" && (customJdkDir.exists() && customJdkDir.isDirectory())) {
       setProperty("linuxCustomJDK", getPathToBundledJDK(customJdkDir, "openjdk.1.8", ".tar.gz"))
       extractRedistJre(linuxCustomJDK, "${paths.sandbox}/jdk.custom.linux")