diff --git a/build/dependencies/setupJdk.gradle b/build/dependencies/setupJdk.gradle
index de0843122b6e..d2cdd128c9e8 100644
--- a/build/dependencies/setupJdk.gradle
+++ b/build/dependencies/setupJdk.gradle
@@ -113,6 +113,13 @@ task setupJdk16(dependsOn: configurations.jdk16) {
     logger.info("Setting up JDK 1.6 to compile")
     unpackJdk(jdkArchive.call(), outputDir)
     deleteBrokenSymlink(outputDir)
+    if (!new File(outputDir, "bin").exists() && new File(outputDir, "jre/bin").exists()) {
+      copy {
+        from file(new File(outputDir, "jre/bin"))
+        into file(new File(outputDir, "bin"))
+        include 'java*'
+      }
+    }
   }
 }