diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant
index a9fe51f5f5ee..6a9ace9f0666 100644
--- a/build/scripts/dist.gant
+++ b/build/scripts/dist.gant
@@ -204,9 +204,11 @@ def layoutAll(Map args, String home, String out, Paths _paths = null, buildJps =
   buildMacZip(macAppRoot, macZip, [paths.distAll], paths.distMac, productProperties.extraMacBins)
 
   buildTarGz(linuxAppRoot, "$paths.artifacts/${archiveName}-no-jdk.tar", [paths.distAll, paths.distUnix], productProperties.extraLinuxBins)
+  requireProperty("jdk.linux", "false")
   if (p("jdk.linux") != "false") {
     buildTarGz(linuxAppRoot, "$paths.artifacts/${archiveName}.tar", [paths.distAll, paths.distUnix, "${paths.sandbox}/jdk.linux"], ["jre/jre/bin/*"] + productProperties.extraLinuxBins)
   }
+  requireProperty("jdk.custom.linux", "false")
   if (p("jdk.custom.linux") != "false") {
     buildTarGz(linuxAppRoot, "$paths.artifacts/${archiveName}-custom-jdk-linux.tar", [paths.distAll, paths.distUnix, "${paths.sandbox}/jdk.custom.linux"], ["jre/jre/bin/*"] + productProperties.extraLinuxBins)
   }
diff --git a/python/build/pycharm_community_build.gant b/python/build/pycharm_community_build.gant
index 9241b5cd2a4c..3771bc1d5278 100644
--- a/python/build/pycharm_community_build.gant
+++ b/python/build/pycharm_community_build.gant
@@ -177,9 +177,11 @@ public layoutCommunity(String classesPath, Set usedJars) {
 
   String tarRoot = isEap() ? "pycharm-community-$buildNumber" : "pycharm-community-${p("component.version.major")}.${p("component.version.minor")}"
   buildTarGz(tarRoot, "$paths.artifacts/pycharmPC-${buildNumber}-no-jdk.tar", [paths.distAll, paths.distUnix])
+  requireProperty("jdk.linux", "false")
   if (p("jdk.linux") != "false") {
     buildTarGz(tarRoot, "$paths.artifacts/pycharmPC-${buildNumber}.tar", [paths.distAll, paths.distUnix, "${home}/out/pycharm/jdk.linux"], ["jre/jre/bin/*"])
   }
+  requireProperty("jdk.custom.linux", "false")
   if (p("jdk.custom.linux") != "false") {
     buildTarGz(tarRoot, "$paths.artifacts/pycharmPC-${buildNumber}-custom-jdk-linux.tar", [paths.distAll, paths.distUnix, "${home}/out/pycharm/jdk.custom.linux"], ["jre/jre/bin/*"])
   }